#94836, fix some more issues with Open Address. Final part of cleanup.

r=doron, sr=alecf

editor/ui/composer/locale/en-US/editorOverlay.dtd

@@ -35,8 +35,8 @@
 <!ENTITY openFileCmd.label "Open File...">
 <!ENTITY fileopen.accesskey "o">
 <!ENTITY fileopen.keybinding "o">
-<!ENTITY openremoteCmd.label "Open Web Location...">
-<!ENTITY fileopenremote.accesskey "l">
+<!ENTITY openremoteCmd.label "Open Address...">
+<!ENTITY fileopenremote.accesskey "r">
 <!ENTITY fileopenremote.keybinding "l">
 <!ENTITY fileRecentMenu.label "Recent Pages">
 <!ENTITY filerecentmenu.accesskey "r">

xpfe/communicator/resources/content/openLocation.xul

@@ -22,6 +22,7 @@
   Contributor(s): 
     Ben Goodger <ben@netscape.com>
     Michael Lowe <michael.lowe@bigfoot.com> 
+    Håkan Waara <hwaara@chello.se>
 
 -->
 
@@ -70,6 +71,8 @@
                      onpopupshowing="createUBHistoryMenu(event.target);"
                      oncommand="useUBHistoryItem(event.target)"/>
         </textbox>
+        <button label="&chooseFile.label;" accesskey="&chooseFile.accesskey;" 
+                oncommand="onChooseFile();"/>
       </hbox>
       <separator class="thin"/>
       <hbox flex="1" autostretch="never">
@@ -85,8 +88,6 @@
   </hbox> 
   <separator class="thin"/>
   <box valign="bottom" flex="1" autostretch="never">
-    <button label="&chooseFile.label;" accesskey="&chooseFile.accesskey;" 
-            oncommand="onChooseFile();"/>
     <hbox flex="1" id="okCancelButtonsRight"/>
   </box>
            

xpfe/communicator/resources/locale/en-US/openLocation.dtd

@@ -1,8 +1,8 @@
 <!-- extracted from content/openLocation.xul -->
 
 <!ENTITY enter.label "Enter the address (URL) of the Web page, file, or resource that you want to open."> 
-<!ENTITY chooseFile.label "Open File...">
-<!ENTITY chooseFile.accesskey "O">
+<!ENTITY chooseFile.label "Choose File...">
+<!ENTITY chooseFile.accesskey "o">
 <!ENTITY address.label "Address:">
 <!ENTITY address.accesskey "A">
 <!ENTITY newWindow.label "New Navigator window">