From c3d6022e0cde85b1398b08d8bf1d2afeffecc378 Mon Sep 17 00:00:00 2001 From: Axel Hecht Date: Fri, 30 Nov 2012 09:22:48 -0700 Subject: [PATCH] bug 796051, add chrome-% target to package b2g localized files, r=fabrice --HG-- extra : rebase_source : e07b9c96d598f9665e2b7392df40032ac503a06a --- b2g/locales/Makefile.in | 37 +++------------- b2g/locales/all-locales | 43 ------------------- b2g/locales/en-US/chrome/about.dtd | 22 ---------- b2g/locales/en-US/chrome/aboutCertError.dtd | 38 ---------------- b2g/locales/en-US/chrome/notification.dtd | 12 ------ .../chrome/overrides/passwordmgr.properties | 38 ---------------- b2g/locales/en-US/chrome/phishing.dtd | 29 ------------- b2g/locales/en-US/chrome/webapps.dtd | 11 ----- .../crashreporter/crashreporter-override.ini | 14 ------ b2g/locales/en-US/installer/setup.ini | 21 --------- b2g/locales/en-US/updater/updater.ini | 8 ---- b2g/locales/filter.py | 29 ++----------- b2g/locales/jar.mn | 15 +++---- b2g/locales/l10n.ini | 1 - 14 files changed, 14 insertions(+), 304 deletions(-) delete mode 100644 b2g/locales/en-US/chrome/about.dtd delete mode 100644 b2g/locales/en-US/chrome/aboutCertError.dtd delete mode 100644 b2g/locales/en-US/chrome/notification.dtd delete mode 100644 b2g/locales/en-US/chrome/overrides/passwordmgr.properties delete mode 100644 b2g/locales/en-US/chrome/phishing.dtd delete mode 100644 b2g/locales/en-US/chrome/webapps.dtd delete mode 100644 b2g/locales/en-US/crashreporter/crashreporter-override.ini delete mode 100644 b2g/locales/en-US/installer/setup.ini delete mode 100644 b2g/locales/en-US/updater/updater.ini diff --git a/b2g/locales/Makefile.in b/b2g/locales/Makefile.in index 9fdc5d7c21c1..eab29a27bf00 100644 --- a/b2g/locales/Makefile.in +++ b/b2g/locales/Makefile.in @@ -13,15 +13,6 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -ifdef LOCALE_MERGEDIR -vpath crashreporter%.ini $(LOCALE_MERGEDIR)/b2g/crashreporter -endif -vpath crashreporter%.ini $(LOCALE_SRCDIR)/crashreporter -ifdef LOCALE_MERGEDIR -vpath crashreporter%.ini @srcdir@/en-US/crashreporter -endif - - SUBMAKEFILES += \ $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \ $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \ @@ -85,12 +76,15 @@ 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 ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* - @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* @$(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) -C ../../toolkit/locales 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) @@ -118,7 +112,6 @@ clobber-zip: $(STAGEDIST)/chrome/$(AB_CD).manifest \ $(STAGEDIST)/defaults/pref/b2g-l10n.js $(STAGEDIST)/dictionaries \ - $(STAGEDIST)/hyphenation \ $(STAGEDIST)/defaults/profile \ $(STAGEDIST)/chrome/$(AB_CD) @@ -132,26 +125,6 @@ langpack: langpack-$(AB_CD) installers-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-% @echo "repackaging done" -ifdef MOZ_UPDATER -libs:: $(call MERGE_FILE,updater/updater.ini) -ifeq ($(OS_ARCH),WINNT) - cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \ - sed -e "s/^InfoText=/Info=/" -e "s/^TitleText=/Title=/" | \ - sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \ - $(FINAL_TARGET)/updater.ini -else - cat $< | \ - sed -e "s/^InfoText=/Info=/" -e "s/^TitleText=/Title=/" | \ - sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \ - $(FINAL_TARGET)/updater.ini -endif -endif - -ifdef MOZ_CRASHREPORTER -libs:: crashreporter-override.ini - $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET) -endif - # 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)) diff --git a/b2g/locales/all-locales b/b2g/locales/all-locales index 0b604a57353e..ebd7cda023d9 100644 --- a/b2g/locales/all-locales +++ b/b2g/locales/all-locales @@ -1,45 +1,2 @@ -ar -be -ca -cs -da -de -el -es-AR es-ES -et -eu -fa -fi -fr -fy-NL -ga-IE -gd -gl -he -hu -id -it -ja -ja-JP-mac -ko -lt -nb-NO -nl -nn-NO -pa-IN -pl pt-BR -pt-PT -ro -ru -sk -sl -sq -sr -th -tr -uk -vi -zh-CN -zh-TW diff --git a/b2g/locales/en-US/chrome/about.dtd b/b2g/locales/en-US/chrome/about.dtd deleted file mode 100644 index 4c7367f969ea..000000000000 --- a/b2g/locales/en-US/chrome/about.dtd +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/b2g/locales/en-US/chrome/aboutCertError.dtd b/b2g/locales/en-US/chrome/aboutCertError.dtd deleted file mode 100644 index cd6c6ba632f4..000000000000 --- a/b2g/locales/en-US/chrome/aboutCertError.dtd +++ /dev/null @@ -1,38 +0,0 @@ - - - - %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/notification.dtd b/b2g/locales/en-US/chrome/notification.dtd deleted file mode 100644 index d45e71b67234..000000000000 --- a/b2g/locales/en-US/chrome/notification.dtd +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/b2g/locales/en-US/chrome/overrides/passwordmgr.properties b/b2g/locales/en-US/chrome/overrides/passwordmgr.properties deleted file mode 100644 index c7195a9a07f7..000000000000 --- a/b2g/locales/en-US/chrome/overrides/passwordmgr.properties +++ /dev/null @@ -1,38 +0,0 @@ -# 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/. - -rememberValue = Use Password Manager to remember this value. -rememberPassword = Use Password Manager to remember this password. -savePasswordTitle = Confirm -# 1st string is product name, 2nd is the username for the login, 3rd is the -# login's hostname. Note that long usernames may be truncated. -saveLoginText = Do you want %1$S to remember the password for "%2$S" on %3$S? -# 1st string is product name, 2nd is the login's hostname -saveLoginTextNoUsername = Do you want %1$S to remember this password on %2$S? -notNowButtonText = &Not Now -notifyBarNotNowButtonText = Not Now -notifyBarNotNowButtonAccessKey = -neverForSiteButtonText = Ne&ver for This Site -notifyBarNeverForSiteButtonText = Never -notifyBarNeverForSiteButtonAccessKey = -rememberButtonText = &Remember -notifyBarRememberButtonText = Remember -notifyBarRememberButtonAccessKey = -passwordChangeTitle = Confirm Password Change -passwordChangeText = Would you like to change the stored password for %S? -passwordChangeTextNoUser = Would you like to change the stored password for this login? -notifyBarChangeButtonText = Change -notifyBarChangeButtonAccessKey = -notifyBarDontChangeButtonText = Don't Change -notifyBarDontChangeButtonAccessKey = -userSelectText = Please confirm which user you are changing the password for -hidePasswords=Hide Passwords -hidePasswordsAccessKey=P -showPasswords=Show Passwords -showPasswordsAccessKey=P -noMasterPasswordPrompt=Are you sure you wish to show your passwords? -removeAllPasswordsPrompt=Are you sure you wish to remove all passwords? -removeAllPasswordsTitle=Remove all passwords -loginsSpielAll=Passwords for the following sites are stored on your computer: -loginsSpielFiltered=The following passwords match your search: diff --git a/b2g/locales/en-US/chrome/phishing.dtd b/b2g/locales/en-US/chrome/phishing.dtd deleted file mode 100644 index b3fd118e12f5..000000000000 --- a/b2g/locales/en-US/chrome/phishing.dtd +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - has been reported as an attack page and has been blocked based on your security preferences."> -Attack pages try to install programs that steal private information, use your computer to attack others, or damage your system.

