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

Gabor Kelemen (via logerrit) logerrit at kemper.freedesktop.org
Sun Mar 24 19:07:04 UTC 2019


 basctl/uiconfig/basicide/ui/basicmacrodialog.ui |    4 ++--
 bin/ui-translatable.sh                          |    2 +-
 cui/uiconfig/ui/personalization_tab.ui          |    2 +-
 sd/uiconfig/simpress/ui/templatedialog.ui       |    2 +-
 svtools/uiconfig/ui/addresstemplatedialog.ui    |   20 ++++++++++----------
 sw/uiconfig/swriter/ui/exchangedatabases.ui     |    2 +-
 sw/uiconfig/swriter/ui/templatedialog8.ui       |    2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit c18179cf80516f1eca9629a0a8b888e0ca67a020
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Sun Mar 24 12:41:57 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Mar 24 19:53:34 2019 +0100

    Make some .ui strings translatable / not translatable
    
    Found with bin/ui-translatable.sh
    
    Change-Id: I63d613a946c32821c836aaeda897b9713cc681f7
    Reviewed-on: https://gerrit.libreoffice.org/69595
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
index 4fbaa0ff41c3..bbae04a2c29d 100644
--- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
+++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
@@ -360,7 +360,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="delete">
-                        <property name="label">_Delete</property>
+                        <property name="label" translatable="yes" context="basicmacrodialog|delete">_Delete</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -374,7 +374,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="new">
-                        <property name="label">_New</property>
+                        <property name="label" translatable="yes" context="basicmacrodialog|new">_New</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="no_show_all">True</property>
diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui
index 56ae2dfb089a..cef5483dc108 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -208,7 +208,7 @@
                     </child>
                     <child>
                       <object class="GtkLinkButton" id="applied_theme_link">
-                        <property name="label">Applied persona's name and URL</property>
+                        <property name="label" translatable="no">Applied persona's name and URL</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="relief">none</property>
diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui b/sd/uiconfig/simpress/ui/templatedialog.ui
index e31f85a111ad..600104dbd243 100644
--- a/sd/uiconfig/simpress/ui/templatedialog.ui
+++ b/sd/uiconfig/simpress/ui/templatedialog.ui
@@ -38,7 +38,7 @@
             </child>
             <child>
               <object class="GtkButton" id="standard">
-                <property name="label">_Standard</property>
+                <property name="label" translatable="yes" context="templatedialog|standard">_Standard</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/svtools/uiconfig/ui/addresstemplatedialog.ui b/svtools/uiconfig/ui/addresstemplatedialog.ui
index 5c140908d33c..f313cabab705 100644
--- a/svtools/uiconfig/ui/addresstemplatedialog.ui
+++ b/svtools/uiconfig/ui/addresstemplatedialog.ui
@@ -253,7 +253,7 @@
                                           <object class="GtkLabel" id="label0">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</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>
                                             <property name="xalign">1</property>
@@ -278,7 +278,7 @@
                                           <object class="GtkLabel" id="label2">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</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>
                                             <property name="xalign">1</property>
@@ -292,7 +292,7 @@
                                           <object class="GtkLabel" id="label4">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</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>
                                             <property name="xalign">1</property>
@@ -306,7 +306,7 @@
                                           <object class="GtkLabel" id="label6">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</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>
                                             <property name="xalign">1</property>
@@ -320,7 +320,7 @@
                                           <object class="GtkLabel" id="label8">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</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>
                                             <property name="xalign">1</property>
@@ -392,7 +392,7 @@
                                           <object class="GtkLabel" id="label1">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</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>
                                             <property name="xalign">1</property>
@@ -417,7 +417,7 @@
                                           <object class="GtkLabel" id="label3">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</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>
                                             <property name="xalign">1</property>
@@ -431,7 +431,7 @@
                                           <object class="GtkLabel" id="label5">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</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>
                                             <property name="xalign">1</property>
@@ -445,7 +445,7 @@
                                           <object class="GtkLabel" id="label7">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</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>
                                             <property name="xalign">1</property>
@@ -459,7 +459,7 @@
                                           <object class="GtkLabel" id="label9">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</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>
                                             <property name="xalign">1</property>
diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui
index 44f3285cda33..70ae9ad90f58 100644
--- a/sw/uiconfig/swriter/ui/exchangedatabases.ui
+++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui
@@ -324,7 +324,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/templatedialog8.ui b/sw/uiconfig/swriter/ui/templatedialog8.ui
index 87d5a777394c..e7aab6487b59 100644
--- a/sw/uiconfig/swriter/ui/templatedialog8.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog8.ui
@@ -68,7 +68,7 @@
             </child>
             <child>
               <object class="GtkButton" id="standard">
-                <property name="label">Standard</property>
+                <property name="label" translatable="yes" context="templatedialog8|standard">Standard</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
commit 0321a639837da7c2ce7ad2f66a7536a5b4a07c6c
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Sun Mar 24 11:36:24 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Mar 24 19:52:11 2019 +0100

    ui-translatable.sh: fix item tag detection for liststores
    
    Previously this script did not find the untranslated liststore items
    that tdf#124240 is about
    
    Change-Id: Ie46d99d246eee316fdda95bdf2d1d3a9aacbc907
    Reviewed-on: https://gerrit.libreoffice.org/69596
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/bin/ui-translatable.sh b/bin/ui-translatable.sh
index 1d88d9df9345..d8188778b10a 100755
--- a/bin/ui-translatable.sh
+++ b/bin/ui-translatable.sh
@@ -15,7 +15,7 @@ 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].*<";
+    grep -s "<item" $i | grep -v "translatable\=\"yes" | grep -v "translatable\=\"no" | grep ">.*[A-Za-z].*<";
     if [ "$?" -eq 0 ] ;
         then echo "Source: $i^";
     fi


More information about the Libreoffice-commits mailing list