[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/uiconfig sw/uiconfig

[Heiko Tietze]

 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui |    2 +-
 sw/uiconfig/swriter/ui/optcompatpage.ui          |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5b51996465c029e55bc328732111fd7c7bedba84
Author: Heiko Tietze <tietze.heiko at gmail.com>
Date:   Mon Dec 11 15:55:06 2017 +0100

    tdf#114310 Removed '(in current document)' from compatibility options
    
    Change-Id: Ie91ca2c9aac9b3ab7ca103bf2e6b55d453255d77
    Reviewed-on: https://gerrit.libreoffice.org/46242
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Heiko Tietze <tietze.heiko at googlemail.com>
    (cherry picked from commit 5f9812e65e6c3c147c8143a046f934be4433fca6)
    Reviewed-on: https://gerrit.libreoffice.org/46365

diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index 057f9877a511..fbee20afb08d 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -619,7 +619,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="cbCompatibility">
-                    <property name="label" translatable="yes" context="optimpressgeneralpage|cbCompatibility">Add _spacing between paragraphs and tables (in current document)</property>
+                    <property name="label" translatable="yes" context="optimpressgeneralpage|cbCompatibility">Add _spacing between paragraphs and tables</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui
index ed4a0c965a56..f297aeb6bc04 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -54,8 +54,8 @@
                     <property name="id_column">1</property>
                     <items>
                       <item translatable="yes" context="optcompatpage|format">Use printer metrics for document formatting</item>
-                      <item translatable="yes" context="optcompatpage|format">Add spacing between paragraphs and tables (in current document)</item>
-                      <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at tops of pages (in current document)</item>
+                      <item translatable="yes" context="optcompatpage|format">Add spacing between paragraphs and tables</item>
+                      <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at tops of pages</item>
                       <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 tabstop formatting</item>
                       <item translatable="yes" context="optcompatpage|format">Do not add leading (extra space) between lines of text</item>
                       <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 line spacing</item>
@@ -66,7 +66,7 @@
                       <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">Tolerate white lines of PDF page backgrounds for compatibility with old documents (in current document)</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"><User settings></item>
                     </items>
                   </object>