Polish the add bookmarks dialog:

- access key to the "Create in" button
- clicking on the label should focus the control next to it.
- Change the order of the focus with tab: the name field, the menulist field and then the expander.
- renaming some entities to respect the interCaps convention

browser/components/bookmarks/content/addBookmark2.xul

@@ -36,7 +36,7 @@
         buttons="accept,cancel" 
         buttonlabelextra2="&newFolder.label;" buttonaccesskeyextra2="&newFolder.accesskey;"
 #ifdef XP_UNIX
-        buttonlabelaccept="&accept.label;"
+        buttonlabelaccept="&acceptButton.label;"
 #endif
         title="&newBookmark.title;" title-selectFolder="&selectFolder.label;"
         onload="Startup();"
@@ -49,41 +49,42 @@
 
   <separator id="nameseparator" class="thin"/>
   
-  <grid style="min-width:250px">
-    <columns>
-      <column/>
-      <column flex="1"/>
-      <column/>
-    </columns>
-    <rows>
-      <row align="center">
-        <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
-        <textbox id="name" oninput="onFieldInput();"/>
-        <button id="expander" class="down" oncommand="expandTree();"
-                tooltiptextdown="&expanderdown.tooltip;"
-                tooltiptextup="&expanderup.tooltip;"/>
-      </row>
-      <row align="center">
-        <label id="createinlabel" value="&createin.label;"/>
-        <menulist id="select-menu" class="folder-icon"
-                  oncommand="selectMenulistFolder(event);"
-                  datasources="rdf:bookmarks" ref="NC:LastModifiedFoldersRoot">
-          <template>
-            <rule parent="menulist">
-              <menupopup>
-                <menuitem uri="rdf:*" class="menuitem-iconic folder-icon"
-                          label="rdf:http://home.netscape.com/NC-rdf#Name"/>
-              </menupopup>
-            </rule>
-          </template>
-        </menulist>
-
-      </row>
-    </rows>
-  </grid>
-  <hbox pack="start">
-    <checkbox id="addgroup" label="&addGroup.label;"
-              accesskey="&addGroup.accesskey;"/>
+  <hbox align="start">
+    <grid flex="1">
+      <columns>
+        <column/>
+        <column flex="1"/>
+      </columns>
+      <rows>
+        <row align="center">
+          <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
+          <textbox id="name" oninput="onFieldInput();"/>
+        </row>
+        <row align="center">
+          <label id="createinlabel" value="&createin.label;" accesskey="&createin.accesskey;" control="select-menu"/>
+          <menulist id="select-menu" class="folder-icon"
+                    oncommand="selectMenulistFolder(event);"
+                    datasources="rdf:bookmarks" ref="NC:LastModifiedFoldersRoot">
+            <template>
+              <rule parent="menulist">
+                <menupopup>
+                  <menuitem uri="rdf:*" class="menuitem-iconic folder-icon"
+                            label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                </menupopup>
+              </rule>
+            </template>
+          </menulist>
+        </row>
+        <row>
+          <spacer/>
+          <checkbox id="addgroup" label="&addGroup.label;"
+                    accesskey="&addGroup.accesskey;"/>
+        </row>
+      </rows>
+    </grid>
+    <button id="expander" class="down" oncommand="expandTree();"
+            tooltiptextdown="&expanderDown.tooltip;"
+            tooltiptextup="&expanderUp.tooltip;"/>
   </hbox>
 
   <separator class="thin"/>

browser/components/bookmarks/locale/addBookmark.dtd

@@ -8,7 +8,7 @@
 <!ENTITY button.createin.accesskey  "c">
 <!ENTITY button.createin2.label     "Create In &lt;&lt;">
 <!ENTITY createin.label             "Create in:">
-<!ENTITY createin.accesskey         "i">
+<!ENTITY createin.accesskey         "C">
 <!ENTITY button.newfolder.label     "New Folder...">
 <!ENTITY button.newfolder.accesskey "w">
 <!ENTITY alwayscreateinfolder.label "Don't show this dialog again">
@@ -18,10 +18,10 @@
 <!ENTITY button.defaultfolder.accesskey "d">
 <!ENTITY selectFolder.label         "Choose Folder">
 
-<!ENTITY expanderdown.tooltip    "Show all the bookmarks folders">
-<!ENTITY expanderup.tooltip      "Hide">
+<!ENTITY expanderDown.tooltip    "Show all the bookmarks folders">
+<!ENTITY expanderUp.tooltip      "Hide">
 <!ENTITY addGroup.label          "Bookmark all tabs in a folder">
 <!ENTITY addGroup.accesskey      "B">
 <!ENTITY newFolder.label         "New Folder">
 <!ENTITY newFolder.accesskey     "N">
-<!ENTITY accept.label            "Add">
+<!ENTITY acceptButton.label      "Add">