diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build @@ -1,14 +1,11 @@ # -*- 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/. DIRS += [ - "doh-rollout", "formautofill", "screenshots", - "webcompat", - "report-site-issue", "pictureinpicture", ] diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -56,17 +56,16 @@ l10n-%: $(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*) $(NSINSTALL) -D $(DIST)/install @$(MAKE) -C ../../toolkit/locales l10n-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* ifneq (,$(wildcard ../extensions/formautofill/locales)) @$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$* endif - @$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) @$(MAKE) multilocale.txt-$* AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* chrome-%: AB_CD=$* chrome-%: IS_LANGUAGE_REPACK=1 @@ -77,17 +76,16 @@ chrome-%: @$(MAKE) -C ../../extensions/spellcheck/locales chrome AB_CD=$* ifneq (,$(wildcard ../extensions/formautofill/locales)) @$(MAKE) -C ../extensions/formautofill/locales chrome AB_CD=$* endif @$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$* @$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$* @$(MAKE) chrome AB_CD=$* @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$* - @$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$* package-win32-installer: $(SUBMAKEFILES) $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer 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 diff --git a/browser/locales/filter.py b/browser/locales/filter.py --- a/browser/locales/filter.py +++ b/browser/locales/filter.py @@ -15,17 +15,16 @@ def test(mod, path, entity=None): "toolkit", "security/manager", "devtools/client", "devtools/shared", "devtools/startup", "browser", "browser/extensions/formautofill", "browser/extensions/fxmonitor", - "browser/extensions/report-site-issue", "extensions/spellcheck", "other-licenses/branding/firefox", "browser/branding/official", "services/sync", ): return "ignore" if mod not in ("browser", "extensions/spellcheck"): # we only have exceptions for browser and extensions/spellcheck diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini --- a/browser/locales/l10n.ini +++ b/browser/locales/l10n.ini @@ -9,17 +9,16 @@ all = browser/locales/all-locales [compare] dirs = browser other-licenses/branding/firefox browser/branding/official devtools/client devtools/startup browser/extensions/formautofill browser/extensions/fxmonitor - browser/extensions/report-site-issue [includes] # non-central apps might want to use %(topsrcdir)s here, or other vars # RFE: that needs to be supported by compare-locales, too, though toolkit = toolkit/locales/l10n.ini services_sync = services/sync/locales/l10n.ini [extras] diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml --- a/browser/locales/l10n.toml +++ b/browser/locales/l10n.toml @@ -130,20 +130,16 @@ locales = [ reference = "browser/extensions/formautofill/locales/en-US/**" l10n = "{l}browser/extensions/formautofill/**" [[paths]] reference = "browser/extensions/fxmonitor/locales/en-US/**" l10n = "{l}browser/extensions/fxmonitor/**" [[paths]] - reference = "browser/extensions/report-site-issue/locales/en-US/**" - l10n = "{l}browser/extensions/report-site-issue/**" - -[[paths]] reference = "services/sync/locales/en-US/**" l10n = "{l}services/sync/**" [[includes]] path = "toolkit/locales/l10n.toml" [[includes]]