From 5f8de423f190bbb79a62f804151bc24824fa32d8 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 2 Feb 2018 04:16:08 -0500 Subject: Add m-esr52 at 52.6.0 --- b2g/locales/Makefile.in | 149 +++++++++++++++++++++ b2g/locales/all-locales | 3 + b2g/locales/en-US/b2g-l10n.js | 12 ++ b2g/locales/en-US/chrome/graphene.properties | 5 + .../en-US/chrome/overrides/aboutCertError.dtd | 38 ++++++ .../en-US/chrome/overrides/appstrings.properties | 39 ++++++ b2g/locales/en-US/defines.inc | 9 ++ b2g/locales/filter.py | 15 +++ b2g/locales/jar.mn | 75 +++++++++++ b2g/locales/l10n.ini | 13 ++ b2g/locales/moz.build | 7 + 11 files changed, 365 insertions(+) create mode 100644 b2g/locales/Makefile.in create mode 100644 b2g/locales/all-locales create mode 100644 b2g/locales/en-US/b2g-l10n.js create mode 100644 b2g/locales/en-US/chrome/graphene.properties create mode 100644 b2g/locales/en-US/chrome/overrides/aboutCertError.dtd create mode 100644 b2g/locales/en-US/chrome/overrides/appstrings.properties create mode 100644 b2g/locales/en-US/defines.inc create mode 100644 b2g/locales/filter.py create mode 100644 b2g/locales/jar.mn create mode 100644 b2g/locales/l10n.ini create mode 100644 b2g/locales/moz.build (limited to 'b2g/locales') diff --git a/b2g/locales/Makefile.in b/b2g/locales/Makefile.in new file mode 100644 index 000000000..c626e557c --- /dev/null +++ b/b2g/locales/Makefile.in @@ -0,0 +1,149 @@ +# vim:set ts=8 sw=8 sts=8 noet: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +include $(topsrcdir)/config/config.mk + +SUBMAKEFILES += \ + $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \ + $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \ + $(NULL) + +# This makefile uses variable overrides from the libs-% target to +# build non-default locales to non-default dist/ locations. Be aware! + +PWD := $(CURDIR) + +# These are defaulted to be compatible with the files the wget-en-US target +# pulls. You may override them if you provide your own files. You _must_ +# override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not +# work in that case. +ZIP_IN ?= $(ABS_DIST)/$(PACKAGE) +WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe +RETRIEVE_WINDOWS_INSTALLER = 1 + +MOZ_LANGPACK_EID=langpack-$(AB_CD)@b2g.mozilla.org + +L10N_PREF_JS_EXPORTS = $(call MERGE_FILE,b2g-l10n.js) +L10N_PREF_JS_EXPORTS_PATH = $(FINAL_TARGET)/$(PREF_DIR) +L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warnings +PP_TARGETS += L10N_PREF_JS_EXPORTS + +ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT))) +MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore +MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png +MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns +MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ ' +endif + +ifeq (WINNT,$(OS_ARCH)) +UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \ + $(NSINSTALL) -D $(STAGEDIST)/uninstall; \ + cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \ + $(RM) $(ABS_DIST)/l10n-stage/setup.exe; \ + cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \ + $(NULL) +endif + +include $(topsrcdir)/config/rules.mk + +include $(topsrcdir)/toolkit/locales/l10n.mk + +$(STAGEDIST): $(DIST)/branding + +$(DIST)/branding: + $(NSINSTALL) -D $@ + +libs:: + @if test -f '$(LOCALE_SRCDIR)/existing-profile-defaults.js'; then \ + $(PYTHON) -m mozbuild.action.preprocessor $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) \ + $(LOCALE_SRCDIR)/existing-profile-defaults.js -o $(FINAL_TARGET)/defaults/existing-profile-defaults.js; \ + fi + +NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD)) + +libs-%: + $(NSINSTALL) -D $(DIST)/install + @$(MAKE) -C ../../toolkit/locales libs-$* + @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) + @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* + +# Tailored target to just add the chrome processing for multi-locale builds +chrome-%: + @$(MAKE) chrome AB_CD=$* + @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$* + +repackage-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe +repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) + @echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).' + $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export + $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx + $(MAKE) repackage-zip \ + AB_CD=$(AB_CD) \ + MOZ_PKG_FORMAT=SFX7Z \ + ZIP_IN='$(WIN32_INSTALLER_IN)' \ + ZIP_OUT='$(WIN32_INSTALLER_OUT)' \ + SFX_HEADER='$(PWD)/../installer/windows/l10ngen/7zSD.sfx \ + $(topsrcdir)/b2g/installer/windows/app.tag' + +ifeq (WINNT,$(OS_ARCH)) +repackage-win32-installer-%: + @$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN='$(WIN32_INSTALLER_IN)' +else +repackage-win32-installer-%: ; +endif + + +clobber-zip: + $(RM) $(STAGEDIST)/chrome/$(AB_CD).jar \ + $(STAGEDIST)/chrome/$(AB_CD).manifest \ + $(STAGEDIST)/defaults/pref/b2g-l10n.js + $(STAGEDIST)/dictionaries \ + $(STAGEDIST)/defaults/profile \ + $(STAGEDIST)/chrome/$(AB_CD) + + +langpack: langpack-$(AB_CD) + +# This is a generic target that will make a langpack, repack ZIP (+tarball) +# builds, and repack an installer if applicable. It is called from the +# tinderbox scripts. Alter it with caution. + +installers-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-% + @echo 'repackaging done' + +# When we unpack b2g on MacOS X the platform.ini and application.ini are in slightly +# different locations that on all other platforms +ifeq (Darwin, $(OS_ARCH)) +GECKO_PLATFORM_INI_PATH='$(STAGEDIST)/platform.ini' +B2G_APPLICATION_INI_PATH='$(STAGEDIST)/application.ini' +else +GECKO_PLATFORM_INI_PATH='$(STAGEDIST)/platform.ini' +B2G_APPLICATION_INI_PATH='$(STAGEDIST)/application.ini' +endif + + +ident: + @printf 'gecko_revision ' + @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(GECKO_PLATFORM_INI_PATH) Build SourceStamp + @printf 'b2g_revision ' + @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(B2G_APPLICATION_INI_PATH) App SourceStamp + @printf 'buildid ' + @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(B2G_APPLICATION_INI_PATH) App BuildID + +merge-%: +ifdef LOCALE_MERGEDIR + $(RM) -rf $(LOCALE_MERGEDIR) + $(topsrcdir)/mach compare-locales --merge-dir $(LOCALE_MERGEDIR) $* +endif + @echo + +# test target, depends on make package +# try to repack x-test, with just toolkit/defines.inc being there +l10n-check:: + $(RM) -rf x-test + $(NSINSTALL) -D x-test/toolkit + echo '#define MOZ_LANG_TITLE Just testing' > x-test/toolkit/defines.inc + $(MAKE) installers-x-test L10NBASEDIR='$(PWD)' LOCALE_MERGEDIR='$(PWD)/mergedir' diff --git a/b2g/locales/all-locales b/b2g/locales/all-locales new file mode 100644 index 000000000..44317e1ee --- /dev/null +++ b/b2g/locales/all-locales @@ -0,0 +1,3 @@ +es-ES +pl +pt-BR diff --git a/b2g/locales/en-US/b2g-l10n.js b/b2g/locales/en-US/b2g-l10n.js new file mode 100644 index 000000000..d502f0ae5 --- /dev/null +++ b/b2g/locales/en-US/b2g-l10n.js @@ -0,0 +1,12 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +#filter substitution + +pref("general.useragent.locale", "@AB_CD@"); + +// Enable sparse localization by setting a few package locale overrides +pref("chrome.override_package.global", "b2g-l10n"); +pref("chrome.override_package.mozapps", "b2g-l10n"); +pref("chrome.override_package.passwordmgr", "b2g-l10n"); diff --git a/b2g/locales/en-US/chrome/graphene.properties b/b2g/locales/en-US/chrome/graphene.properties new file mode 100644 index 000000000..be5f0b5c5 --- /dev/null +++ b/b2g/locales/en-US/chrome/graphene.properties @@ -0,0 +1,5 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +installing=Installing… diff --git a/b2g/locales/en-US/chrome/overrides/aboutCertError.dtd b/b2g/locales/en-US/chrome/overrides/aboutCertError.dtd new file mode 100644 index 000000000..cd6c6ba63 --- /dev/null +++ b/b2g/locales/en-US/chrome/overrides/aboutCertError.dtd @@ -0,0 +1,38 @@ + + + + %brandDTD; + + + + + + + +#1, but we can't confirm that your connection is secure."> + + + + + + +Even if you trust the site, this error could mean that someone is +tampering with your connection."> + + + + + diff --git a/b2g/locales/en-US/chrome/overrides/appstrings.properties b/b2g/locales/en-US/chrome/overrides/appstrings.properties new file mode 100644 index 000000000..ecc9e0a04 --- /dev/null +++ b/b2g/locales/en-US/chrome/overrides/appstrings.properties @@ -0,0 +1,39 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +malformedURI=The URL is not valid and cannot be loaded. +fileNotFound=Firefox can't find the file at %S. +dnsNotFound=Firefox can't find the server at %S. +unknownProtocolFound=Firefox doesn't know how to open this address, because one of the following protocols (%S) isn't associated with any program or is not allowed in this context. +connectionFailure=Firefox can't establish a connection to the server at %S. +netInterrupt=The connection to %S was interrupted while the page was loading. +netTimeout=The server at %S is taking too long to respond. +redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete. +## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S" +confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier. +resendButton.label=Resend +unknownSocketType=Firefox doesn't know how to communicate with the server. +netReset=The connection to the server was reset while the page was loading. +notCached=This document is no longer available. +netOffline=Firefox is currently in offline mode and can't browse the Web. +isprinting=The document cannot change while Printing or in Print Preview. +deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Firefox has canceled the request for your protection. +proxyResolveFailure=Firefox is configured to use a proxy server that can't be found. +proxyConnectFailure=Firefox is configured to use a proxy server that is refusing connections. +contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. +unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem. +externalProtocolTitle=External Protocol Request +externalProtocolPrompt=An external application must be launched to handle %1$S: links.\n\n\nRequested link:\n\n%2$S\n\nApplication: %3$S\n\n\nIf you were not expecting this request it may be an attempt to exploit a weakness in that other program. Cancel this request unless you are sure it is not malicious.\n +#LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined +externalProtocolUnknown= +externalProtocolChkMsg=Remember my choice for all links of this type. +externalProtocolLaunchBtn=Launch application +malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences. +unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences. +deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences. +cspBlocked=This page has a content security policy that prevents it from being loaded in this way. +corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired. +remoteXUL=This page uses an unsupported technology that is no longer available by default in Firefox. +sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. +weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, Firefox has not connected to this website. diff --git a/b2g/locales/en-US/defines.inc b/b2g/locales/en-US/defines.inc new file mode 100644 index 000000000..24f45813a --- /dev/null +++ b/b2g/locales/en-US/defines.inc @@ -0,0 +1,9 @@ +#filter emptyLines + +#define MOZ_LANGPACK_CREATOR mozilla.org + +# If non-English locales wish to credit multiple contributors, uncomment this +# variable definition and use the format specified. +# #define MOZ_LANGPACK_CONTRIBUTORS Joe Solon Suzy Solon + +#unfilter emptyLines diff --git a/b2g/locales/filter.py b/b2g/locales/filter.py new file mode 100644 index 000000000..d49507adc --- /dev/null +++ b/b2g/locales/filter.py @@ -0,0 +1,15 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + + +def test(mod, path, entity = None): + import re + # ignore anything but b2g and specific overloads from dom and toolkit + if mod not in ("netwerk", "dom", "toolkit", "security/manager", + "devtools/shared", + "mobile", + "b2g"): + return "ignore" + + return "error" diff --git a/b2g/locales/jar.mn b/b2g/locales/jar.mn new file mode 100644 index 000000000..970261dbe --- /dev/null +++ b/b2g/locales/jar.mn @@ -0,0 +1,75 @@ +#filter substitution +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + + +@AB_CD@.jar: +% locale b2g-l10n @AB_CD@ %locale/@AB_CD@/b2g-l10n/ + +% 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) +#ifdef MOZ_GRAPHENE + locale/@AB_CD@/b2g-l10n/graphene.properties (%chrome/graphene.properties) +#endif + + +# overrides for toolkit l10n, also for en-US +relativesrcdir toolkit/locales: + locale/@AB_CD@/b2g-l10n/overrides/about.dtd (%chrome/global/about.dtd) + locale/@AB_CD@/b2g-l10n/overrides/aboutAbout.dtd (%chrome/global/aboutAbout.dtd) + locale/@AB_CD@/b2g-l10n/overrides/aboutRights.dtd (%chrome/global/aboutRights.dtd) + locale/@AB_CD@/b2g-l10n/overrides/commonDialogs.properties (%chrome/global/commonDialogs.properties) + locale/@AB_CD@/b2g-l10n/overrides/handling/handling.properties (%chrome/mozapps/handling/handling.properties) + locale/@AB_CD@/b2g-l10n/overrides/intl.properties (%chrome/global/intl.properties) + locale/@AB_CD@/b2g-l10n/overrides/intl.css (%chrome/global/intl.css) + locale/@AB_CD@/b2g-l10n/overrides/passwordmgr.properties (%chrome/passwordmgr/passwordmgr.properties) + locale/@AB_CD@/b2g-l10n/overrides/search/search.properties (%chrome/search/search.properties) + locale/@AB_CD@/b2g-l10n/overrides/update/updates.properties (%chrome/mozapps/update/updates.properties) +# about:support + locale/@AB_CD@/b2g-l10n/overrides/global/aboutSupport.dtd (%chrome/global/aboutSupport.dtd) + locale/@AB_CD@/b2g-l10n/overrides/global/aboutSupport.properties (%chrome/global/aboutSupport.properties) +#about:crashes + locale/@AB_CD@/b2g-l10n/overrides/crashreporter/crashes.dtd (%crashreporter/crashes.dtd) + locale/@AB_CD@/b2g-l10n/overrides/crashreporter/crashes.properties (%crashreporter/crashes.properties) +#about:mozilla + locale/@AB_CD@/b2g-l10n/overrides/global/mozilla.dtd (%chrome/global/mozilla.dtd) +#about:telemetry + locale/@AB_CD@/b2g-l10n/overrides/global/aboutTelemetry.dtd (%chrome/global/aboutTelemetry.dtd) + locale/@AB_CD@/b2g-l10n/overrides/global/aboutTelemetry.properties (%chrome/global/aboutTelemetry.properties) +#about:webrtc + locale/@AB_CD@/b2g-l10n/overrides/global/aboutWebrtc.properties (%chrome/global/aboutWebrtc.properties) + +% override chrome://global/locale/about.dtd chrome://b2g-l10n/locale/overrides/about.dtd +% override chrome://global/locale/aboutAbout.dtd chrome://b2g-l10n/locale/overrides/aboutAbout.dtd +% override chrome://global/locale/aboutRights.dtd chrome://b2g-l10n/locale/overrides/aboutRights.dtd +% override chrome://global/locale/commonDialogs.properties chrome://b2g-l10n/locale/overrides/commonDialogs.properties +% override chrome://mozapps/locale/handling/handling.properties chrome://b2g-l10n/locale/overrides/handling/handling.properties +% override chrome://global/locale/intl.properties chrome://b2g-l10n/locale/overrides/intl.properties +% override chrome://global/locale/intl.css chrome://b2g-l10n/locale/overrides/intl.css +% override chrome://passwordmgr/locale/passwordmgr.properties chrome://b2g-l10n/locale/overrides/passwordmgr/passwordmgr.properties +% override chrome://global/locale/search/search.properties chrome://b2g-l10n/locale/overrides/search/search.properties +% override chrome://mozapps/locale/update/updates.properties chrome://b2g-l10n/locale/overrides/update/updates.properties +% override chrome://global/locale/aboutSupport.dtd chrome://b2g-l10n/locale/overrides/global/aboutSupport.dtd +% override chrome://global/locale/aboutSupport.properties chrome://b2g-l10n/locale/overrides/global/aboutSupport.properties +% override chrome://global/locale/crashes.dtd chrome://b2g-l10n/locale/overrides/crashreporter/crashes.dtd +% override chrome://global/locale/crashes.properties chrome://b2g-l10n/locale/overrides/crashreporter/crashes.properties +% override chrome://global/locale/mozilla.dtd chrome://b2g-l10n/locale/overrides/global/mozilla.dtd +% override chrome://global/locale/aboutTelemetry.dtd chrome://b2g-l10n/locale/overrides/global/aboutTelemetry.dtd +% override chrome://global/locale/aboutTelemetry.properties chrome://b2g-l10n/locale/overrides/global/aboutTelemetry.properties +% override chrome://global/locale/aboutWebrtc.properties chrome://b2g-l10n/locale/overrides/global/aboutWebrtc.properties + +# overrides for dom l10n, also for en-US +relativesrcdir dom/locales: + locale/@AB_CD@/b2g-l10n/overrides/global.dtd (%chrome/global.dtd) + locale/@AB_CD@/b2g-l10n/overrides/AccessFu.properties (%chrome/accessibility/AccessFu.properties) + locale/@AB_CD@/b2g-l10n/overrides/dom/dom.properties (%chrome/dom/dom.properties) +#about:plugins + locale/@AB_CD@/b2g-l10n/overrides/plugins.properties (%chrome/plugins.properties) + +% override chrome://global/locale/global.dtd chrome://b2g-l10n/locale/overrides/global.dtd +% override chrome://global/locale/AccessFu.properties chrome://b2g-l10n/locale/overrides/AccessFu.properties +% override chrome://global/locale/dom/dom.properties chrome://b2g-l10n/locale/overrides/dom/dom.properties +% override chrome://global/locale/plugins.properties chrome://b2g-l10n/locale/overrides/plugins.properties diff --git a/b2g/locales/l10n.ini b/b2g/locales/l10n.ini new file mode 100644 index 000000000..b40159dfd --- /dev/null +++ b/b2g/locales/l10n.ini @@ -0,0 +1,13 @@ +; This Source Code Form is subject to the terms of the Mozilla Public +; License, v. 2.0. If a copy of the MPL was not distributed with this +; file, You can obtain one at http://mozilla.org/MPL/2.0/. + +[general] +depth = ../.. +all = b2g/locales/all-locales + +[compare] +dirs = b2g + +[includes] +toolkit = toolkit/locales/l10n.ini diff --git a/b2g/locales/moz.build b/b2g/locales/moz.build new file mode 100644 index 000000000..eb4454d28 --- /dev/null +++ b/b2g/locales/moz.build @@ -0,0 +1,7 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file -- cgit v1.2.3