sd/inc/strings.hrc | 2 ++
sd/source/ui/sidebar/SlideBackground.cxx | 6 +++---
sd/uiconfig/simpress/ui/sidebarslidebackground.ui | 6 +++---
sw/inc/app.hrc | 10 +++++-----
sw/uiconfig/swriter/menubar/menubar.xml | 14 +++++++-------
5 files changed, 20 insertions(+), 18 deletions(-)
New commits:
commit 95efc0b875f3fd3152da051f27ded52e048151bf
Author: Yousuf Philips <philip...@hotmail.com>
Date: Wed Dec 6 18:01:03 2017 +0400
tdf#89466 Fix minor localization bugs
Change-Id: I1ee93f81dcd83b5a9277ea444ec8e10db7d790df
Reviewed-on: https://gerrit.libreoffice.org/45958
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
(cherry picked from commit c5505f5a22917c339af4e4c840a6a1ae20e2503f)
Reviewed-on: https://gerrit.libreoffice.org/46033
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 4850e5d63b2d..20dfdcb67229 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -284,7 +284,9 @@
#define STR_PAGE_NAME NC_("STR_PAGE_NAME",
"Page" )
#define STR_SLIDE_NAME NC_("STR_SLIDE_NAME",
"Slide" )
#define STR_MASTERSLIDE_NAME
NC_("STR_MASTERSLIDE_NAME", "Master Slide")
+#define STR_MASTERSLIDE_LABEL
NC_("STR_MASTERSLIDE_LABEL", "Master Slide:")
#define STR_MASTERPAGE_NAME
NC_("STR_MASTERPAGE_NAME", "Master Page")
+#define STR_MASTERPAGE_LABEL
NC_("STR_MASTERPAGE_LABEL", "Master Page:")
#define STR_NOTES NC_("STR_NOTES",
"(Notes)" )
#define STR_HANDOUT NC_("STR_HANDOUT",
"Handouts" )
#define STR_PRESOBJ_MPTITLE
NC_("STR_PRESOBJ_MPTITLE", "Click to edit the title text format" )
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index 8b2e15dc7671..9c94a208b2cb 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -239,7 +239,7 @@ void SlideBackground::HandleContextChange(
if ( IsImpress() )
{
- mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_NAME));
+ mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_LABEL));
mpMarginSelectBox->Hide();
if ( maContext == maImpressMasterContext )
@@ -294,7 +294,7 @@ void SlideBackground::HandleContextChange(
}
else if ( IsDraw() )
{
- mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_NAME));
+ mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_LABEL));
}
}
@@ -558,7 +558,7 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
}
else if ( maContext == maImpressNotesContext )
{
- mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_NAME));
+ mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_LABEL));
ViewShell* pMainViewShell =
mrBase.GetMainViewShell().get();
if (pMainViewShell)
diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
index 70bccb25c7c8..55783273dfe7 100644
--- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
+++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
@@ -194,7 +194,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes"
context="sidebarslidebackground|label4">Orientation: </property>
+ <property name="label" translatable="yes"
context="sidebarslidebackground|label4">Orientation:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -209,7 +209,7 @@
<property name="homogeneous">True</property>
<child>
<object class="GtkButton" id="masterslidebutton">
- <property name="label" translatable="yes"
context="sidebarslidebackground|masterslidebutton">Master Slide</property>
+ <property name="label" translatable="yes"
context="sidebarslidebackground|masterslidebutton">Master View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -264,7 +264,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes"
context="sidebarslidebackground|labelmargin">Margin: </property>
+ <property name="label" translatable="yes"
context="sidebarslidebackground|labelmargin">Margin:</property>
</object>
<packing>
<property name="left_attach">0</property>
commit 4b56073faac30ea74c698ae7b526dc1b8ee36262
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Dec 7 02:48:43 2017 +0400
tdf91781 Small reorganization and shrinking of the form menu
Change-Id: Icaad5b6769da227f7ec3b13c6d793e6464e2ffc9
Reviewed-on: https://gerrit.libreoffice.org/45999
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit 58e6ef08271f51486e37edeaa287a6d54b2b9720)
Reviewed-on: https://gerrit.libreoffice.org/46031
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
index 1f7366733f59..d8ec9694ecc1 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -631,7 +631,7 @@
<menu:menu menu:id=".uno:FormatFormMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:SwitchControlDesignMode"/>
- <menu:menuitem menu:id=".uno:OpenReadOnly"/>
+ <menu:menuitem menu:id=".uno:UseWizards"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:Label"/>
<menu:menuitem menu:id=".uno:Edit"/>
@@ -644,21 +644,21 @@
<menu:menuitem menu:id=".uno:Imagebutton"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FormattedField"/>
- <menu:menuitem menu:id=".uno:DateField"/>
- <menu:menuitem menu:id=".uno:NumericField"/>
<menu:menu menu:id=".uno:FormMoreFieldsMenu">
<menu:menupopup>
+ <menu:menuitem menu:id=".uno:DateField"/>
<menu:menuitem menu:id=".uno:TimeField"/>
- <menu:menuitem menu:id=".uno:PatternField"/>
+ <menu:menuitem menu:id=".uno:NumericField"/>
<menu:menuitem menu:id=".uno:CurrencyField"/>
+ <menu:menuitem menu:id=".uno:PatternField"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:GroupBox"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ImageControl"/>
<menu:menuitem menu:id=".uno:FileControl"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GroupBox"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:Grid"/>
<menu:menuitem menu:id=".uno:NavigationBar"/>
<menu:menuseparator/>
@@ -668,8 +668,8 @@
<menu:menuitem menu:id=".uno:ShowFmExplorer"/>
<menu:menuitem menu:id=".uno:TabDialog"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:OpenReadOnly"/>
<menu:menuitem menu:id=".uno:AutoControlFocus"/>
- <menu:menuitem menu:id=".uno:UseWizards"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ToolsMenu">
commit d9949a7822f0b9190413c4695ea21109b81c0927
Author: Yousuf Philips <philip...@hotmail.com>
Date: Wed Dec 6 15:57:45 2017 +0400
tdf#114275 Use 'All Styles' for all style types
Change-Id: I3a43d5cc3f19e789686afae47b7ffb223305971e
Reviewed-on: https://gerrit.libreoffice.org/45939
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit 9e2b4bc6c4ade65788a0763dadf85f1e8be2b2d3)
Reviewed-on: https://gerrit.libreoffice.org/46032
diff --git a/sw/inc/app.hrc b/sw/inc/app.hrc
index fdb9f6f11f98..352bab8ecfbc 100644
--- a/sw/inc/app.hrc
+++ b/sw/inc/app.hrc
@@ -44,7 +44,7 @@ const std::pair<const char*, int> RID_PARAGRAPHSTYLEFAMILY[] =
const std::pair<const char*, int> RID_CHARACTERSTYLEFAMILY[] =
{
- { NC_("RID_CHARACTERSTYLEFAMILY", "All") ,
SFXSTYLEBIT_ALL_VISIBLE },
+ { NC_("RID_CHARACTERSTYLEFAMILY", "All Styles") ,
SFXSTYLEBIT_ALL_VISIBLE },
{ NC_("RID_CHARACTERSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN
},
{ NC_("RID_CHARACTERSTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED
},
{ NC_("RID_CHARACTERSTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF
},
@@ -53,7 +53,7 @@ const std::pair<const char*, int> RID_CHARACTERSTYLEFAMILY[] =
const std::pair<const char*, int> RID_FRAMESTYLEFAMILY[] =
{
- { NC_("RID_FRAMESTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE
},
+ { NC_("RID_FRAMESTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE
},
{ NC_("RID_FRAMESTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
{ NC_("RID_FRAMESTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
{ NC_("RID_FRAMESTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
@@ -62,7 +62,7 @@ const std::pair<const char*, int> RID_FRAMESTYLEFAMILY[] =
const std::pair<const char*, int> RID_PAGESTYLEFAMILY[] =
{
- { NC_("RID_PAGESTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE
},
+ { NC_("RID_PAGESTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE
},
{ NC_("RID_PAGESTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
{ NC_("RID_PAGESTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
{ NC_("RID_PAGESTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
@@ -71,7 +71,7 @@ const std::pair<const char*, int> RID_PAGESTYLEFAMILY[] =
const std::pair<const char*, int> RID_LISTSTYLEFAMILY[] =
{
- { NC_("RID_LISTSTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE
},
+ { NC_("RID_LISTSTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE
},
{ NC_("RID_LISTSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
{ NC_("RID_LISTSTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
{ NC_("RID_LISTSTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
@@ -80,7 +80,7 @@ const std::pair<const char*, int> RID_LISTSTYLEFAMILY[] =
const std::pair<const char*, int> RID_TABLESTYLEFAMILY[] =
{
- { NC_("RID_TABLESTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE
},
+ { NC_("RID_TABLESTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE
},
{ NC_("RID_TABLESTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
{ NC_("RID_TABLESTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
{ NC_("RID_TABLESTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
