Move HELP key binding into the unix overlay b=229438 r=kyle.yuan sr=Henry.Jia

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -359,9 +359,6 @@
   <key id="key_findPrev"  key="&findPrevCmd.key;"    oncommand="goDoCommand('cmd_findPrev')"  modifiers="accel, shift"/>
   <key keycode="&findAgainCmd.key2;"   oncommand="goDoCommand('cmd_findAgain')"/>
   <key keycode="&findPrevCmd.key2;"    oncommand="goDoCommand('cmd_findPrev')"  modifiers="shift"/>
-#ifdef MOZ_X11
-  <key keycode="&findCmd.key2;"    oncommand="goDoCommand('cmd_find')"/>
-#endif
   <key id="key_findTypeText"/>
   <key id="key_findTypeLinks"/>
   <key id="key_stop" keycode="VK_ESCAPE" command="cmd_stop"/>

mailnews/base/resources/content/unix/platformMailnewsOverlay.xul

@@ -10,5 +10,10 @@
     <!-- Select Thread -->
     <key id="key_selectThread" modifiers="alt,shift"/>
 
+    <!-- Find -->
+    <keyset id="mailKeys">
+        <key keycode="VK_F19" oncommand="goDoCommand('cmd_find')"/>
+    </keyset>
+
 </overlay>
 

mailnews/base/resources/locale/en-US/messenger.dtd

@@ -264,7 +264,6 @@
 <!ENTITY findCmd.label "Find in This Message...">
 <!ENTITY findCmd.accesskey "F">
 <!ENTITY findCmd.key "f">
-<!ENTITY findCmd.key2 "VK_F19">
 <!ENTITY findAgainCmd.label "Find Again">
 <!ENTITY findAgainCmd.accesskey "g">
 <!ENTITY findAgainCmd.key "g">

mailnews/jar.mn

@@ -91,7 +91,7 @@ messenger.jar:
     content/messenger/messenger.xul                                            (base/resources/content/messenger.xul)
     content/messenger/mail3PaneWindowVertLayout.xul                            (base/resources/content/mail3PaneWindowVertLayout.xul)
     content/messenger/mailWindowExtrasOverlay.xul                              (base/resources/content/mailWindowExtrasOverlay.xul)
-*   content/messenger/mailWindowOverlay.xul                                    (base/resources/content/mailWindowOverlay.xul)
+    content/messenger/mailWindowOverlay.xul                                    (base/resources/content/mailWindowOverlay.xul)
     content/messenger/mailWindowOverlay.js                                     (base/resources/content/mailWindowOverlay.js)
     content/messenger/msgSynchronize.xul                                       (base/resources/content/msgSynchronize.xul)
     content/messenger/msgSynchronize.js                                        (base/resources/content/msgSynchronize.js)