--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -82,17 +82,24 @@
                           command="cmd_print"/>
                 <menuseparator/>
                 <menuitem id="goOfflineMenuitem"
                           data-l10n-id="go-offline-menuitem"
                           type="checkbox"
                           observes="workOfflineMenuitemState"
                           oncommand="BrowserOffline.toggleOfflineStatus();"/>
                 <menuitem id="menu_FileQuitItem"
+#ifdef XP_WIN
+                          data-l10n-id="quit-application-menuitem-win"
+#else
+#ifdef XP_MACOSX
+                          data-l10n-id="quit-application-menuitem-mac"
+#else
                           data-l10n-id="quit-application-menuitem"
+#endif
 #ifdef XP_UNIX
                           key="key_quitApplication"
 #endif
 #endif
                           command="cmd_quitApplication"/>
               </menupopup>
             </menu>
 

--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -230,17 +230,17 @@
     <key id="openFileKb" data-l10n-id="open-file-command" command="Browser:OpenFile"  modifiers="accel"/>
     <key id="key_savePage" data-l10n-id="save-page-command" command="Browser:SavePage" modifiers="accel"/>
     <key id="printKb" data-l10n-id="print-command" command="cmd_print"  modifiers="accel"/>
     <key id="key_close" data-l10n-id="close-command" command="cmd_close" modifiers="accel"/>
     <key id="key_closeWindow" data-l10n-id="close-command" command="cmd_closeWindow" modifiers="accel,shift"/>
     <key id="key_toggleMute" key="&toggleMuteCmd.key;" command="cmd_toggleMute" modifiers="control"/>
     <key id="key_undo" data-l10n-id="undo-command" modifiers="accel"/>
 #ifdef XP_UNIX
-    <!-- On unix, redo is ctrl+shift+z => undo key + shift -->
+    <!-- On Unix, Redo's command key is the Undo's command key + Shift. -->
     <key id="key_redo" data-l10n-id="undo-command" modifiers="accel,shift"/>
 #else
     <key id="key_redo" data-l10n-id="redo-command" modifiers="accel"/>
 #endif
     <key id="key_cut" data-l10n-id="cut-command" modifiers="accel"/>
     <key id="key_copy" data-l10n-id="copy-command" modifiers="accel"/>
     <key id="key_paste" data-l10n-id="paste-command" modifiers="accel"/>
     <key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>

--- a/browser/locales/en-US/browser/menubar.ftl
+++ b/browser/locales/en-US/browser/menubar.ftl
@@ -69,27 +69,23 @@ print-menuitem =
 print-command =
     [xul/key]        p
 
 go-offline-menuitem =
     [xul/label]      Work Offline
     [xul/accesskey]  k
 
 quit-application-menuitem =
-    [xul/label]      { OS() ->
-      [mac]          Quit { brand-short-name }
-      [win]          Exit
-     *[other]        Quit
-    }
-    [xul/accesskey]  { OS ->
-      [mac]          "" 
-      [win]          x
-     *[other]        Q
-    }
-
+    [xul/label]      Quit
+    [xul/accesskey]  Q
+quit-application-menuitem-win =
+    [xul/label]      Exit
+    [xul/accesskey]  x
+quit-application-menuitem-mac =
+    [xul/label]      Quit { brand-shorter-name }
 # Used by both Linux and OSX builds
 quit-application-command-unix =
     [xul/key]        Q
 
 [[ Edit menu ]]
 
 edit-menu =
     [xul/label]      Edit
@@ -126,22 +122,22 @@ select-all-menuitem =
     [xul/label]      Select All
     [xul/accesskey]  A
 select-all-command =
     [xul/key]        A
 
 find-on-menuitem =
     [xul/label]      Find in This Page…
     [xul/accesskey]  F
-find-on-command1 =
+find-on-command =
     [xul/key]        f
 find-again-menuitem =
     [xul/label]      Find Again
     [xul/accesskey]  g
-find-again-command =
+find-again-command1 =
     [xul/key]        g
 find-again-command2 =
     [xul/keycode]    VK_F3
 find-selection-command =
     [xul/key]        e
 
 bidi-switch-text-direction-menuitem =
     [xul/label]      Switch Text Direction