[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - framework/source include/svtools officecfg/registry svtools/uiconfig sw/uiconfig

[Andras Timar (via logerrit)]

 framework/source/layoutmanager/layoutmanager.cxx                  |    6 +++---
 include/svtools/restartdialog.hxx                                 |    2 +-
 officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |    4 ++--
 svtools/uiconfig/ui/restartdialog.ui                              |    2 +-
 sw/uiconfig/swriter/ui/optcompatpage.ui                           |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 8e646fbec04973f5ce7548657fb8ddad75d1572e
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Sep 18 14:53:06 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 18 16:12:04 2019 +0200

    The menu is called 'Form', not 'Forms'
    
    Change-Id: I216e04bb54319cff5d790c5e223c6e49215d09a3
    Reviewed-on: https://gerrit.libreoffice.org/79096
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index d7c3cfa8f893..f25f115d1143 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2550,7 +2550,7 @@ void LayoutManager::implts_createMSCompatibleMenuBar( const OUString& aName )
 {
     SolarMutexClearableGuard aWriteLock;
 
-    // Find Forms menu in the original menubar
+    // Find Form menu in the original menubar
     m_xMenuBar = implts_createElement( aName );
     uno::Reference< XUIElementSettings > xMenuBarSettings(m_xMenuBar, UNO_QUERY);
     uno::Reference< container::XIndexReplace > xMenuIndex(xMenuBarSettings->getSettings(true), UNO_QUERY);
@@ -2575,12 +2575,12 @@ void LayoutManager::implts_createMSCompatibleMenuBar( const OUString& aName )
     }
     assert(nFormsMenu != -1);
 
-    // Create the MS compatible Forms menu
+    // Create the MS compatible Form menu
     css::uno::Reference< css::ui::XUIElement > xFormsMenu = implts_createElement( "private:resource/menubar/mscompatibleformsmenu" );
     if(!xFormsMenu.is())
         return;
 
-    // Merge the MS compatible Forms menu into the menubar
+    // Merge the MS compatible Form menu into the menubar
     uno::Reference< XUIElementSettings > xFormsMenuSettings(xFormsMenu, UNO_QUERY);
     uno::Reference< container::XIndexAccess > xFormsMenuIndex(xFormsMenuSettings->getSettings(true));
 
diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx
index eb543c14fe8e..ffbf7968a9f7 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -54,7 +54,7 @@ enum RestartReason {
         // "For the extension to work properly,
         // %PRODUCTNAME must be restarted."
     RESTART_REASON_OPENGL,
-    // For restructuring the Forms menu,
+    // For restructuring the Form menu,
     // %PRODUCTNAME must be restarted:
     RESTART_REASON_MSCOMPATIBLE_FORMS_MENU,
         // No particular reason
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index d735e05363f0..c235f341de54 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -158,8 +158,8 @@
       <prop oor:name="MSCompatibleFormsMenu" oor:type="xs:boolean" oor:nillable="false">
         <!-- UIHints: Tools - Options - Writer - Compatibility - Global Options -->
         <info>
-          <desc>Specifies whether Forms menu should be customized for an MSO workflow. The MS compatible Forms menu contains only MS compatible form controls.</desc>
-          <label>Reorganize Forms menu to have it MS compatible.</label>
+          <desc>Specifies whether Form menu should be customized for an MSO workflow. The MS compatible Form menu contains only MS compatible form controls.</desc>
+          <label>Reorganize Form menu to have it MS compatible.</label>
         </info>
         <value>false</value>
       </prop>
diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui
index 8967591b73b3..35f1ec9aafae 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -229,7 +229,7 @@
               <object class="GtkLabel" id="reason_mscompatible_formsmenu">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="label" translatable="yes" context="restartdialog|reason_mscompatible_formsmenu">For restructuring the Forms menu, %PRODUCTNAME must be restarted.</property>
+                <property name="label" translatable="yes" context="restartdialog|reason_mscompatible_formsmenu">For restructuring the Form menu, %PRODUCTNAME must be restarted.</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">50</property>
                 <property name="xalign">0</property>
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui
index d6ef147bbde9..4db0418384a1 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -163,7 +163,7 @@
                     <property name="entry_text_column">0</property>
                     <property name="id_column">1</property>
                     <items>
-                      <item translatable="yes" context="optcompatpage|globalcompatoptions">Reorganize Forms menu to have it MS compatible</item>
+                      <item translatable="yes" context="optcompatpage|globalcompatoptions">Reorganize Form menu to have it MS compatible</item>
                     </items>
                   </object>
                   <packing>