From 7db916ee783ea13761a6c56f07e8ccf06e68b4f8 Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org" <timeless%mozdev.org>
Date: Fri, 14 Nov 2003 05:10:46 +0000
Subject: [PATCH] Bug 219899 localization issue in browser-menubar.inc:
 hardcoded menu label "Window" patch by mpconnor@rogers.com r=ben

---
 browser/base/content/browser-menubar.inc |  5 ++---
 browser/base/locale/browser.dtd          | 11 ++++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 2391f653e1a6..b14bd3cb4c56 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -1,4 +1,4 @@
-       <menubar id="main-menubar" statusbar="statusbar-display" 
+       <menubar id="main-menubar" statusbar="statusbar-display"
                 style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
             <menu label="&fileMenu.label;"
                   accesskey="&fileMenu.accesskey;">
@@ -261,8 +261,7 @@
           </menu>
     
 #ifdef XP_MACOSX
-<!-- XXXnoririty localize! -->
-        <menu id="windowMenu" label="Window"
+        <menu id="windowMenu" label="&windowMenu.label;"
             datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
             onpopupshown="checkFocusedWindow();">
             <template>
diff --git a/browser/base/locale/browser.dtd b/browser/base/locale/browser.dtd
index c2b0364b361b..7493d747c040 100644
--- a/browser/base/locale/browser.dtd
+++ b/browser/base/locale/browser.dtd
@@ -1,10 +1,10 @@
-<!-- LOCALIZATION NOTE : FILE This file contains the browser main menu items --> 
+<!-- LOCALIZATION NOTE : FILE This file contains the browser main menu items -->
 <!-- LOCALIZATION NOTE : FILE Do not translate accesskey and commandkey --> 
 
-<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE --> 
-<!ENTITY mainWindow.title "&brandShortName;"> 
-<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE --> 
-<!ENTITY mainWindow.titlemodifier "&brandShortName;"> 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandShortName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandShortName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 
@@ -288,6 +288,7 @@
 <!ENTITY minimizeWindow.label "Minimize Window">
 <!ENTITY bringAllToFront.label "Bring All to Front">
 <!ENTITY zoomWindow.label "Zoom Window">
+<!ENTITY windowMenu.label "Window">
 
 <!ENTITY pageThemeButton.label "Page Themes">
 <!ENTITY pageThemeNoTheme.label "No Theme">