[Libreoffice-commits] core.git: 2 commits - bin/ui-translatable.sh cui/uiconfig sc/uiconfig sw/uiconfig

Andras Timar andras.timar at collabora.com
Sun Jan 19 09:52:37 PST 2014


 bin/ui-translatable.sh                       |    4 +
 cui/uiconfig/ui/opthtmlpage.ui               |    6 +-
 sc/uiconfig/scalc/ui/consolidatedialog.ui    |   22 ++++-----
 sc/uiconfig/scalc/ui/solversuccessdialog.ui  |    4 -
 sc/uiconfig/scalc/ui/standardfilterdialog.ui |   64 +++++++++++++--------------
 sc/uiconfig/scalc/ui/xmlsourcedialog.ui      |    2 
 sw/uiconfig/swriter/ui/exchangedatabases.ui  |    2 
 sw/uiconfig/swriter/ui/frmaddpage.ui         |    4 -
 8 files changed, 56 insertions(+), 52 deletions(-)

New commits:
commit 97eed7f636e2e6a11325b5360be4ee4262f1efb8
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Jan 19 19:01:29 2014 +0100

    make strings localizable in *.ui (bin/ui-translatable.sh)
    
    Change-Id: I60b74cecc17352681fac7dfa0e41114515dbd6f5

diff --git a/cui/uiconfig/ui/opthtmlpage.ui b/cui/uiconfig/ui/opthtmlpage.ui
index 56cc127..9d2fa259 100644
--- a/cui/uiconfig/ui/opthtmlpage.ui
+++ b/cui/uiconfig/ui/opthtmlpage.ui
@@ -563,9 +563,9 @@
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <items>
-                          <item>Microsoft Internet Explorer</item>
-                          <item>Mozilla Firefox</item>
-                          <item>%PRODUCTNAME Writer</item>
+                          <item translatable="yes">Microsoft Internet Explorer</item>
+                          <item translatable="yes">Mozilla Firefox</item>
+                          <item translatable="yes">%PRODUCTNAME Writer</item>
                         </items>
                       </object>
                       <packing>
diff --git a/sc/uiconfig/scalc/ui/consolidatedialog.ui b/sc/uiconfig/scalc/ui/consolidatedialog.ui
index a2bf82d..0a4783a 100644
--- a/sc/uiconfig/scalc/ui/consolidatedialog.ui
+++ b/sc/uiconfig/scalc/ui/consolidatedialog.ui
@@ -121,17 +121,17 @@
                 <property name="entry_text_column">0</property>
                 <property name="id_column">1</property>
                 <items>
-                  <item>Sum</item>
-                  <item>Count</item>
-                  <item>Average</item>
-                  <item>Max</item>
-                  <item>Min</item>
-                  <item>Product</item>
-                  <item>Count (numbers only)</item>
-                  <item>StDev (sample)</item>
-                  <item>StDevP (population)</item>
-                  <item>Var (sample)</item>
-                  <item>VarP (population)</item>
+                  <item translatable="yes">Sum</item>
+                  <item translatable="yes">Count</item>
+                  <item translatable="yes">Average</item>
+                  <item translatable="yes">Max</item>
+                  <item translatable="yes">Min</item>
+                  <item translatable="yes">Product</item>
+                  <item translatable="yes">Count (numbers only)</item>
+                  <item translatable="yes">StDev (sample)</item>
+                  <item translatable="yes">StDevP (population)</item>
+                  <item translatable="yes">Var (sample)</item>
+                  <item translatable="yes">VarP (population)</item>
                 </items>
               </object>
               <packing>
diff --git a/sc/uiconfig/scalc/ui/solversuccessdialog.ui b/sc/uiconfig/scalc/ui/solversuccessdialog.ui
index 3c01f37..b2027ac 100644
--- a/sc/uiconfig/scalc/ui/solversuccessdialog.ui
+++ b/sc/uiconfig/scalc/ui/solversuccessdialog.ui
@@ -73,7 +73,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label">Keep Result</property>
+                <property name="label" translatable="yes">Keep Result</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -89,7 +89,7 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel">
-                <property name="label">Restore Previous</property>
+                <property name="label" translatable="yes">Restore Previous</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
index 7568938..b181140 100644
--- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
@@ -119,8 +119,8 @@
                           <relation type="labelled-by" target="label2"/>
                         </accessibility>
                         <items>
-                          <item>AND</item>
-                          <item>OR</item>
+                          <item translatable="yes">AND</item>
+                          <item translatable="yes">OR</item>
                         </items>
                       </object>
                       <packing>
@@ -140,8 +140,8 @@
                           <relation type="labelled-by" target="label2"/>
                         </accessibility>
                         <items>
-                          <item>AND</item>
-                          <item>OR</item>
+                          <item translatable="yes">AND</item>
+                          <item translatable="yes">OR</item>
                         </items>
                       </object>
                       <packing>
@@ -158,8 +158,8 @@
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
                         <items>
-                          <item>AND</item>
-                          <item>OR</item>
+                          <item translatable="yes">AND</item>
+                          <item translatable="yes">OR</item>
                         </items>
                       </object>
                       <packing>
