diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js index 23151eff39e1..cf8f6000d396 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js @@ -95,11 +95,11 @@ var whitelist = new Set([ platforms: ["linux", "win"]}, {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/mac/platformKeys.properties", platforms: ["linux", "win"]}, - {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/unix/accessible.properties", + {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/gtk/accessible.properties", platforms: ["macosx", "win"]}, - {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/unix/intl.properties", + {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/gtk/intl.properties", platforms: ["macosx", "win"]}, - {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/unix/platformKeys.properties", + {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/gtk/platformKeys.properties", platforms: ["macosx", "win"]}, {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/win/accessible.properties", platforms: ["linux", "macosx"]}, diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index 11929c825d53..e5547af33cb2 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -193,9 +193,9 @@ chrome/en-US/locale/en-US/browser/overrides/plugins.properties chrome/en-US/locale/en-US/browser/overrides/plugins/pluginproblem.dtd chrome/en-US/locale/en-US/browser/overrides/search/search.properties chrome/en-US/locale/en-US/global-platform/mac/intl.properties -chrome/en-US/locale/en-US/global-platform/unix/accessible.properties -chrome/en-US/locale/en-US/global-platform/unix/intl.properties -chrome/en-US/locale/en-US/global-platform/unix/platformKeys.properties +chrome/en-US/locale/en-US/global-platform/gtk/accessible.properties +chrome/en-US/locale/en-US/global-platform/gtk/intl.properties +chrome/en-US/locale/en-US/global-platform/gtk/platformKeys.properties chrome/en-US/locale/en-US/global-platform/win/accessible.properties chrome/en-US/locale/en-US/global-platform/win/intl.properties chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties diff --git a/dom/locales/jar.mn b/dom/locales/jar.mn index fadab2a3e70a..4e3b2b9ba4d2 100644 --- a/dom/locales/jar.mn +++ b/dom/locales/jar.mn @@ -30,6 +30,6 @@ locale/@AB_CD@/global/xml/prettyprint.dtd (%chrome/xml/prettyprint.dtd) locale/@AB_CD@/global-platform/win/accessible.properties (%chrome/accessibility/win/accessible.properties) locale/@AB_CD@/global-platform/mac/accessible.properties (%chrome/accessibility/mac/accessible.properties) - locale/@AB_CD@/global-platform/unix/accessible.properties (%chrome/accessibility/unix/accessible.properties) + locale/@AB_CD@/global-platform/gtk/accessible.properties (%chrome/accessibility/unix/accessible.properties) locale/@AB_CD@/global/AccessFu.properties (%chrome/accessibility/AccessFu.properties) locale/@AB_CD@/global/mathml/mathml.properties (%chrome/mathml/mathml.properties) diff --git a/mobile/android/installer/allowed-dupes.mn b/mobile/android/installer/allowed-dupes.mn index 80477f42bde6..1614f3e24710 100644 --- a/mobile/android/installer/allowed-dupes.mn +++ b/mobile/android/installer/allowed-dupes.mn @@ -84,9 +84,9 @@ chrome/en-US/locale/en-US/browser/overrides/plugins.properties chrome/en-US/locale/en-US/browser/overrides/plugins/pluginproblem.dtd chrome/en-US/locale/en-US/browser/overrides/search/search.properties chrome/en-US/locale/en-US/global-platform/mac/intl.properties -chrome/en-US/locale/en-US/global-platform/unix/accessible.properties -chrome/en-US/locale/en-US/global-platform/unix/intl.properties -chrome/en-US/locale/en-US/global-platform/unix/platformKeys.properties +chrome/en-US/locale/en-US/global-platform/gtk/accessible.properties +chrome/en-US/locale/en-US/global-platform/gtk/intl.properties +chrome/en-US/locale/en-US/global-platform/gtk/platformKeys.properties chrome/en-US/locale/en-US/global-platform/win/accessible.properties chrome/en-US/locale/en-US/global-platform/win/intl.properties chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 04a24f98641d..d724bd084d9a 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -1,6 +1,5 @@ toolkit.jar: % content global %content/global/ contentaccessible=yes -% content global-platform %content/global-platform/ platform * content/global/license.html content/global/XPCNativeWrapper.js content/global/minimal-xul.css diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn index 7e1d89677c4c..cb181dd60d8f 100644 --- a/toolkit/locales/jar.mn +++ b/toolkit/locales/jar.mn @@ -92,12 +92,14 @@ locale/@AB_CD@/global/wizard.properties (%chrome/global/wizard.properties) locale/@AB_CD@/global/crashes.dtd (%crashreporter/crashes.dtd) locale/@AB_CD@/global/crashes.properties (%crashreporter/crashes.properties) -% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/ +% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/gtk/ +% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/mac/ os=Darwin +% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/win/ os=WINNT locale/@AB_CD@/global-platform/mac/platformKeys.properties (%chrome/global-platform/mac/platformKeys.properties) - locale/@AB_CD@/global-platform/unix/platformKeys.properties (%chrome/global-platform/unix/platformKeys.properties) + locale/@AB_CD@/global-platform/gtk/platformKeys.properties (%chrome/global-platform/unix/platformKeys.properties) locale/@AB_CD@/global-platform/win/platformKeys.properties (%chrome/global-platform/win/platformKeys.properties) locale/@AB_CD@/global-platform/mac/intl.properties (%chrome/global-platform/mac/intl.properties) - locale/@AB_CD@/global-platform/unix/intl.properties (%chrome/global-platform/unix/intl.properties) + locale/@AB_CD@/global-platform/gtk/intl.properties (%chrome/global-platform/unix/intl.properties) locale/@AB_CD@/global-platform/win/intl.properties (%chrome/global-platform/win/intl.properties) % locale mozapps @AB_CD@ %locale/@AB_CD@/mozapps/ locale/@AB_CD@/mozapps/downloads/unknownContentType.properties (%chrome/mozapps/downloads/unknownContentType.properties)