From 90795e9c5eb38ad4b66b4bd6507f87e1178c1a17 Mon Sep 17 00:00:00 2001
From: Chenxia Liu <liuche@mozilla.com>
Date: Tue, 17 Nov 2015 17:33:49 -0800
Subject: [PATCH] Bug 1044401 - Turn permissions into nouns. r=sebastian

---
 .../chrome/content/PermissionsHelper.js       | 14 +++++------
 .../locales/en-US/chrome/browser.properties   | 24 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/mobile/android/chrome/content/PermissionsHelper.js b/mobile/android/chrome/content/PermissionsHelper.js
index 32596e2c16b..cc5fe4f43f2 100644
--- a/mobile/android/chrome/content/PermissionsHelper.js
+++ b/mobile/android/chrome/content/PermissionsHelper.js
@@ -8,37 +8,37 @@ var PermissionsHelper = {
                     "offline-app", "desktop-notification", "plugins", "native-intent"],
   _permissionStrings: {
     "password": {
-      label: "password.savePassword",
+      label: "password.logins",
       allowed: "password.save",
       denied: "password.dontSave"
     },
     "geolocation": {
-      label: "geolocation.shareLocation",
+      label: "geolocation.location",
       allowed: "geolocation.allow",
       denied: "geolocation.dontAllow"
     },
     "popup": {
-      label: "blockPopups.label",
+      label: "blockPopups.label2",
       allowed: "popup.show",
       denied: "popup.dontShow"
     },
     "indexedDB": {
-      label: "offlineApps.storeOfflineData",
+      label: "offlineApps.offlineData",
       allowed: "offlineApps.allow",
       denied: "offlineApps.dontAllow2"
     },
     "offline-app": {
-      label: "offlineApps.storeOfflineData",
+      label: "offlineApps.offlineData",
       allowed: "offlineApps.allow",
       denied: "offlineApps.dontAllow2"
     },
     "desktop-notification": {
-      label: "desktopNotification.useNotifications",
+      label: "desktopNotification.notifications",
       allowed: "desktopNotification2.allow",
       denied: "desktopNotification2.dontAllow"
     },
     "plugins": {
-      label: "clickToPlayPlugins.activatePlugins",
+      label: "clickToPlayPlugins.plugins",
       allowed: "clickToPlayPlugins.activate",
       denied: "clickToPlayPlugins.dontActivate"
     },
diff --git a/mobile/android/locales/en-US/chrome/browser.properties b/mobile/android/locales/en-US/chrome/browser.properties
index 4210a82fd2f..a835c72bb47 100644
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -90,9 +90,9 @@ popup.dontShow=Don't show
 # SafeBrowsing
 safeBrowsingDoorhanger=This site has been identified as containing malware or a phishing attempt. Be careful.
 
-# LOCALIZATION NOTE (blockPopups.label): Label that will be used in
+# LOCALIZATION NOTE (blockPopups.label2): Label that will be used in
 # site settings dialog.
-blockPopups.label=Block Popups
+blockPopups.label2=Popups
 
 # XPInstall
 xpinstallPromptWarning2=%S prevented this site (%S) from asking you to install software on your device.
@@ -113,9 +113,9 @@ identity.identified.title_with_country=%S (%S)
 geolocation.allow=Share
 geolocation.dontAllow=Don't share
 geolocation.ask=Share your location with %S?
-# LOCALIZATION NOTE (geolocation.shareLocation): Label that will be used in
+# LOCALIZATION NOTE (geolocation.location): Label that will be used in
 # site settings dialog.
-geolocation.shareLocation=Share Location
+geolocation.shareLocation=Location
 # LOCALIZATION NOTE (geolocation.dontAskAgain): This label appears next to a
 # checkbox to indicate whether or not the user wants to make a permanent decision.
 geolocation.dontAskAgain=Don't ask again for this site
@@ -124,9 +124,9 @@ geolocation.dontAskAgain=Don't ask again for this site
 desktopNotification2.allow=Always
 desktopNotification2.dontAllow=Never
 desktopNotification2.ask=Would you like to receive notifications from this site?
-# LOCALIZATION NOTE (desktopNotification.useNotifications): Label that will be
+# LOCALIZATION NOTE (desktopNotification.notifications): Label that will be
 # used in site settings dialog.
-desktopNotification.useNotifications=Use Notifications
+desktopNotification.notifications=Notifications
 
 # Imageblocking
 imageblocking.downloadedImage=Image unblocked
@@ -199,13 +199,13 @@ offlineApps.dontAskAgain=Don't ask again for this site
 offlineApps.allow=Allow
 offlineApps.dontAllow2=Don't allow
 
-# LOCALIZATION NOTE (offlineApps.storeOfflineData): Label that will be used in
+# LOCALIZATION NOTE (offlineApps.offlineData): Label that will be used in
 # site settings dialog.
-offlineApps.storeOfflineData=Store Offline Data
+offlineApps.offlineData=Offline Data
 
-# LOCALIZATION NOTE (password.savePassword): Label that will be used in
+# LOCALIZATION NOTE (password.logins): Label that will be used in
  # site settings dialog.
-password.savePassword=Save Password
+password.logins=Logins
 # LOCALIZATION NOTE (password.save): This should match
 # saveButton in passwordmgr.properties
 password.save=Save
@@ -306,9 +306,9 @@ clickToPlayPlugins.dontActivate=Don't activate
 # LOCALIZATION NOTE (clickToPlayPlugins.dontAskAgain): This label appears next to a
 # checkbox to indicate whether or not the user wants to make a permanent decision.
 clickToPlayPlugins.dontAskAgain=Don't ask again for this site
-# LOCALIZATION NOTE (clickToPlayPlugins.playPlugins): Label that
+# LOCALIZATION NOTE (clickToPlayPlugins.plugins): Label that
 # will be used in site settings dialog.
-clickToPlayPlugins.activatePlugins=Activate Plugins
+clickToPlayPlugins.plugins=Plugins
 
 # Site settings dialog
 # LOCALIZATION NOTE (siteSettings.labelToValue): This string will be used to