Issue #35 - Follow-up: undo locale changes so they aren't pre-processed.

Pre-processing loses our localization notes and licensing headers for
l10n which is not a good thing. It's not a big deal having a few unused
strings in these files in the resulting locales.

4 files changed, 2 insertions, 8 deletions

diff --git a/dom/locales/en-US/chrome/plugins.properties b/dom/locales/en-US/chrome/plugins.properties
index 17bd757e97..d5e65fea73 100644
--- a/dom/locales/en-US/chrome/plugins.properties
+++ b/dom/locales/en-US/chrome/plugins.properties
@@ -22,7 +22,6 @@ suffixes_label=Suffixes
 learn_more_label=Learn More
 
 # GMP Plugins
-#ifdef MOZ_GMP
 gmp_license_info=License information
 gmp_privacy_info=Privacy Information
 
@@ -31,4 +30,3 @@ openH264_description2=This plugin is automatically installed by Mozilla to compl
 
 widevine_name=Widevine Content Decryption Module provided by Google Inc.
 widevine_description2=Play back protected web video.
-#endif
diff --git a/dom/locales/jar.mn b/dom/locales/jar.mn
index 858ccdd70f..fadab2a3e7 100644
--- a/dom/locales/jar.mn
+++ b/dom/locales/jar.mn
@@ -15,7 +15,7 @@
   locale/@AB_CD@/global/global.dtd                             (%chrome/global.dtd)
   locale/@AB_CD@/global/appstrings.properties                  (%chrome/appstrings.properties)
   locale/@AB_CD@/global/global-strres.properties               (%chrome/global-strres.properties)
-* locale/@AB_CD@/global/plugins.properties                     (%chrome/plugins.properties)
+  locale/@AB_CD@/global/plugins.properties                     (%chrome/plugins.properties)
   locale/@AB_CD@/global/nsWebBrowserPersist.properties         (%chrome/nsWebBrowserPersist.properties)
   locale/@AB_CD@/global/xslt/xslt.properties                   (%chrome/xslt/xslt.properties)
   locale/@AB_CD@/global/dom/dom.properties                     (%chrome/dom/dom.properties)
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
index 307d6f1964..c5de4f0c04 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
@@ -58,9 +58,7 @@ notification.installError=There was an error installing %1$S.
 notification.installError.retry=Try again
 notification.installError.retry.tooltip=Try downloading and installing this add-on again
 #LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
-#ifdef MOZ_GMP
 notification.gmpPending=%1$S will be installed shortly.
-#endif
 
 #LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
 contributionAmount2=Suggested Contribution: %S
@@ -103,9 +101,7 @@ details.notification.uninstall=%1$S will be uninstalled after you restart %2$S.
 #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
 details.notification.upgrade=%1$S will be updated after you restart %2$S.
 #LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
-#ifdef MOZ_GMP
 details.notification.gmpPending=%1$S will be installed shortly.
-#endif
 
 installFromFile.dialogTitle=Select add-on to install
 installFromFile.filterName=Add-ons
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index 966e002f1e..5d9da52240 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -96,7 +96,7 @@
   locale/@AB_CD@/mozapps/downloads/downloads.dtd                  (%chrome/mozapps/downloads/downloads.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.properties           (%chrome/mozapps/downloads/downloads.properties)
   locale/@AB_CD@/mozapps/extensions/extensions.dtd                (%chrome/mozapps/extensions/extensions.dtd)
-* locale/@AB_CD@/mozapps/extensions/extensions.properties         (%chrome/mozapps/extensions/extensions.properties)
+  locale/@AB_CD@/mozapps/extensions/extensions.properties         (%chrome/mozapps/extensions/extensions.properties)
   locale/@AB_CD@/mozapps/extensions/blocklist.dtd                 (%chrome/mozapps/extensions/blocklist.dtd)
   locale/@AB_CD@/mozapps/extensions/about.dtd                     (%chrome/mozapps/extensions/about.dtd)
   locale/@AB_CD@/mozapps/extensions/selectAddons.dtd              (%chrome/mozapps/extensions/selectAddons.dtd)