From 16295992ca99a14876612950ef71e13d380938b7 Mon Sep 17 00:00:00 2001
From: "gavin%gavinsharp.com" <gavin%gavinsharp.com>
Date: Fri, 11 Aug 2006 20:30:10 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20247842:=20"Help"=20in=20the=20menu=20bar?=
 =?UTF-8?q?=20should=20be=20different=20between=20Windows=20and=20other=20?=
 =?UTF-8?q?platforms,=20patch=20by=20C=EF=BF=BDdric=20Corazza=20<cedric.co?=
 =?UTF-8?q?razza@wanadoo.fr>,=20r=3Daxel,=20sr=3Dmscott?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mail/base/content/mailWindowOverlay.xul           | 10 +++++++---
 mail/locales/en-US/chrome/messenger/messenger.dtd |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index 144675f3410..46a13b14bed 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1691,9 +1691,13 @@
       </menu>
 #endif
       
-      <!-- Help -->  
-      <menu label="&helpMenu.label;" accesskey="&helpMenu.accesskey;" onpopupshowing="buildHelpMenu();">
-        <menupopup id="menu_HelpPopup">
+      <!-- Help -->
+#ifdef XP_WIN
+      <menu label="&helpMenuWin.label;" accesskey="&helpMenuWin.accesskey;">
+#else
+      <menu label="&helpMenu.label;" accesskey="&helpMenu.accesskey;">
+#endif
+     <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
 #ifdef XP_MACOSX
           <menuitem id="hintsAndTips" label="&hintsAndTips.label;" key="key_macHelp" oncommand="openRegionURL('mailnews.hints_and_tips.url');"/>
           <menuitem id="releaseNotes" accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="openRegionURL('releaseNotesURL');"/>
diff --git a/mail/locales/en-US/chrome/messenger/messenger.dtd b/mail/locales/en-US/chrome/messenger/messenger.dtd
index ad13ab276a6..41d4dd5a20e 100644
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -402,7 +402,11 @@
 
 <!-- Help Menu -->
 <!ENTITY helpMenu.label "Help">
-<!ENTITY helpMenu.accesskey "H"> 
+<!ENTITY helpMenu.accesskey "H">
+<!-- LOCALIZATION NOTE some localizations of Windows use "?"
+                       for the help button in the menubar but Gnome does not.   -->
+<!ENTITY helpMenuWin.label        "Help"> 
+<!ENTITY helpMenuWin.accesskey    "H">
 <!ENTITY releaseCmd.label "Release Notes">
 <!ENTITY releaseCmd.accesskey "R"> 
 <!ENTITY hintsAndTips.label "&brandFullName; Help">