sc/uiconfig/scalc/ui/dataprovider.ui | 16 +++++++-------- sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 2 - sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 2 - 3 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit f4be69b407f33d541623ade19fccacfc20f1d139 Author: Christian Lohmaier <[email protected]> Date: Wed Sep 13 13:44:46 2017 +0200 add missing context to translatable strings in ui files the context is requires to create translation templates (pot files, using "make translate") to guarantee uniqueness of strings Change-Id: Ie3df130f69c72ad468839235769f55286f4f3e48 diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index 4adf4b0339d8..d35740b9f561 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -3346,7 +3346,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StyleApply?Style:string=Quotation&FamilyName:string=CharacterStyles</property> - <property name="label" translatable="yes">Quotation</property> + <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Quotation2">Quotation</property> </object> </child> <child> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index 79e8f2d0e1aa..7656f678fdad 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -3264,7 +3264,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:StyleApply?Style:string=Quotation&FamilyName:string=CharacterStyles</property> - <property name="label" translatable="yes">Quotation</property> + <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Quotaion2">Quotation</property> </object> </child> <child> commit 9a7c53e589e60a731ad06ce34f62ad1c623fe689 Author: Christian Lohmaier <[email protected]> Date: Wed Sep 13 13:41:29 2017 +0200 having context in strings is not enough, it should also be ~unique using the same context as in datastreams.ui causes duplicate (identical) strings in pot files, and some translation tools stumble over those see also tdf#109258 Change-Id: I88b083f56a45123a6cf7521ceaaefa89f77e0477 diff --git a/sc/uiconfig/scalc/ui/dataprovider.ui b/sc/uiconfig/scalc/ui/dataprovider.ui index 4a3bdb0ed60d..ff4c55a7192b 100644 --- a/sc/uiconfig/scalc/ui/dataprovider.ui +++ b/sc/uiconfig/scalc/ui/dataprovider.ui @@ -6,7 +6,7 @@ <object class="GtkDialog" id="DataProviderDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes" context="datastreams|DataStreamDialog">Live Data Streams</property> + <property name="title" translatable="yes" context="dataprovider|DataStreamDialog">Live Data Streams</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -104,7 +104,7 @@ <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="datastreams|label6">URL:</property> + <property name="label" translatable="yes" context="dataprovider|label6">URL:</property> </object> <packing> <property name="expand">False</property> @@ -117,7 +117,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes" context="datastreams|url|tooltip_text">Enter the URL of the source document in the local file system or Internet here.</property> + <property name="tooltip_text" translatable="yes" context="dataprovider|url|tooltip_text">Enter the URL of the source document in the local file system or Internet here.</property> <property name="hexpand">True</property> <property name="has_entry">True</property> <property name="max_width_chars">48</property> @@ -135,7 +135,7 @@ </child> <child> <object class="GtkButton" id="browse"> - <property name="label" translatable="yes" context="datastreams|browse">_Browse...</property> + <property name="label" translatable="yes" context="dataprovider|browse">_Browse...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -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" context="datastreams|label_db">Database Range:</property> + <property name="label" translatable="yes" context="dataprovider|label_db">Database Range:</property> </object> <packing> <property name="expand">False</property> @@ -196,7 +196,7 @@ <object class="GtkLabel" id="label_provider"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="datastreams|label_provider">Data Provider:</property> + <property name="label" translatable="yes" context="dataprovider|label_provider">Data Provider:</property> </object> <packing> <property name="expand">False</property> @@ -231,7 +231,7 @@ <object class="GtkLabel" id="label_search"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="datastreams|label_search">Search String:</property> + <property name="label" translatable="yes" context="dataprovider|label_search">Search String:</property> </object> <packing> <property name="expand">False</property> @@ -265,7 +265,7 @@ <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="datastreams|label">Source Stream</property> + <property name="label" translatable="yes" context="dataprovider|label">Source Stream</property> <attributes> <attribute name="weight" value="bold"/> </attributes> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
