From 8a05348b899467a31eeb4b784e9c58e5754e410f Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 27 Nov 2015 20:49:59 +0900 Subject: [PATCH] Bug 1228467 - Don't preprocess chrome files without preprocessor directives. r=gps --- b2g/branding/horizon/locales/jar.mn | 2 +- b2g/branding/official/locales/jar.mn | 2 +- b2g/branding/unofficial/locales/jar.mn | 2 +- b2g/locales/jar.mn | 4 ++-- browser/branding/official/locales/jar.mn | 4 ++-- mobile/android/branding/aurora/locales/jar.mn | 2 +- mobile/android/branding/beta/locales/jar.mn | 2 +- mobile/android/branding/nightly/locales/jar.mn | 2 +- mobile/android/branding/official/locales/jar.mn | 2 +- mobile/android/branding/unofficial/locales/jar.mn | 2 +- mobile/locales/jar.mn | 6 +++--- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/b2g/branding/horizon/locales/jar.mn b/b2g/branding/horizon/locales/jar.mn index 3d32ef1f165..2ea47e1684a 100644 --- a/b2g/branding/horizon/locales/jar.mn +++ b/b2g/branding/horizon/locales/jar.mn @@ -8,4 +8,4 @@ % locale branding @AB_CD@ %locale/branding/ # Branding only exists in en-US locale/branding/brand.dtd (en-US/brand.dtd) -* locale/branding/brand.properties (en-US/brand.properties) + locale/branding/brand.properties (en-US/brand.properties) diff --git a/b2g/branding/official/locales/jar.mn b/b2g/branding/official/locales/jar.mn index 3d32ef1f165..2ea47e1684a 100644 --- a/b2g/branding/official/locales/jar.mn +++ b/b2g/branding/official/locales/jar.mn @@ -8,4 +8,4 @@ % locale branding @AB_CD@ %locale/branding/ # Branding only exists in en-US locale/branding/brand.dtd (en-US/brand.dtd) -* locale/branding/brand.properties (en-US/brand.properties) + locale/branding/brand.properties (en-US/brand.properties) diff --git a/b2g/branding/unofficial/locales/jar.mn b/b2g/branding/unofficial/locales/jar.mn index 825dabbfb47..5a77695c91a 100644 --- a/b2g/branding/unofficial/locales/jar.mn +++ b/b2g/branding/unofficial/locales/jar.mn @@ -8,4 +8,4 @@ % locale branding @AB_CD@ %locale/branding/ # Nightly branding only exists in en-US locale/branding/brand.dtd (en-US/brand.dtd) -* locale/branding/brand.properties (en-US/brand.properties) + locale/branding/brand.properties (en-US/brand.properties) diff --git a/b2g/locales/jar.mn b/b2g/locales/jar.mn index b5f9ee7d641..970261dbe36 100644 --- a/b2g/locales/jar.mn +++ b/b2g/locales/jar.mn @@ -9,8 +9,8 @@ % override chrome://global/locale/aboutCertError.dtd chrome://b2g-l10n/locale/aboutCertError.dtd % override chrome://global/locale/appstrings.properties chrome://b2g-l10n/locale/appstrings.properties -* locale/@AB_CD@/b2g-l10n/aboutCertError.dtd (%chrome/overrides/aboutCertError.dtd) -* locale/@AB_CD@/b2g-l10n/appstrings.properties (%chrome/overrides/appstrings.properties) + locale/@AB_CD@/b2g-l10n/aboutCertError.dtd (%chrome/overrides/aboutCertError.dtd) + locale/@AB_CD@/b2g-l10n/appstrings.properties (%chrome/overrides/appstrings.properties) #ifdef MOZ_GRAPHENE locale/@AB_CD@/b2g-l10n/graphene.properties (%chrome/graphene.properties) #endif diff --git a/browser/branding/official/locales/jar.mn b/browser/branding/official/locales/jar.mn index 8ebdcc49126..9fdfe578b49 100644 --- a/browser/branding/official/locales/jar.mn +++ b/browser/branding/official/locales/jar.mn @@ -7,5 +7,5 @@ @AB_CD@.jar: % locale branding @AB_CD@ %locale/branding/ locale/branding/brand.dtd (%brand.dtd) -* locale/branding/brand.properties (%brand.properties) -* locale/branding/browserconfig.properties + locale/branding/brand.properties (%brand.properties) + locale/branding/browserconfig.properties diff --git a/mobile/android/branding/aurora/locales/jar.mn b/mobile/android/branding/aurora/locales/jar.mn index 825dabbfb47..5a77695c91a 100644 --- a/mobile/android/branding/aurora/locales/jar.mn +++ b/mobile/android/branding/aurora/locales/jar.mn @@ -8,4 +8,4 @@ % locale branding @AB_CD@ %locale/branding/ # Nightly branding only exists in en-US locale/branding/brand.dtd (en-US/brand.dtd) -* locale/branding/brand.properties (en-US/brand.properties) + locale/branding/brand.properties (en-US/brand.properties) diff --git a/mobile/android/branding/beta/locales/jar.mn b/mobile/android/branding/beta/locales/jar.mn index 3d32ef1f165..2ea47e1684a 100644 --- a/mobile/android/branding/beta/locales/jar.mn +++ b/mobile/android/branding/beta/locales/jar.mn @@ -8,4 +8,4 @@ % locale branding @AB_CD@ %locale/branding/ # Branding only exists in en-US locale/branding/brand.dtd (en-US/brand.dtd) -* locale/branding/brand.properties (en-US/brand.properties) + locale/branding/brand.properties (en-US/brand.properties) diff --git a/mobile/android/branding/nightly/locales/jar.mn b/mobile/android/branding/nightly/locales/jar.mn index 825dabbfb47..5a77695c91a 100644 --- a/mobile/android/branding/nightly/locales/jar.mn +++ b/mobile/android/branding/nightly/locales/jar.mn @@ -8,4 +8,4 @@ % locale branding @AB_CD@ %locale/branding/ # Nightly branding only exists in en-US locale/branding/brand.dtd (en-US/brand.dtd) -* locale/branding/brand.properties (en-US/brand.properties) + locale/branding/brand.properties (en-US/brand.properties) diff --git a/mobile/android/branding/official/locales/jar.mn b/mobile/android/branding/official/locales/jar.mn index 3d32ef1f165..2ea47e1684a 100644 --- a/mobile/android/branding/official/locales/jar.mn +++ b/mobile/android/branding/official/locales/jar.mn @@ -8,4 +8,4 @@ % locale branding @AB_CD@ %locale/branding/ # Branding only exists in en-US locale/branding/brand.dtd (en-US/brand.dtd) -* locale/branding/brand.properties (en-US/brand.properties) + locale/branding/brand.properties (en-US/brand.properties) diff --git a/mobile/android/branding/unofficial/locales/jar.mn b/mobile/android/branding/unofficial/locales/jar.mn index 825dabbfb47..5a77695c91a 100644 --- a/mobile/android/branding/unofficial/locales/jar.mn +++ b/mobile/android/branding/unofficial/locales/jar.mn @@ -8,4 +8,4 @@ % locale branding @AB_CD@ %locale/branding/ # Nightly branding only exists in en-US locale/branding/brand.dtd (en-US/brand.dtd) -* locale/branding/brand.properties (en-US/brand.properties) + locale/branding/brand.properties (en-US/brand.properties) diff --git a/mobile/locales/jar.mn b/mobile/locales/jar.mn index 3045440abca..0e65e4b2c24 100644 --- a/mobile/locales/jar.mn +++ b/mobile/locales/jar.mn @@ -10,9 +10,9 @@ locale/@AB_CD@/browser/searchplugins/list.txt (%searchplugins/list.txt) # Fennec-specific overrides of generic strings -* locale/@AB_CD@/browser/netError.dtd (%overrides/netError.dtd) + locale/@AB_CD@/browser/netError.dtd (%overrides/netError.dtd) % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd -* locale/@AB_CD@/browser/appstrings.properties (%overrides/appstrings.properties) + 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) + locale/@AB_CD@/browser/passwordmgr.properties (%overrides/passwordmgr.properties) % override chrome://passwordmgr/locale/passwordmgr.properties chrome://browser/locale/passwordmgr.properties