[Libreoffice-commits] core.git: cui/uiconfig sc/uiconfig

Gabor Kelemen kelemeng at ubuntu.com
Sun Aug 20 09:24:49 UTC 2017


 cui/uiconfig/ui/specialcharacters.ui |    2 +-
 sc/uiconfig/scalc/ui/dataprovider.ui |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 668ab2e739397e6b095372a1a468bd4f515927b6
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Sat Aug 19 11:15:03 2017 +0200

    Fix 'make translations' run
    
    Recent commits introduced strings in .ui files without context
    which makes 'make translations' fail with:
    
    [build POT] pot.done
    Traceback (most recent call last):
      File "/home/gabor/src/core/solenv/bin/uiex", line 30, in <module>
        keyid = entry.msgctxt + '|' + entry.msgid
    TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'
    
    Affected commits are:
    e74be9ad773c7769c5d8765bb2ac234967e420ec
    213a83ce46edf1b81f2285fd59f1d04935760caa
    
    Change-Id: If7afc4bb157a6406cabba141d375e9b0dab5f3de
    Reviewed-on: https://gerrit.libreoffice.org/41322
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui
index b5d2abc7abf0..ba978fc37929 100644
--- a/cui/uiconfig/ui/specialcharacters.ui
+++ b/cui/uiconfig/ui/specialcharacters.ui
@@ -138,7 +138,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes">Search:</property>
+                    <property name="label" translatable="yes" context="specialcharacters|srchft">Search:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
diff --git a/sc/uiconfig/scalc/ui/dataprovider.ui b/sc/uiconfig/scalc/ui/dataprovider.ui
index c6deab0572bb..0dfa418fcf6a 100644
--- a/sc/uiconfig/scalc/ui/dataprovider.ui
+++ b/sc/uiconfig/scalc/ui/dataprovider.ui
@@ -162,7 +162,7 @@
                               <object class="GtkLabel" id="label_db">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Database Range:</property>
+                                <property name="label" translatable="yes" context="datastreams|label_db">Database Range:</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>


More information about the Libreoffice-commits mailing list