Bug 247842: "Help" in the menu bar should be different between Windows and other platforms, patch by C�dric Corazza <cedric.corazza@wanadoo.fr>, r=axel, sr=mscott

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');"/>

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">