Some attack pages intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.

"> - - - -These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.

"> diff --git a/b2g/locales/en-US/chrome/webapps.dtd b/b2g/locales/en-US/chrome/webapps.dtd deleted file mode 100644 index 5e1556f98e64..000000000000 --- a/b2g/locales/en-US/chrome/webapps.dtd +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/b2g/locales/en-US/crashreporter/crashreporter-override.ini b/b2g/locales/en-US/crashreporter/crashreporter-override.ini deleted file mode 100644 index 674736a86cfe..000000000000 --- a/b2g/locales/en-US/crashreporter/crashreporter-override.ini +++ /dev/null @@ -1,14 +0,0 @@ -; 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/. - -# This file is in the UTF-8 encoding -[Strings] -# LOCALIZATION NOTE (CrashReporterProductErrorText2): %s is replaced with another string containing detailed information. -CrashReporterProductErrorText2=B2G has crashed. Unfortunately the crash reporter is unable to submit a crash report.\n\nDetails: %s -CrashReporterDescriptionText2=B2G has crashed. Your tabs will be listed on the B2G Start page when you restart.\n\nPlease help us fix the problem! -# LOCALIZATION NOTE (CheckSendReport): The %s is replaced with the vendor name. -CheckSendReport=Send %s a crash report -CheckIncludeURL=Include the page address -Quit2=Quit B2G -Restart=Restart B2G diff --git a/b2g/locales/en-US/installer/setup.ini b/b2g/locales/en-US/installer/setup.ini deleted file mode 100644 index c5b650af083a..000000000000 --- a/b2g/locales/en-US/installer/setup.ini +++ /dev/null @@ -1,21 +0,0 @@ -; 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/. - -; This file is in the UTF-8 encoding -[Strings] -AppShortName=%MOZ_APP_DISPLAYNAME% -AppLongName=Mozilla %MOZ_APP_DISPLAYNAME% -WindowCaption=Mozilla %MOZ_APP_DISPLAYNAME% Setup -InstallTo=Install %MOZ_APP_DISPLAYNAME% to -Install=Install -Cancel=Cancel -InstalledSuccessfully=Mozilla %MOZ_APP_DISPLAYNAME% has been installed successfully. -ExtractionError=Archive extraction error: -ThereWereErrors=There were errors during installation: -CreatingUserProfile=Creating user profile. Please wait... -UninstallCaption=Mozilla %MOZ_APP_DISPLAYNAME% Uninstall -FilesWillBeRemoved=All files will be removed from -AreYouSure=Are you sure? -InstallationNotFound=Mozilla %MOZ_APP_DISPLAYNAME% installation not found. -UninstalledSuccessfully=Mozilla %MOZ_APP_DISPLAYNAME% has been uninstalled successfully. diff --git a/b2g/locales/en-US/updater/updater.ini b/b2g/locales/en-US/updater/updater.ini deleted file mode 100644 index 40cec45ef6c9..000000000000 --- a/b2g/locales/en-US/updater/updater.ini +++ /dev/null @@ -1,8 +0,0 @@ -; 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/. - -; This file is in the UTF-8 encoding -[Strings] -TitleText=%MOZ_APP_DISPLAYNAME% Update -InfoText=%MOZ_APP_DISPLAYNAME% is installing your updates and will start in a few moments… diff --git a/b2g/locales/filter.py b/b2g/locales/filter.py index 3d734192bc86..05f7abcdbcfe 100644 --- a/b2g/locales/filter.py +++ b/b2g/locales/filter.py @@ -5,31 +5,10 @@ def test(mod, path, entity = None): import re - # ignore anything but b2g, which is our local repo checkout name + # ignore anything but b2g and specific overloads from dom and toolkit if mod not in ("netwerk", "dom", "toolkit", "security/manager", - "services/sync", "embedding/android", + "mobile", "b2g"): - return False + return "ignore" - # Ignore Lorentz strings, at least temporarily - if mod == "toolkit" and path == "chrome/mozapps/plugins/plugins.dtd": - if entity.startswith('reloadPlugin.'): return False - if entity.startswith('report.'): return False - - if mod != "b2g": - # we only have exceptions for b2g - return True - if not entity: - return not (re.match(r"b2g-l10n.js", path) or - re.match(r"defines.inc", path)) - if path == "defines.inc": - return entity != "MOZ_LANGPACK_CONTRIBUTORS" - - if path != "chrome/region.properties": - # only region.properties exceptions remain, compare all others - return True - - return not (re.match(r"browser\.search\.order\.[1-9]", entity) or - re.match(r"browser\.contentHandlers\.types\.[0-5]", entity) or - re.match(r"gecko\.handlerService\.schemes\.", entity) or - re.match(r"gecko\.handlerService\.defaultHandlersVersion", entity)) + return "error" diff --git a/b2g/locales/jar.mn b/b2g/locales/jar.mn index fabd584df2ac..210814cc445b 100644 --- a/b2g/locales/jar.mn +++ b/b2g/locales/jar.mn @@ -5,14 +5,9 @@ @AB_CD@.jar: -% locale browser @AB_CD@ %locale/@AB_CD@/browser/ - locale/@AB_CD@/browser/about.dtd (%chrome/about.dtd) - locale/@AB_CD@/browser/aboutCertError.dtd (%chrome/aboutCertError.dtd) - locale/@AB_CD@/browser/notification.dtd (%chrome/notification.dtd) - locale/@AB_CD@/browser/webapps.dtd (%chrome/webapps.dtd) - locale/@AB_CD@/browser/phishing.dtd (%chrome/phishing.dtd) +% locale b2g-l10n @AB_CD@ %locale/@AB_CD@/b2g-l10n/ -* locale/@AB_CD@/browser/netError.dtd (%chrome/overrides/netError.dtd) -% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd -* locale/@AB_CD@/browser/appstrings.properties (%chrome/overrides/appstrings.properties) -% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties +% override chrome://global/locale/netError.dtd chrome://b2g-l10n/locale/netError.dtd +% override chrome://global/locale/appstrings.properties chrome://b2g-l10n/locale/appstrings.properties +* locale/@AB_CD@/b2g-l10n/netError.dtd (%chrome/overrides/netError.dtd) +* locale/@AB_CD@/b2g-l10n/appstrings.properties (%chrome/overrides/appstrings.properties) diff --git a/b2g/locales/l10n.ini b/b2g/locales/l10n.ini index 3b829ac46d23..b40159dfdc01 100644 --- a/b2g/locales/l10n.ini +++ b/b2g/locales/l10n.ini @@ -11,4 +11,3 @@ dirs = b2g [includes] toolkit = toolkit/locales/l10n.ini -services_sync = services/sync/locales/l10n.ini