Bug 1391610 - Rename savedLoginsExceptions_desc2 as savedLoginsExceptions_desc3 since we updated the string in Bug 1382135 without changing the ID. r=flod
authorEvan Tseng <evan@tseng.io>
Tue, 12 Sep 2017 18:13:28 +0800
changeset 429861 f1e8596a1f896fd07097012285d6a13ca8b8c188
parent 429860 b674d9f6d1d65fba6b68cb847619d1c7d84c0d4c
child 429862 3867d0df5cafe68058139c4de8e47c4d6e79e567
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod
bugs1391610, 1382135
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1391610 - Rename savedLoginsExceptions_desc2 as savedLoginsExceptions_desc3 since we updated the string in Bug 1382135 without changing the ID. r=flod MozReview-Commit-ID: DBf6QINKTTz
browser/components/preferences/in-content/privacy.js
browser/locales/en-US/chrome/browser/preferences/preferences.properties
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -254,17 +254,17 @@ var gPrivacyPane = {
     setEventListener("submitHealthReportBox", "command",
       gPrivacyPane.updateSubmitHealthReport);
     this._initA11yState();
     let bundlePrefs = document.getElementById("bundlePreferences");
     let signonBundle = document.getElementById("signonBundle");
     let pkiBundle = document.getElementById("pkiBundle");
     appendSearchKeywords("passwordExceptions", [
       bundlePrefs.getString("savedLoginsExceptions_title"),
-      bundlePrefs.getString("savedLoginsExceptions_desc2"),
+      bundlePrefs.getString("savedLoginsExceptions_desc3"),
     ]);
     appendSearchKeywords("showPasswords", [
       signonBundle.getString("loginsDescriptionAll2"),
     ]);
     appendSearchKeywords("cookieExceptions", [
       bundlePrefs.getString("cookiepermissionstext"),
     ]);
     appendSearchKeywords("showCookiesButton", [
@@ -954,17 +954,17 @@ var gPrivacyPane = {
     var params = {
       blockVisible: true,
       sessionVisible: false,
       allowVisible: false,
       hideStatusColumn: true,
       prefilledHost: "",
       permissionType: "login-saving",
       windowTitle: bundlePrefs.getString("savedLoginsExceptions_title"),
-      introText: bundlePrefs.getString("savedLoginsExceptions_desc2")
+      introText: bundlePrefs.getString("savedLoginsExceptions_desc3")
     };
 
     gSubDialog.open("chrome://browser/content/preferences/permissions.xul",
       null, params);
   },
 
   /**
    * Initializes master password UI: the "use master password" checkbox, selects
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.properties
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.properties
@@ -33,17 +33,17 @@ locationpermissionstext=The following we
 locationpermissionstitle=Settings - Location Permissions
 camerapermissionstext=The following websites have requested to access your camera. You can specify which websites are allowed to access your camera.
 camerapermissionstitle=Settings - Camera Permissions
 microphonepermissionstext=The following websites have requested to access your microphone. You can specify which websites are allowed to access your microphone.
 microphonepermissionstitle=Settings - Microphone Permissions
 invalidURI=Please enter a valid hostname
 invalidURITitle=Invalid Hostname Entered
 savedLoginsExceptions_title=Exceptions - Saved Logins
-savedLoginsExceptions_desc2=Logins for the following websites will not be saved
+savedLoginsExceptions_desc3=Logins for the following websites will not be saved
 
 #### Block List Manager
 
 blockliststext=You can choose which list Firefox will use to block Web elements that may track your browsing activity.
 blockliststitle=Block Lists
 # LOCALIZATION NOTE (mozNameTemplate): This template constructs the name of the
 # block list in the block lists dialog. It combines the list name and
 # description.