bin/ui-translatable.sh | 2 +- cui/uiconfig/ui/specialcharacters.ui | 2 +- desktop/uiconfig/ui/cmdlinehelp.ui | 8 ++++---- sc/uiconfig/scalc/ui/sidebarcellappearance.ui | 8 ++++---- sc/uiconfig/scalc/ui/sidebarnumberformat.ui | 10 +++++----- sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 4 ++-- sd/uiconfig/simpress/ui/slidedesigndialog.ui | 2 +- sfx2/uiconfig/ui/alienwarndialog.ui | 2 +- starmath/uiconfig/smath/ui/spacingdialog.ui | 8 ++++---- svtools/uiconfig/ui/addresstemplatedialog.ui | 20 ++++++++++---------- svx/uiconfig/ui/findreplacedialog.ui | 6 +++--- sw/uiconfig/swriter/ui/exchangedatabases.ui | 2 +- sw/uiconfig/swriter/ui/mmoutputtypepage.ui | 2 +- sw/uiconfig/swriter/ui/opttestpage.ui | 22 +++++++++++----------- sw/uiconfig/swriter/ui/sidebarpage.ui | 8 ++++---- 15 files changed, 53 insertions(+), 53 deletions(-)
New commits: commit 642df5d716f858f1f6b3d6219132c3323032975a Author: Andras Timar <andras.ti...@collabora.com> Date: Sat Nov 30 19:04:43 2013 +0100 mark non-translatable .ui strings explicitely as such so bin/ui-translatable.sh will not find false positives Change-Id: I35e98ba22ba8c0cc9bbf0de40b31be421acc4c15 diff --git a/bin/ui-translatable.sh b/bin/ui-translatable.sh index 34f3d08..affac56 100755 --- a/bin/ui-translatable.sh +++ b/bin/ui-translatable.sh @@ -10,7 +10,7 @@ for i in `git ls-files *.ui`; do for j in "label" "title" "text" "format" "copyright" "comments" "preview_text" "tooltip" "message" ; do - grep -s "\<property name\=\"$j\"" $i | grep -v "translatable\=\"yes" | grep -v gtk\- | grep ">.*[A-Za-z].*<"; + grep -s "\<property name\=\"$j\"" $i | grep -v "translatable\=\"yes" | grep -v "translatable\=\"no" | grep -v gtk\- | grep ">.*[A-Za-z].*<"; if [ "$?" -eq 0 ] ; then echo "Source: $i^"; fi diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui index c634b25..961021f 100644 --- a/cui/uiconfig/ui/specialcharacters.ui +++ b/cui/uiconfig/ui/specialcharacters.ui @@ -190,7 +190,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label"> U+FFFF(65535) </property> + <property name="label" translatable="no"> U+FFFF(65535) </property> </object> <packing> <property name="left_attach">0</property> diff --git a/desktop/uiconfig/ui/cmdlinehelp.ui b/desktop/uiconfig/ui/cmdlinehelp.ui index 4c77147..62c61ac 100644 --- a/desktop/uiconfig/ui/cmdlinehelp.ui +++ b/desktop/uiconfig/ui/cmdlinehelp.ui @@ -24,7 +24,7 @@ <property name="halign">start</property> <property name="xalign">0</property> <property name="xpad">10</property> - <property name="label">HEADER</property> + <property name="label" translatable="no">HEADER</property> </object> <packing> <property name="expand">False</property> @@ -44,7 +44,7 @@ <property name="halign">start</property> <property name="xalign">0</property> <property name="xpad">10</property> - <property name="label">LEFT</property> + <property name="label" translatable="no">LEFT</property> </object> <packing> <property name="left_attach">0</property> @@ -60,7 +60,7 @@ <property name="halign">start</property> <property name="xalign">0</property> <property name="xpad">10</property> - <property name="label">RIGHT</property> + <property name="label" translatable="no">RIGHT</property> </object> <packing> <property name="left_attach">1</property> @@ -83,7 +83,7 @@ <property name="halign">start</property> <property name="xalign">0</property> <property name="xpad">10</property> - <property name="label">BOTTOM</property> + <property name="label" translatable="no">BOTTOM</property> </object> <packing> <property name="expand">False</property> diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui index 59e02ae..cdf59e1 100644 --- a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui +++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui @@ -48,7 +48,7 @@ <property name="halign">start</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:BackgroundColor</property> - <property name="label" translatable="yes">toolbutton1</property> + <property name="label" translatable="no">toolbutton1</property> <property name="use_underline">True</property> </object> <packing> @@ -106,7 +106,7 @@ <property name="halign">start</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:SetBorderStyle</property> - <property name="label" translatable="yes">toolbutton1</property> + <property name="label" translatable="no">toolbutton1</property> <property name="use_underline">True</property> </object> <packing> @@ -143,7 +143,7 @@ <property name="halign">end</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:LineStyle</property> - <property name="label" translatable="yes">toolbutton2</property> + <property name="label" translatable="no">toolbutton2</property> <property name="use_underline">True</property> </object> <packing> @@ -178,7 +178,7 @@ <property name="hexpand">True</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:FrameLineColor</property> - <property name="label" translatable="yes">toolbutton1</property> + <property name="label" translatable="no">toolbutton1</property> <property name="use_underline">True</property> </object> <packing> diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui index 1ea42a4..a90fe61 100644 --- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui +++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui @@ -68,7 +68,7 @@ <property name="can_focus">False</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:NumericField</property> - <property name="label" translatable="yes">toolbutton1</property> + <property name="label" translatable="no">toolbutton1</property> <property name="use_underline">True</property> </object> <packing> @@ -83,7 +83,7 @@ <property name="can_focus">False</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:NumberFormatPercent</property> - <property name="label" translatable="yes">toolbutton2</property> + <property name="label" translatable="no">toolbutton2</property> <property name="use_underline">True</property> </object> <packing> @@ -98,7 +98,7 @@ <property name="can_focus">False</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:NumberFormatCurrency</property> - <property name="label" translatable="yes">toolbutton3</property> + <property name="label" translatable="no">toolbutton3</property> <property name="use_underline">True</property> </object> <packing> @@ -113,7 +113,7 @@ <property name="can_focus">False</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:NumberFormatDate</property> - <property name="label" translatable="yes">toolbutton4</property> + <property name="label" translatable="no">toolbutton4</property> <property name="use_underline">True</property> </object> <packing> @@ -128,7 +128,7 @@ <property name="can_focus">False</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:InsertFixedText</property> - <property name="label" translatable="yes">toolbutton5</property> + <property name="label" translatable="no">toolbutton5</property> <property name="use_underline">True</property> </object> <packing> diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui index 8bd31ce..d68cf1b 100644 --- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui +++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui @@ -551,7 +551,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> @@ -581,7 +581,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/starmath/uiconfig/smath/ui/spacingdialog.ui b/starmath/uiconfig/smath/ui/spacingdialog.ui index a0dd15d..7d69e96 100644 --- a/starmath/uiconfig/smath/ui/spacingdialog.ui +++ b/starmath/uiconfig/smath/ui/spacingdialog.ui @@ -193,7 +193,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> - <property name="label">String 1</property> + <property name="label" translatable="no">String 1</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinbutton1:0.00cm</property> </object> @@ -209,7 +209,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> - <property name="label">String 2</property> + <property name="label" translatable="no">String 2</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinbutton2:0.00cm</property> </object> @@ -225,7 +225,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> - <property name="label">String 3</property> + <property name="label" translatable="no">String 3</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinbutton3:0.00cm</property> </object> @@ -256,7 +256,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> - <property name="label">String 4</property> + <property name="label" translatable="no">String 4</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spinbutton4:0.00cm</property> </object> diff --git a/svtools/uiconfig/ui/addresstemplatedialog.ui b/svtools/uiconfig/ui/addresstemplatedialog.ui index 158b54d..01b4e76 100644 --- a/svtools/uiconfig/ui/addresstemplatedialog.ui +++ b/svtools/uiconfig/ui/addresstemplatedialog.ui @@ -251,7 +251,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label">label</property> + <property name="label" translatable="no">label</property> <property name="use_underline">True</property> <property name="mnemonic_widget">box0</property> </object> @@ -282,7 +282,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label">label</property> + <property name="label" translatable="no">label</property> <property name="use_underline">True</property> <property name="mnemonic_widget">box2</property> </object> @@ -298,7 +298,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label">label</property> + <property name="label" translatable="no">label</property> <property name="use_underline">True</property> <property name="mnemonic_widget">box4</property> </object> @@ -314,7 +314,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label">label</property> + <property name="label" translatable="no">label</property> <property name="use_underline">True</property> <property name="mnemonic_widget">box6</property> </object> @@ -330,7 +330,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label">label</property> + <property name="label" translatable="no">label</property> <property name="use_underline">True</property> <property name="mnemonic_widget">box8</property> </object> @@ -422,7 +422,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label">label</property> + <property name="label" translatable="no">label</property> <property name="use_underline">True</property> <property name="mnemonic_widget">box1</property> </object> @@ -453,7 +453,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label">label</property> + <property name="label" translatable="no">label</property> <property name="use_underline">True</property> <property name="mnemonic_widget">box3</property> </object> @@ -469,7 +469,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label">label</property> + <property name="label" translatable="no">label</property> <property name="use_underline">True</property> <property name="mnemonic_widget">box5</property> </object> @@ -485,7 +485,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label">label</property> + <property name="label" translatable="no">label</property> <property name="use_underline">True</property> <property name="mnemonic_widget">box7</property> </object> @@ -501,7 +501,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label">label</property> + <property name="label" translatable="no">label</property> <property name="use_underline">True</property> <property name="mnemonic_widget">box9</property> </object> diff --git a/svx/uiconfig/ui/findreplacedialog.ui b/svx/uiconfig/ui/findreplacedialog.ui index 0f289b5..5cfef22 100644 --- a/svx/uiconfig/ui/findreplacedialog.ui +++ b/svx/uiconfig/ui/findreplacedialog.ui @@ -443,7 +443,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkButton" id="component1"> - <property name="label">component button 1</property> + <property name="label" translatable="no">component button 1</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="no_show_all">True</property> @@ -457,7 +457,7 @@ </child> <child> <object class="GtkButton" id="component2"> - <property name="label">component button 2</property> + <property name="label" translatable="no">component button 2</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="no_show_all">True</property> @@ -477,7 +477,7 @@ <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">component label</property> + <property name="label" translatable="no">component label</property> <property name="use_underline">True</property> <attributes> <attribute name="weight" value="bold"/> diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui index 2cba93f..3a72290 100644 --- a/sw/uiconfig/swriter/ui/exchangedatabases.ui +++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui @@ -237,7 +237,7 @@ Use the browse button to select a database file.</property> <object class="GtkLabel" id="dbnameft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">DataSource.Command</property> + <property name="label" translatable="no">DataSource.Command</property> </object> <packing> <property name="expand">False</property> diff --git a/sw/uiconfig/swriter/ui/mmoutputtypepage.ui b/sw/uiconfig/swriter/ui/mmoutputtypepage.ui index 70fd673..aaa6089 100644 --- a/sw/uiconfig/swriter/ui/mmoutputtypepage.ui +++ b/sw/uiconfig/swriter/ui/mmoutputtypepage.ui @@ -115,7 +115,7 @@ </child> <child> <object class="GtkButton" id="button1"> - <property name="label">layoutdetail-forheight</property> + <property name="label" translatable="no">layoutdetail-forheight</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="no_show_all">True</property> diff --git a/sw/uiconfig/swriter/ui/opttestpage.ui b/sw/uiconfig/swriter/ui/opttestpage.ui index bd9296e..4d32697 100644 --- a/sw/uiconfig/swriter/ui/opttestpage.ui +++ b/sw/uiconfig/swriter/ui/opttestpage.ui @@ -29,7 +29,7 @@ <property name="column_homogeneous">True</property> <child> <object class="GtkCheckButton" id="unused"> - <property name="label">unused</property> + <property name="label" translatable="no">unused</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -45,7 +45,7 @@ </child> <child> <object class="GtkCheckButton" id="dynamic"> - <property name="label">dynamic</property> + <property name="label" translatable="no">dynamic</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -61,7 +61,7 @@ </child> <child> <object class="GtkCheckButton" id="nocalm"> - <property name="label">No calm</property> + <property name="label" translatable="no">No calm</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -77,7 +77,7 @@ </child> <child> <object class="GtkCheckButton" id="wysiwygdbg"> - <property name="label">WYSIWYG debug</property> + <property name="label" translatable="no">WYSIWYG debug</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -93,7 +93,7 @@ </child> <child> <object class="GtkCheckButton" id="winformat"> - <property name="label">win format</property> + <property name="label" translatable="no">win format</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -109,7 +109,7 @@ </child> <child> <object class="GtkCheckButton" id="noscreenadj"> - <property name="label">No screen adj</property> + <property name="label" translatable="no">No screen adj</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -125,7 +125,7 @@ </child> <child> <object class="GtkCheckButton" id="noscroll"> - <property name="label">No Scroll</property> + <property name="label" translatable="no">No Scroll</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -141,7 +141,7 @@ </child> <child> <object class="GtkCheckButton" id="AutoFormatByInput"> - <property name="label">AutoFormat by Input</property> + <property name="label" translatable="no">AutoFormat by Input</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -157,7 +157,7 @@ </child> <child> <object class="GtkCheckButton" id="DrawingLayerNotLoading"> - <property name="label">DrawingLayerNotLoading</property> + <property name="label" translatable="no">DrawingLayerNotLoading</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -173,7 +173,7 @@ </child> <child> <object class="GtkCheckButton" id="noidle"> - <property name="label">No idle format</property> + <property name="label" translatable="no">No idle format</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -195,7 +195,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label">Settings only for testpurposes</property> + <property name="label" translatable="no">Settings only for testpurposes</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sw/uiconfig/swriter/ui/sidebarpage.ui b/sw/uiconfig/swriter/ui/sidebarpage.ui index 530e135..9c53099 100644 --- a/sw/uiconfig/swriter/ui/sidebarpage.ui +++ b/sw/uiconfig/swriter/ui/sidebarpage.ui @@ -29,7 +29,7 @@ <property name="tooltip_text" translatable="yes">Orientation</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:Orientation</property> - <property name="label" translatable="yes">toolbutton1</property> + <property name="label" translatable="no">toolbutton1</property> <property name="use_underline">True</property> </object> <packing> @@ -59,7 +59,7 @@ <property name="tooltip_text" translatable="yes">Size</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:Size</property> - <property name="label" translatable="yes">toolbutton3</property> + <property name="label" translatable="no">toolbutton3</property> <property name="use_underline">True</property> </object> <packing> @@ -90,7 +90,7 @@ <property name="tooltip_text" translatable="yes">Columns</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:Column</property> - <property name="label" translatable="yes">toolbutton4</property> + <property name="label" translatable="no">toolbutton4</property> <property name="use_underline">True</property> </object> <packing> @@ -120,7 +120,7 @@ <property name="tooltip_text" translatable="yes">Margin</property> <property name="use_action_appearance">False</property> <property name="action_name">.uno:Margin</property> - <property name="label" translatable="yes">toolbutton2</property> + <property name="label" translatable="no">toolbutton2</property> <property name="use_underline">True</property> </object> <packing> commit 79384a8f6049d10fd581e782deb57db653ac1a25 Author: Andras Timar <andras.ti...@collabora.com> Date: Sat Nov 30 18:56:07 2013 +0100 make some .ui strings translatable Conflicts: svx/uiconfig/ui/linkwarndialog.ui Change-Id: I3e2a93ac7521b4b484a96da22efac0b4cb52b333 diff --git a/sd/uiconfig/simpress/ui/slidedesigndialog.ui b/sd/uiconfig/simpress/ui/slidedesigndialog.ui index 901bfc95..326eb2f 100644 --- a/sd/uiconfig/simpress/ui/slidedesigndialog.ui +++ b/sd/uiconfig/simpress/ui/slidedesigndialog.ui @@ -152,7 +152,7 @@ </child> <child> <object class="GtkButton" id="load"> - <property name="label">_Load...</property> + <property name="label" translatable="yes">_Load...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/sfx2/uiconfig/ui/alienwarndialog.ui b/sfx2/uiconfig/ui/alienwarndialog.ui index 02bbca3..5975d10 100644 --- a/sfx2/uiconfig/ui/alienwarndialog.ui +++ b/sfx2/uiconfig/ui/alienwarndialog.ui @@ -40,7 +40,7 @@ </child> <child> <object class="GtkButton" id="cancel"> - <property name="label">Use _ODF Format</property> + <property name="label" translatable="yes">Use _ODF Format</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