Bug 1219454 - Replace 'show' with 'receive' in about:permissions and control center for consistent messaging around notifications and to account for new Push permission. r=MattN

--HG--
extra : commitid : 4mae2sSeFy1
extra : rebase_source : f3a1c9b56976510d6adb2c74aab8c03d8b80cd14
extra : histedit_source : 8e3b2180497af44effb08023de98bbf1ba6031f5

browser/base/content/browser.xul

@@ -732,7 +732,7 @@
                 <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"
                        aria-label="&urlbar.pluginsNotificationAnchor.label;"/>
                 <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"
-                       aria-label="&urlbar.webNotsNotificationAnchor.label;"/>
+                       aria-label="&urlbar.webNotsNotificationAnchor2.label;"/>
                 <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"
                        aria-label="&urlbar.webRTCShareDevicesNotificationAnchor.label;"/>
                 <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"

browser/components/preferences/aboutPermissions.xul

@@ -244,7 +244,7 @@
               class="pref-item" align="top">
           <image class="pref-icon" type="desktop-notification"/>
           <vbox>
-            <label class="pref-title" value="&desktop-notification.label;"/>
+            <label class="pref-title" value="&desktop-notification2.label;"/>
             <hbox align="center">
               <menulist id="desktop-notification-menulist"
                         class="pref-menulist"

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

@@ -201,7 +201,7 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY urlbar.passwordNotificationAnchor.label        "Check if you want to save your password">
 <!ENTITY urlbar.webappsNotificationAnchor.label         "View the app install message">
 <!ENTITY urlbar.pluginsNotificationAnchor.label         "Manage plugin usage on this page">
-<!ENTITY urlbar.webNotsNotificationAnchor.label         "Change whether the site can show you notifications">
+<!ENTITY urlbar.webNotsNotificationAnchor2.label        "Change whether the site can receive notifications">
 
 <!ENTITY urlbar.webRTCShareDevicesNotificationAnchor.label      "Manage sharing your camera and/or microphone with the site">
 <!ENTITY urlbar.webRTCSharingDevicesNotificationAnchor.label    "You are sharing your camera and/or microphone with the site">

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

@@ -41,7 +41,7 @@
 
 <!ENTITY popup.label                     "Open Pop-up Windows">
 
-<!ENTITY desktop-notification.label      "Show Notifications">
+<!ENTITY desktop-notification2.label     "Receive Notifications">
 <!ENTITY camera.label                    "Use the Camera">
 <!ENTITY microphone.label                "Use the Microphone">
 

browser/locales/en-US/chrome/browser/sitePermissions.properties

@@ -8,7 +8,7 @@ block = Block
 alwaysAsk = Always Ask
 
 permission.cookie.label = Set Cookies
-permission.desktop-notification.label = Show Notifications
+permission.desktop-notification2.label = Receive Notifications
 permission.image.label = Load Images
 permission.camera.label = Use the Camera
 permission.microphone.label = Use the Microphone

browser/modules/SitePermissions.jsm

@@ -100,7 +100,8 @@ this.SitePermissions = {
    * used in a UI for managing permissions.
    */
   getPermissionLabel: function (aPermissionID) {
-    return gStringBundle.GetStringFromName("permission." + aPermissionID + ".label");
+    let labelID = gPermissionObject[aPermissionID].labelID || aPermissionID;
+    return gStringBundle.GetStringFromName("permission." + labelID + ".label");
   },
 
   /* Returns the localized label for the given permission state, to be used in
@@ -136,6 +137,10 @@ var gPermissionObject = {
    *    Defaults to UNKNOWN, indicating that the user will be asked each time
    *    a page asks for that permissions.
    *
+   *  - labelID
+   *    Use the given ID instead of the permission name for looking up strings.
+   *    e.g. "desktop-notification2" to use permission.desktop-notification2.label
+   *
    *  - states
    *    Array of permission states to be exposed to the user.
    *    Defaults to ALLOW, BLOCK and the default state (see getDefault).
@@ -162,7 +167,8 @@ var gPermissionObject = {
   },
 
   "desktop-notification": {
-    exactHostMatch: true
+    exactHostMatch: true,
+    labelID: "desktop-notification2",
   },
 
   "camera": {},