fixup! Bug 40926: Implemented the New Identity feature

Bug 40781 (build): Move l10n files to browser/locales

browser/components/newidentity/content/newidentity.js

@@ -24,7 +24,7 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => {
   let bundle = null;
   try {
     bundle = Services.strings.createBundle(
-      "chrome://newidentity/locale/newIdentity.properties"
+      "chrome://browser/locale/newIdentity.properties"
     );
   } catch (e) {
     console.warn("Could not load the New Identity strings");

browser/components/newidentity/jar.mn

@@ -3,14 +3,3 @@ browser.jar:
     content/browser/newIdentityDialog.xhtml    (content/newIdentityDialog.xhtml)
     content/browser/newIdentityDialog.css      (content/newIdentityDialog.css)
     content/browser/newIdentityDialog.js       (content/newIdentityDialog.js)
-
-newidentity.jar:
-# We need to list at least one locale here, to make Firefox load the localized
-# copy of properties at chrome://newidentity/locale/newIdentity.properties.
-# Ideally, we should use @AB_CD@.jar to automatically copy all the locales
-# Firefox is built with. But we only provide English here, and injecting the
-# translated files directly to the omni.ja works better for us, for the time
-# being. In addition to inject the properties files, we also add the
-# corresponding locale line to chrome/chrome.manifest.
-% locale newidentity en-US %locale/en-US/
-    locale/en-US/newIdentity.properties  (locale/en-US/newIdentity.properties)

browser/installer/package-manifest.in

@@ -251,8 +251,6 @@
 @RESPATH@/browser/features/*
 
 ; Base Browser
-@RESPATH@/browser/chrome/newidentity.manifest
-@RESPATH@/browser/chrome/newidentity/
 @RESPATH@/components/SecurityLevel.manifest
 
 ; [DevTools Startup Files]

browser/locales/jar.mn

@@ -43,6 +43,7 @@
     locale/browser/feeds/subscribe.properties       (%chrome/browser/feeds/subscribe.properties)
     locale/browser/syncSetup.properties         (%chrome/browser/syncSetup.properties)
     locale/browser/securityLevel.properties        (%chrome/browser/securityLevel.properties)
+    locale/browser/newIdentity.properties          (%chrome/browser/newIdentity.properties)
 % locale browser-region @AB_CD@ %locale/browser-region/
 # the following files are browser-specific overrides
     locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)