cui/source/inc/cuires.hrc | 5 +++++ cui/source/options/personalization.cxx | 9 ++++----- cui/source/options/personalization.src | 20 ++++++++++++++++++++ cui/uiconfig/ui/specialcharacters.ui | 2 +- sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 4 ++-- svx/uiconfig/ui/colorwindow.ui | 2 +- svx/uiconfig/ui/docrecoveryrecoverdialog.ui | 2 +- svx/uiconfig/ui/paralinespacingcontrol.ui | 8 ++++---- 8 files changed, 38 insertions(+), 14 deletions(-)
New commits: commit 9e3b9fa78a9a970028c906b90c857eedbc70692d Author: Andras Timar <andras.ti...@collabora.com> Date: Sat Nov 22 23:47:26 2014 +0100 fdo#86550 make some strings localizable Change-Id: Ie3b47e30b22b4bbae86f575ca1c9f3639afd3afd (cherry picked from commit 6745c24fdad942f61c225632688bce78da0a547e) diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index c85b294..d25afbb 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -431,6 +431,11 @@ #define RID_SVXSTR_CONFIRM_RESTORE_DEFAULT (RID_SVX_START + 1284) #define RID_SVXSTR_CONFIRM_SET_LANGUAGE (RID_SVX_START + 1285) +#define RID_SVXSTR_PERSONA_ABSTRACT (RID_SVX_START + 1286) +#define RID_SVXSTR_PERSONA_COLOR (RID_SVX_START + 1287) +#define RID_SVXSTR_PERSONA_MUSIC (RID_SVX_START + 1288) +#define RID_SVXSTR_PERSONA_NATURE (RID_SVX_START + 1289) + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 5399dab..ff99b0f 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -50,19 +50,19 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent ) m_vSearchSuggestions[0]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); get( m_vSearchSuggestions[1], "suggestion2" ); - m_vSearchSuggestions[1]->SetText( "Abstract" ); + m_vSearchSuggestions[1]->SetText( CUI_RES ( RID_SVXSTR_PERSONA_ABSTRACT ) ); m_vSearchSuggestions[1]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); get( m_vSearchSuggestions[2], "suggestion3" ); - m_vSearchSuggestions[2]->SetText( "Color" ); + m_vSearchSuggestions[2]->SetText( CUI_RES ( RID_SVXSTR_PERSONA_COLOR ) ); m_vSearchSuggestions[2]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); get( m_vSearchSuggestions[3], "suggestion4" ); - m_vSearchSuggestions[3]->SetText( "Music" ); + m_vSearchSuggestions[3]->SetText( CUI_RES( RID_SVXSTR_PERSONA_MUSIC ) ); m_vSearchSuggestions[3]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); get( m_vSearchSuggestions[4], "suggestion5" ); - m_vSearchSuggestions[4]->SetText( "Nature" ); + m_vSearchSuggestions[4]->SetText( CUI_RES( RID_SVXSTR_PERSONA_NATURE ) ); m_vSearchSuggestions[4]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); get( m_pEdit, "search_term" ); @@ -75,7 +75,6 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent ) get( m_pCancelButton, "cancel" ); m_pCancelButton->SetClickHdl( LINK( this, SelectPersonaDialog, ActionCancel ) ); - get( m_vResultList[0], "result1" ); get( m_vResultList[1], "result2" ); get( m_vResultList[2], "result3" ); diff --git a/cui/source/options/personalization.src b/cui/source/options/personalization.src index aeaa9e1..eba74b8 100644 --- a/cui/source/options/personalization.src +++ b/cui/source/options/personalization.src @@ -49,4 +49,24 @@ String RID_SVXSTR_APPLYPERSONA Text [ en-US ] = "Applying Theme..."; }; +String RID_SVXSTR_PERSONA_ABSTRACT +{ + Text [ en-US ] = "Abstract"; +}; + +String RID_SVXSTR_PERSONA_COLOR +{ + Text [ en-US ] = "Color"; +}; + +String RID_SVXSTR_PERSONA_MUSIC +{ + Text [ en-US ] = "Music"; +}; + +String RID_SVXSTR_PERSONA_NATURE +{ + Text [ en-US ] = "Nature"; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui index 5b3824e..ae3bbfc 100644 --- a/cui/uiconfig/ui/specialcharacters.ui +++ b/cui/uiconfig/ui/specialcharacters.ui @@ -19,7 +19,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="ok"> - <property name="label">_Insert</property> + <property name="label" translatable="yes">_Insert</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_default">True</property> diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui index 9126796..b1c8754 100644 --- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui +++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui @@ -488,7 +488,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> - <property name="label">info1</property> + <property name="label" translatable="no">info1</property> <property name="use_underline">True</property> <property name="mnemonic_widget">metricInfo1Fields:0.00mm</property> </object> @@ -513,7 +513,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> - <property name="label">info2</property> + <property name="label" translatable="no">info2</property> <property name="use_underline">True</property> <property name="mnemonic_widget">metricInfo2Fields:0.00mm</property> </object> diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui index eacca5b..37e6627 100644 --- a/svx/uiconfig/ui/colorwindow.ui +++ b/svx/uiconfig/ui/colorwindow.ui @@ -127,7 +127,7 @@ </child> <child> <object class="GtkButton" id="color_picker_button"> - <property name="label">Custom Colorâ¦</property> + <property name="label" translatable="yes">Custom Colorâ¦</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui index 0f4a1a8..a586ca1 100644 --- a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui +++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui @@ -35,7 +35,7 @@ </child> <child> <object class="GtkButton" id="cancel"> - <property name="label">Discard Recovery Data</property> + <property name="label" translatable="yes">Discard Recovery Data</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> diff --git a/svx/uiconfig/ui/paralinespacingcontrol.ui b/svx/uiconfig/ui/paralinespacingcontrol.ui index 4d04d28..f7c7503 100644 --- a/svx/uiconfig/ui/paralinespacingcontrol.ui +++ b/svx/uiconfig/ui/paralinespacingcontrol.ui @@ -65,7 +65,7 @@ <property name="vexpand">True</property> <child> <object class="GtkButton" id="spacing_1"> - <property name="label">Spacing: 1</property> + <property name="label" translatable="yes">Spacing: 1</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -83,7 +83,7 @@ </child> <child> <object class="GtkButton" id="spacing_115"> - <property name="label">Spacing: 1.15</property> + <property name="label" translatable="yes">Spacing: 1.15</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -101,7 +101,7 @@ </child> <child> <object class="GtkButton" id="spacing_15"> - <property name="label">Spacing: 1.5</property> + <property name="label" translatable="yes">Spacing: 1.5</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -119,7 +119,7 @@ </child> <child> <object class="GtkButton" id="spacing_2"> - <property name="label">Spacing: 2</property> + <property name="label" translatable="yes">Spacing: 2</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits