Bug 1255382 - Detangle passwordmgr.properties in android. r=Pike

MozReview-Commit-ID: Cr7DTJpeXpB

--HG--
rename : mobile/locales/en-US/overrides/passwordmgr.properties => mobile/android/locales/en-US/chrome/passwordmgr.properties
extra : rebase_source : d1c86bf971a1f6dda2206caabd5602e52d304ddb

mobile/android/components/LoginManagerPrompter.js

@@ -62,7 +62,7 @@ LoginManagerPrompter.prototype = {
       let bunService = Cc["@mozilla.org/intl/stringbundle;1"].
                        getService(Ci.nsIStringBundleService);
       this.__strBundle = {
-        pwmgr: bunService.createBundle("chrome://passwordmgr/locale/passwordmgr.properties"),
+        pwmgr: bunService.createBundle("chrome://browser/locale/passwordmgr.properties"),
         brand: bunService.createBundle("chrome://branding/locale/brand.properties")
       };
 

mobile/android/components/PromptService.js

@@ -848,7 +848,7 @@ var PromptUtils = {
 };
 
 XPCOMUtils.defineLazyGetter(PromptUtils, "passwdBundle", function() {
-  return Services.strings.createBundle("chrome://passwordmgr/locale/passwordmgr.properties");
+  return Services.strings.createBundle("chrome://browser/locale/passwordmgr.properties");
 });
 
 XPCOMUtils.defineLazyGetter(PromptUtils, "bundle", function() {

mobile/android/locales/en-US/chrome/passwordmgr.properties

@@ -13,10 +13,10 @@ updatePasswordNoUser=Update saved password for this login?
 updateButton=Update
 dontUpdateButton=Don't update
 
+# Copy of the toolkit's passwordmgr.properties
 userSelectText2=Select which login to update:
 passwordChangeTitle=Confirm Password Change
 
 # Strings used by PromptService.js
-rememberPassword=Use Password Manager to remember this password.
 username=Username
 password=Password

mobile/android/locales/filter.py

@@ -25,7 +25,6 @@ def test(mod, path, entity = None):
         "chrome/global/commonDialogs.properties",
         "chrome/global/intl.properties",
         "chrome/global/intl.css",
-        "chrome/passwordmgr/passwordmgr.properties",
         "chrome/search/search.properties",
         "chrome/pluginproblem/pluginproblem.dtd",
         "chrome/global/aboutSupport.dtd",

mobile/android/locales/jar.mn

@@ -31,6 +31,7 @@
   locale/@AB_CD@/browser/handling.properties      (%chrome/handling.properties)
   locale/@AB_CD@/browser/aboutLogins.dtd          (%chrome/aboutLogins.dtd)
   locale/@AB_CD@/browser/aboutLogins.properties  (%chrome/aboutLogins.properties)
+  locale/@AB_CD@/browser/passwordmgr.properties   (%chrome/passwordmgr.properties)
 #ifndef RELEASE_OR_BETA
   locale/@AB_CD@/browser/webcompatReporter.properties (%chrome/webcompatReporter.properties)
 #endif
@@ -47,7 +48,6 @@ relativesrcdir toolkit/locales:
   locale/@AB_CD@/browser/overrides/commonDialogs.properties        (%chrome/global/commonDialogs.properties)
   locale/@AB_CD@/browser/overrides/intl.properties                 (%chrome/global/intl.properties)
   locale/@AB_CD@/browser/overrides/intl.css                        (%chrome/global/intl.css)
-  locale/@AB_CD@/browser/overrides/passwordmgr.properties          (%chrome/passwordmgr/passwordmgr.properties)
   locale/@AB_CD@/browser/overrides/search/search.properties        (%chrome/search/search.properties)
 # plugins
   locale/@AB_CD@/browser/overrides/plugins/pluginproblem.dtd       (%chrome/pluginproblem/pluginproblem.dtd)
@@ -74,7 +74,6 @@ relativesrcdir toolkit/locales:
 % override chrome://mozapps/locale/handling/handling.properties chrome://browser/locale/handling.properties
 % override chrome://global/locale/intl.properties chrome://browser/locale/overrides/intl.properties
 % override chrome://global/locale/intl.css chrome://browser/locale/overrides/intl.css
-% override chrome://passwordmgr/locale/passwordmgr.properties chrome://browser/locale/overrides/passwordmgr/passwordmgr.properties
 % override chrome://global/locale/search/search.properties chrome://browser/locale/overrides/search/search.properties
 % override chrome://pluginproblem/locale/pluginproblem.dtd chrome://browser/locale/overrides/plugins/pluginproblem.dtd
 % override chrome://global/locale/aboutSupport.dtd chrome://browser/locale/overrides/global/aboutSupport.dtd

mobile/android/locales/l10n.toml

@@ -176,10 +176,6 @@ exclude-multi-locale = [
     reference = "toolkit/locales/en-US/chrome/global/intl.css"
     l10n = "{l}toolkit/chrome/global/intl.css"
 
-[[paths]]
-    reference = "toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties"
-    l10n = "{l}toolkit/chrome/passwordmgr/passwordmgr.properties"
-
 [[paths]]
     reference = "toolkit/locales/en-US/chrome/search/search.properties"
     l10n = "{l}toolkit/chrome/search/search.properties"

mobile/locales/filter.py

@@ -25,7 +25,6 @@ def test(mod, path, entity = None):
         "chrome/global/commonDialogs.properties",
         "chrome/global/intl.properties",
         "chrome/global/intl.css",
-        "chrome/passwordmgr/passwordmgr.properties",
         "chrome/search/search.properties",
         "chrome/pluginproblem/pluginproblem.dtd",
         "chrome/global/aboutSupport.dtd",

mobile/locales/jar.mn

@@ -13,5 +13,3 @@
 % override chrome://global/locale/netError.dtd    chrome://browser/locale/netError.dtd
   locale/@AB_CD@/browser/appstrings.properties    (%overrides/appstrings.properties)
 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
-  locale/@AB_CD@/browser/passwordmgr.properties    (%overrides/passwordmgr.properties)
-% override chrome://passwordmgr/locale/passwordmgr.properties chrome://browser/locale/passwordmgr.properties