bug 347358: Fallout from bug 174699: Some PageInfo accesskey conflict in the tabs content/names

patch by Giacomo Magnini <giacomo.magnini@portalis.it>, r=db48x, sr=Neil

suite/browser/pageInfo.xul

@@ -91,12 +91,12 @@
 
   <tabbox id="tabbox" flex="1" class="spaced">
     <tabs id="tabs">
-      <tab id="generalTab" label="&generalTab;" accesskey="&generalAccesskey;"/>
-      <tab id="formsTab"   label="&formsTab;"   accesskey="&formsAccesskey;"
+      <tab id="generalTab" label="&generalTab;" accesskey="&generalTab.accesskey;"/>
+      <tab id="formsTab"   label="&formsTab;"   accesskey="&formsTab.accesskey;"
            oncommand="ensureSelection(formView)"/>
-      <tab id="linksTab"   label="&linksTab;"   accesskey="&linksAccesskey;"
+      <tab id="linksTab"   label="&linksTab;"   accesskey="&linksTab.accesskey;"
            oncommand="ensureSelection(linkView)"/>
-      <tab id="mediaTab"   label="&mediaTab;"   accesskey="&mediaAccesskey;"
+      <tab id="mediaTab"   label="&mediaTab;"   accesskey="&mediaTab.accesskey;"
            oncommand="ensureSelection(imageView)"/>
       <!-- Others added by overlay -->
     </tabs>
@@ -252,7 +252,7 @@
                          width="2" id="link-target"   label="&linkTarget;" hidden="true"/>
             <splitter class="tree-splitter"/>
             <treecol sortSeparators="true" persist="hidden width" flex="1"
-                         width="1" id="link-acceskey" label="&linkAccessKey;" hidden="true"/>
+                         width="1" id="link-accesskey" label="&linkAccessKey;" hidden="true"/>
           </treecols>
           <treechildren flex="1"/>
         </tree>

suite/locales/en-US/chrome/browser/pageInfo.dtd

@@ -49,7 +49,7 @@
 <!ENTITY  closeWindow.key       "w">
 
 <!ENTITY  generalTab            "General">
-<!ENTITY  generalAccesskey      "G">
+<!ENTITY  generalTab.accesskey  "G">
 <!ENTITY  generalTitle          "Title:">
 <!ENTITY  generalURL            "Address:">
 <!ENTITY  generalMode           "Render Mode:">
@@ -66,7 +66,7 @@
 <!ENTITY  generalMetaContent    "Content">
 
 <!ENTITY  formsTab              "Forms">
-<!ENTITY  formsAccesskey        "F">
+<!ENTITY  formsTab.accesskey    "F">
 <!ENTITY  formAction            "Form Action">
 <!ENTITY  formMethod            "Method">
 <!ENTITY  formName              "Name">
@@ -80,7 +80,7 @@
 <!ENTITY  formCValue            "Current Value">
 
 <!ENTITY  linksTab              "Links">
-<!ENTITY  linksAccesskey        "L">
+<!ENTITY  linksTab.accesskey    "L">
 <!ENTITY  linkNo                "No.">
 <!ENTITY  linkName              "Name">
 <!ENTITY  linkAddress           "Address">
@@ -89,7 +89,7 @@
 <!ENTITY  linkAccessKey         "Access Key">
 
 <!ENTITY  mediaTab              "Media">
-<!ENTITY  mediaAccesskey        "M">
+<!ENTITY  mediaTab.accesskey    "M">
 <!ENTITY  mediaHeader           "Images on this page">
 <!ENTITY  mediaURL              "Address:">
 <!ENTITY  mediaBase             "Base Address:">
@@ -108,7 +108,7 @@
 <!ENTITY  mediaTitle            "Title:">
 <!ENTITY  mediaLongdesc         "Long Description:">
 <!ENTITY  mediaSaveAs           "Save As...">
-<!ENTITY  mediaSaveAs.accesskey "S">
+<!ENTITY  mediaSaveAs.accesskey "A">
 <!ENTITY  mediaPreview          "Media Preview:">
 
 <!ENTITY  framesTab             "Frames">