@@ -176,8 +176,8 @@
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
                         <items>
-                          <item>AND</item>
-                          <item>OR</item>
+                          <item translatable="yes">AND</item>
+                          <item translatable="yes">OR</item>
                         </items>
                       </object>
                       <packing>
@@ -314,12 +314,12 @@
                           <relation type="labelled-by" target="label4"/>
                         </accessibility>
                         <items>
-                          <item>=</item>
-                          <item><</item>
-                          <item>></item>
-                          <item><=</item>
-                          <item>>=</item>
-                          <item><></item>
+                          <item translatable="no">=</item>
+                          <item translatable="no"><</item>
+                          <item translatable="no">></item>
+                          <item translatable="no"><=</item>
+                          <item translatable="no">>=</item>
+                          <item translatable="no"><></item>
                           <item translatable="yes">Largest</item>
                           <item translatable="yes">Smallest</item>
                           <item translatable="yes">Largest %</item>
@@ -349,12 +349,12 @@
                           <relation type="labelled-by" target="label4"/>
                         </accessibility>
                         <items>
-                          <item>=</item>
-                          <item><</item>
-                          <item>></item>
-                          <item><=</item>
-                          <item>>=</item>
-                          <item><></item>
+                          <item translatable="no">=</item>
+                          <item translatable="no"><</item>
+                          <item translatable="no">></item>
+                          <item translatable="no"><=</item>
+                          <item translatable="no">>=</item>
+                          <item translatable="no"><></item>
                           <item translatable="yes">Largest</item>
                           <item translatable="yes">Smallest</item>
                           <item translatable="yes">Largest %</item>
@@ -384,12 +384,12 @@
                           <relation type="labelled-by" target="label4"/>
                         </accessibility>
                         <items>
-                          <item>=</item>
-                          <item><</item>
-                          <item>></item>
-                          <item><=</item>
-                          <item>>=</item>
-                          <item><></item>
+                          <item translatable="no">=</item>
+                          <item translatable="no"><</item>
+                          <item translatable="no">></item>
+                          <item translatable="no"><=</item>
+                          <item translatable="no">>=</item>
+                          <item translatable="no"><></item>
                           <item translatable="yes">Largest</item>
                           <item translatable="yes">Smallest</item>
                           <item translatable="yes">Largest %</item>
@@ -416,12 +416,12 @@
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
                         <items>
-                          <item>=</item>
-                          <item><</item>
-                          <item>></item>
-                          <item><=</item>
-                          <item>>=</item>
-                          <item><></item>
+                          <item translatable="no">=</item>
+                          <item translatable="no"><</item>
+                          <item translatable="no">></item>
+                          <item translatable="no"><=</item>
+                          <item translatable="no">>=</item>
+                          <item translatable="no"><></item>
                           <item translatable="yes">Largest</item>
                           <item translatable="yes">Smallest</item>
                           <item translatable="yes">Largest %</item>
diff --git a/sc/uiconfig/scalc/ui/xmlsourcedialog.ui b/sc/uiconfig/scalc/ui/xmlsourcedialog.ui
index 689e270..d97d0d3 100644
--- a/sc/uiconfig/scalc/ui/xmlsourcedialog.ui
+++ b/sc/uiconfig/scalc/ui/xmlsourcedialog.ui
@@ -206,7 +206,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
-                <property name="label">_Import</property>
+                <property name="label" translatable="yes">_Import</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui
index 1085589..64ed4a7 100644
--- a/sw/uiconfig/swriter/ui/exchangedatabases.ui
+++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui
@@ -238,7 +238,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/frmaddpage.ui b/sw/uiconfig/swriter/ui/frmaddpage.ui
index 96e6fa6..b668b2e 100644
--- a/sw/uiconfig/swriter/ui/frmaddpage.ui
+++ b/sw/uiconfig/swriter/ui/frmaddpage.ui
@@ -97,7 +97,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <items>
-                      <item><None></item>
+                      <item translatable="yes"><None></item>
                     </items>
                   </object>
                   <packing>
@@ -113,7 +113,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <items>
-                      <item><None></item>
+                      <item translatable="yes"><None></item>
                     </items>
                   </object>
                   <packing>
commit bf32240b97ad2cf6a515715a4214497e4fb00bb9
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Jan 19 18:48:30 2014 +0100

    detect unlocalizable strings in GtkComboBoxText <item> elements
    
    Change-Id: I0598be74345b70aee7feefeaea4cf525a5f2173b

diff --git a/bin/ui-translatable.sh b/bin/ui-translatable.sh
index affac56..1d88d9d 100755
--- a/bin/ui-translatable.sh
+++ b/bin/ui-translatable.sh
@@ -15,4 +15,8 @@ for i in `git ls-files *.ui`; do
             then echo "Source: $i^";
         fi
     done
+    grep -s "<item>" $i | grep -v "translatable\=\"yes" | grep -v "translatable\=\"no" | grep ">.*[A-Za-z].*<";
+    if [ "$?" -eq 0 ] ;
+        then echo "Source: $i^";
+    fi
 done


More information about the Libreoffice-commits mailing list