[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - filter/source fpicker/uiconfig officecfg/registry svx/uiconfig sw/uiconfig
Adolfo Jayme Barrientos
fitojb at ubuntu.com
Sat Jun 2 05:40:53 UTC 2018
filter/source/config/fragments/filters/MS_Word_2003_XML.xcu | 2 +-
filter/source/config/fragments/filters/calc_MS_Excel_2007_VBA_XML.xcu | 2 +-
filter/source/config/fragments/types/writer_MS_Word_2003_XML.xcu | 2 +-
fpicker/uiconfig/ui/foldernamedialog.ui | 4 ++--
officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs | 4 ++--
svx/uiconfig/ui/safemodedialog.ui | 2 +-
sw/uiconfig/swriter/ui/optcompatpage.ui | 4 ++--
7 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 45aefcf77233ae01ff71e6649e8df396a2a7e7f5
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date: Sat Jun 2 00:38:20 2018 -0500
A few assorted improvements to translatable strings before freeze
Change-Id: I30d315e0c82afc112cdb4fef17339c1b78b5643a
(cherry picked from commit 96895d6a7d07f51a59d8775d5a4fb268e9f075d1)
Signed-off-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Reviewed-on: https://gerrit.libreoffice.org/55202
diff --git a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
index a3730df8225a..1db287f09348 100644
--- a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
@@ -25,6 +25,6 @@
<prop oor:name="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Word 2003 XML</value>
+ <value xml:lang="en-US">Word 2003 XML</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_VBA_XML.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_VBA_XML.xcu
index f8321358f826..1b04ad572d65 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_VBA_XML.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_VBA_XML.xcu
@@ -25,6 +25,6 @@
<prop oor:name="TemplateName"/>
<prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Excel 2007-2016 XML (macro enabled)</value>
+ <value xml:lang="en-US">Excel 2007–2019 (macro-enabled)</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/types/writer_MS_Word_2003_XML.xcu b/filter/source/config/fragments/types/writer_MS_Word_2003_XML.xcu
index 59b99aa46894..60d132e2061c 100644
--- a/filter/source/config/fragments/types/writer_MS_Word_2003_XML.xcu
+++ b/filter/source/config/fragments/types/writer_MS_Word_2003_XML.xcu
@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>MS Word 2003 XML</value></prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Microsoft Word 2003 XML</value>
+ <value xml:lang="en-US">Word 2003 XML</value>
</prop>
<prop oor:name="ClipboardFormat"><value>doctype:wordDocument</value></prop>
</node>
diff --git a/fpicker/uiconfig/ui/foldernamedialog.ui b/fpicker/uiconfig/ui/foldernamedialog.ui
index 559533a9d483..a3ef9356fdea 100644
--- a/fpicker/uiconfig/ui/foldernamedialog.ui
+++ b/fpicker/uiconfig/ui/foldernamedialog.ui
@@ -5,7 +5,7 @@
<object class="GtkDialog" id="FolderNameDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes" context="foldernamedialog|FolderNameDialog">Folder Name ?</property>
+ <property name="title" translatable="yes" context="foldernamedialog|FolderNameDialog">Folder Name</property>
<property name="modal">True</property>
<property name="default_width">0</property>
<property name="default_height">0</property>
@@ -88,7 +88,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="foldernamedialog|label2">Na_me</property>
+ <property name="label" translatable="yes" context="foldernamedialog|label2">Na_me:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry</property>
</object>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index 1dbe8f217bd0..a47d27074cba 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -112,7 +112,7 @@
</prop>
<prop oor:name="MsWordCompTrailingBlanks" oor:type="xs:boolean" oor:nillable="false">
<info>
- <desc>MS Word-compatible trailing blanks</desc>
+ <desc>Word-compatible trailing blanks</desc>
</info>
<value>false</value>
</prop>
@@ -124,7 +124,7 @@
</prop>
<prop oor:name="EmptyDbFieldHidesPara" oor:type="xs:boolean" oor:nillable="false">
<info>
- <desc>A database field (e.g., MailMerge) with empty value hides its paragraph</desc>
+ <desc>Hide paragraphs of database fields (e.g., mail merge) with an empty value</desc>
</info>
<value>true</value>
</prop>
diff --git a/svx/uiconfig/ui/safemodedialog.ui b/svx/uiconfig/ui/safemodedialog.ui
index b50bf3dbf731..c3eca5089775 100644
--- a/svx/uiconfig/ui/safemodedialog.ui
+++ b/svx/uiconfig/ui/safemodedialog.ui
@@ -429,7 +429,7 @@ The proposed changes get more radical from top down so it is recommended to try
<property name="homogeneous">True</property>
<child>
<object class="GtkButton" id="btn_create_zip">
- <property name="label" translatable="yes" context="safemodedialog|btn_create_zip">Create Zip Archive from User Profile</property>
+ <property name="label" translatable="yes" context="safemodedialog|btn_create_zip">Archive User Profile</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui
index 40b7c3ed8add..0ecf1f6cb467 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -65,9 +65,9 @@
<item translatable="yes" context="optcompatpage|format">Consider wrapping style when positioning objects</item>
<item translatable="yes" context="optcompatpage|format">Expand word space on lines with manual line breaks in justified paragraphs</item>
<item translatable="yes" context="optcompatpage|format">Protect form</item>
- <item translatable="yes" context="optcompatpage|format">MS Word-compatible trailing blanks</item>
+ <item translatable="yes" context="optcompatpage|format">Word-compatible trailing blanks</item>
<item translatable="yes" context="optcompatpage|format">Tolerate white lines of PDF page backgrounds for compatibility with old documents</item>
- <item translatable="yes" context="optcompatpage|format">A database field (e.g., MailMerge) with empty value hides its paragraph</item>
+ <item translatable="yes" context="optcompatpage|format">Hide paragraphs of database fields (e.g., mail merge) with an empty value</item>
<item translatable="yes" context="optcompatpage|format"><User settings></item>
</items>
</object>
More information about the Libreoffice-commits
mailing list