diff options
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 6 | ||||
| -rw-r--r-- | include/svtools/restartdialog.hxx | 2 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs | 4 | ||||
| -rw-r--r-- | svtools/uiconfig/ui/restartdialog.ui | 2 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/optcompatpage.ui | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index b78b0b476c5a..7afceb87a0ac 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2525,7 +2525,7 @@ void LayoutManager::implts_createMSCompatibleMenuBar( const OUString& aName ) { SolarMutexGuard 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); @@ -2550,12 +2550,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 83b0a8cad218..464e2ee2ec7f 100644 --- a/include/svtools/restartdialog.hxx +++ b/include/svtools/restartdialog.hxx @@ -63,7 +63,7 @@ enum RestartReason { // For the multi-threaded calculation changes to take effect, // %PRODUCTNAME must be restarted: RESTART_REASON_THREADING, - // 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 7c587319beef..5d781baf6b64 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 6db5793a260b..618e739a497b 100644 --- a/svtools/uiconfig/ui/restartdialog.ui +++ b/svtools/uiconfig/ui/restartdialog.ui @@ -262,7 +262,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 a142c38c2e27..6ba2cda149ee 100644 --- a/sw/uiconfig/swriter/ui/optcompatpage.ui +++ b/sw/uiconfig/swriter/ui/optcompatpage.ui @@ -258,7 +258,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</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> |