Re: [Libreoffice] PATCH: menues -> menus

2011-12-07 Thread Tor Lillqvist
> this patch also changes solenv/gbuild/extensions/post_BuildplTargets.mk

I noticed, and removed that part from the patch before applying.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [Libreoffice] PATCH: menues -> menus

2011-12-07 Thread Matteo Casalin
Hi all,
I'm not a reviewer (nor I'm pretending to be), I just want to 
highlight a possible issue: this patch also changes

solenv/gbuild/extensions/post_BuildplTargets.mk

(lines from 99 to 111) which has no "menues" in it.
It also changes "menues" occurrences in some comments that are still 
in German, don't know if it's desired.

Hope this comment does not upset anyone :)

Best regards
Matteo

--
Mike Whiteley  wrote:
(07/12/2011 08:24)

> This patch replaces occurrences of "menues" to "menus"
> 
> This was on the list of easy fixes on the development page.
> 
> Mike

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice] PATCH: menues -> menus

2011-12-06 Thread Mike Whiteley
This patch replaces occurrences of "menues" to "menus"

This was on the list of easy fixes on the development page.

Mike
From 367cd40559e79fd6551509c01188fc05a65025d8 Mon Sep 17 00:00:00 2001
From: Michael T. Whiteley 
Date: Tue, 6 Dec 2011 23:04:19 -0800
Subject: [PATCH] changed menues to menus

---
 automation/source/server/sta_list.cxx  |2 +-
 dbaccess/source/ui/inc/dbu_resource.hrc|2 +-
 embeddedobj/source/general/docholder.cxx   |4 ++--
 .../uielement/langselectionmenucontroller.cxx  |2 +-
 sc/source/ui/inc/submenu.hrc   |2 +-
 solenv/gbuild/extensions/post_BuildplTargets.mk|2 +-
 svx/inc/globlmn_tmpl.hrc   |2 +-
 svx/source/mnuctrls/SmartTagCtl.cxx|2 +-
 sw/source/ui/smartmenu/stmenu.cxx  |2 +-
 testautomation/chart2/required/ch2_updt_calc.bas   |2 +-
 .../global/tools/includes/required/t_menu.inc  |2 +-
 vcl/inc/svdata.hxx |2 +-
 vcl/inc/vcl/menu.hxx   |4 ++--
 vcl/source/window/decoview.cxx |2 +-
 vcl/source/window/floatwin.cxx |2 +-
 vcl/source/window/menu.cxx |4 ++--
 vcl/source/window/window.cxx   |8 
 vcl/source/window/winproc.cxx  |2 +-
 vcl/win/source/window/salframe.cxx |8 
 vcl/win/source/window/salmenu.cxx  |8 
 20 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index 2579929..a877277 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -577,7 +577,7 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu )
 if ( pMenuBarWin == pWin )
 return pMenu;
 
-// search submenues
+// search submenus
 pMenu = GetMatchingMenu( pWin, pMenu );
 if ( pMenu )
 return pMenu;
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 7ba85bc..e2cb7fc 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -286,7 +286,7 @@
 // free
 
 //
-// menues
+// menus
 
 #define MENU_TABLETREE_POPUPRID_MENU_START +  0
 #define MENU_DATASOURCELIST_POPUP   RID_MENU_START +  1
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 5e24643..036c2d6 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -747,11 +747,11 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::
 // as long as the LM is invisible and locked an empty tool space will be used on resizing
 xOwnLM->setDockingAreaAcceptor( xDocAreaAcc );
 
-// try to merge menues; don't do anything else if it fails
+// try to merge menus; don't do anything else if it fails
 if ( MergeMenues_Impl( xOwnLM, xContainerLM, xContainerDP, aContModuleName ) )
 {
 // make sure that the container LM does not control the size of the containers window anymore
-// this must be done after merging menues as we won't get the container menu otherwise
+// this must be done after merging menus as we won't get the container menu otherwise
 xContainerLM->setDockingAreaAcceptor( uno::Reference < ui::XDockingAreaAcceptor >() );
 
 // prevent further changes at this LM
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 4b04b5c9..b5f1566 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -260,7 +260,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
 m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
 
 // now add menu entries
-// the different menues purpose will be handled by the different string
+// the different menus purpose will be handled by the different string
 // for aCmd_Dialog and aCmd_Language
 
 sal_Int16 nItemId = 1;  // in this control the item id is not important for executing the command
diff --git a/sc/source/ui/inc/submenu.hrc b/sc/source/ui/inc/submenu.hrc
index 4e5ad6d..b4f5dbd 100644
--- a/sc/source/ui/inc/submenu.hrc
+++ b/sc/source/ui/inc/submenu.hrc
@@ -25,7 +25,7 @@
  *
  **