Bug 1390509 - Fix access keys for location, camera and microphone permissions. r=jaws

MozReview-Commit-ID: 6HGJIf2k3hM

--HG--
extra : rebase_source : d8833de7d9ef18130db69ef21ca83affd50c5d4e

browser/components/preferences/in-content-new/privacy.xul

@@ -553,7 +553,7 @@
         <hbox pack="end">
           <button id="locationSettingsButton"
                   class="accessory-button"
-                  label="&permissionSettingsButton2.label;"
+                  label="&locationSettingsButton.label;"
                   accesskey="&locationSettingsButton.accesskey;"
                   searchkeywords="&removepermission2.label;
                                   &removeallpermissions2.label;
@@ -571,7 +571,7 @@
         <hbox pack="end">
           <button id="cameraSettingsButton"
                   class="accessory-button"
-                  label="&permissionSettingsButton2.label;"
+                  label="&cameraSettingsButton.label;"
                   accesskey="&cameraSettingsButton.accesskey;"
                   searchkeywords="&removepermission2.label;
                                   &removeallpermissions2.label;
@@ -589,7 +589,7 @@
         <hbox pack="end">
           <button id="microphoneSettingsButton"
                   class="accessory-button"
-                  label="&permissionSettingsButton2.label;"
+                  label="&microphoneSettingsButton.label;"
                   accesskey="&microphoneSettingsButton.accesskey;"
                   searchkeywords="&removepermission2.label;
                                   &removeallpermissions2.label;
@@ -609,7 +609,7 @@
         <hbox pack="end">
           <button id="notificationSettingsButton"
                   class="accessory-button"
-                  label="&permissionSettingsButton2.label;"
+                  label="&notificationSettingsButton.label;"
                   accesskey="&notificationSettingsButton.accesskey;"
                   searchkeywords="&removepermission2.label;
                                   &removeallpermissions2.label;

browser/locales/en-US/chrome/browser/preferences/content.dtd

@@ -14,20 +14,22 @@
 <!ENTITY  popupExceptions.label                                 "Exceptions…">
 <!ENTITY  popupExceptions.accesskey                             "E">
 
-<!ENTITY  permissionSettingsButton2.label                       "Settings…">
-
 <!ENTITY  notificationPermissions.label                         "Notifications">
-<!ENTITY  notificationSettingsButton.accesskey                  "n">
+<!ENTITY  notificationSettingsButton.label                      "Settings…">
+<!ENTITY  notificationSettingsButton.accesskey                  "t">
 <!ENTITY  notificationPermissionsLearnMore.label                "Learn more">
 
 <!ENTITY  locationPermissions.label                             "Location">
-<!ENTITY  locationSettingsButton.accesskey                      "l">
+<!ENTITY  locationSettingsButton.label                          "Settings…">
+<!ENTITY  locationSettingsButton.accesskey                      "t">
 
 <!ENTITY  cameraPermissions.label                               "Camera">
-<!ENTITY  cameraSettingsButton.accesskey                        "c">
+<!ENTITY  cameraSettingsButton.label                            "Settings…">
+<!ENTITY  cameraSettingsButton.accesskey                        "t">
 
 <!ENTITY  microphonePermissions.label                           "Microphone">
-<!ENTITY  microphoneSettingsButton.accesskey                    "m">
+<!ENTITY  microphoneSettingsButton.label                        "Settings…">
+<!ENTITY  microphoneSettingsButton.accesskey                    "t">
 
 <!ENTITY  fontsAndColors.label        "Fonts &amp; Colors">