Merge branch 'master' of https://repo.palemoon.org/MoonchildProductions/GRE

202 files changed, 46 insertions, 58 deletions

diff --git a/Makefile.in b/Makefile.in
index aec100ea0..45f6a1566 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -306,7 +306,7 @@ uploadsymbols:
 
 .PHONY: update-packaging
 update-packaging:
-	$(MAKE) -C tools/update-packaging
+	$(MAKE) -C system/updater/package
 
 .PHONY: pretty-package
 pretty-package:
@@ -322,7 +322,7 @@ pretty-l10n-check:
 
 .PHONY: pretty-update-packaging
 pretty-update-packaging:
-	unset MOZ_SIGN_CMD && $(MAKE) -C tools/update-packaging MOZ_PKG_PRETTYNAMES=1
+	unset MOZ_SIGN_CMD && $(MAKE) -C system/updater/package MOZ_PKG_PRETTYNAMES=1
 
 .PHONY: pretty-installer
 pretty-installer:
diff --git a/components/downloads/jar.mn b/components/downloads/jar.mn
index e7974b707..29a3d0ee2 100644
--- a/components/downloads/jar.mn
+++ b/components/downloads/jar.mn
@@ -10,5 +10,3 @@ toolkit.jar:
   content/mozapps/downloads/DownloadProgressListener.js         (content/DownloadProgressListener.js)
   content/mozapps/downloads/downloads.css                       (content/downloads.css)
   content/mozapps/downloads/download.xml                        (content/download.xml)
-
-# NOTE: Locales are currently packaged from toolkit/locales/jar.mn
\ No newline at end of file
diff --git a/components/moz.build b/components/moz.build
index 4288f049e..14647be29 100644
--- a/components/moz.build
+++ b/components/moz.build
@@ -115,9 +115,6 @@ if CONFIG['MOZ_ENABLE_XREMOTE']:
 if CONFIG['MOZ_TOOLKIT_SEARCH']:
   DIRS += ['search']
 
-if CONFIG['MOZ_UPDATER']:
-  DIRS += ['update']
-
 DIRS += ['build']
 
 EXTRA_COMPONENTS += [
diff --git a/libs/bsdiff/moz.build b/libs/bsdiff/moz.build
index 72d3a9143..41beb5a63 100644
--- a/libs/bsdiff/moz.build
+++ b/libs/bsdiff/moz.build
@@ -23,7 +23,7 @@ if CONFIG['HOST_OS_ARCH'] == 'WINNT':
     USE_STATIC_LIBS = True
 
 LOCAL_INCLUDES += [
-    '/components/update/app',
+    '/system/updater/app',
 ]
 
 HOST_CXXFLAGS += CONFIG['MOZ_BZ2_CFLAGS']
diff --git a/moz.build b/moz.build
index 37bba2629..ef6bb9891 100644
--- a/moz.build
+++ b/moz.build
@@ -26,7 +26,7 @@ DIRS += [
 ]
 
 if not CONFIG['JS_STANDALONE']:
-  CONFIGURE_SUBST_FILES += ['tools/update-packaging/Makefile']
+  CONFIGURE_SUBST_FILES += ['system/updater/package/Makefile']
   CONFIGURE_DEFINE_FILES += ['mozilla-config.h']
   EXPORTS += ['!buildid.h', '!mozilla-config.h', '!source-repo.h']
   GENERATED_FILES += ['buildid.h', 'source-repo.h']
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index c4ee73345..808773512 100644
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -1135,7 +1135,7 @@ class Mar(MachCommandBase):
     @Command('mar', category='post-build',
         description='Create the mar file for the built product for distribution.')
     def mar(self):
-        return self._run_make(directory="./tools/update-packaging/", target='', ensure_exit_code=False)
+        return self._run_make(directory="./system/updater/package/", target='', ensure_exit_code=False)
 
 @CommandProvider
 class Install(MachCommandBase):
diff --git a/system/locales/Makefile.in b/system/locales/Makefile.in
new file mode 100644
index 000000000..e641d8f77
--- /dev/null
+++ b/system/locales/Makefile.in
@@ -0,0 +1,27 @@
+# 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/rules.mk
+
+libs-%:
+	@$(MAKE) -C ../../dom/locales/ libs AB_CD=$* XPI_NAME=locale-$*
+ifdef MOZ_DEVTOOLS_SERVER
+	@$(MAKE) -C ../../components/devtools/shared/locales/ libs AB_CD=$* XPI_NAME=locale-$*
+endif
+ifdef MOZ_DEVTOOLS
+	@$(MAKE) -C ../../components/devtools/client/locales AB_CD=$* XPI_NAME=locale-$*
+endif
+ifdef MOZ_SERVICES_SYNC
+	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
+endif
+	@$(MAKE) -C ../intl/hyphenation/locales AB_CD=$* XPI_NAME=locale-$*
+	@$(MAKE) -C ../intl/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
+	@$(MAKE) -C ../network/locales/ libs AB_CD=$* XPI_NAME=locale-$*
+	@$(MAKE) -C ../security/manager/locales/ libs AB_CD=$* XPI_NAME=locale-$*
+	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$*
+
+
+
+
+
diff --git a/toolkit/locales/all-locales b/system/locales/all-locales
index 16f4207e1..16f4207e1 100644
--- a/toolkit/locales/all-locales
+++ b/system/locales/all-locales
diff --git a/toolkit/locales/compare-locales.pl b/system/locales/compare-locales.pl
index fbc7ab5c2..fbc7ab5c2 100644
--- a/toolkit/locales/compare-locales.pl
+++ b/system/locales/compare-locales.pl
diff --git a/toolkit/locales/en-US/crashreporter/crashes.dtd b/system/locales/en-US/crashreporter/crashes.dtd
index 091467dcd..091467dcd 100644
--- a/toolkit/locales/en-US/crashreporter/crashes.dtd
+++ b/system/locales/en-US/crashreporter/crashes.dtd
diff --git a/toolkit/locales/en-US/crashreporter/crashes.properties b/system/locales/en-US/crashreporter/crashes.properties
index e57c3d3de..e57c3d3de 100644
--- a/toolkit/locales/en-US/crashreporter/crashes.properties
+++ b/system/locales/en-US/crashreporter/crashes.properties
diff --git a/toolkit/locales/en-US/crashreporter/crashreporter.ini b/system/locales/en-US/crashreporter/crashreporter.ini
index 1247d5033..1247d5033 100644
--- a/toolkit/locales/en-US/crashreporter/crashreporter.ini
+++ b/system/locales/en-US/crashreporter/crashreporter.ini
diff --git a/toolkit/locales/en-US/defines.inc b/system/locales/en-US/defines.inc
index f20fed768..f20fed768 100644
--- a/toolkit/locales/en-US/defines.inc
+++ b/system/locales/en-US/defines.inc
diff --git a/toolkit/locales/generic/chrome/global/brand.dtd b/system/locales/generic/chrome/global/brand.dtd
index 5a77944bb..5a77944bb 100644
--- a/toolkit/locales/generic/chrome/global/brand.dtd
+++ b/system/locales/generic/chrome/global/brand.dtd
diff --git a/toolkit/locales/generic/install.rdf b/system/locales/generic/install.rdf
index e6b82ac51..e6b82ac51 100644
--- a/toolkit/locales/generic/install.rdf
+++ b/system/locales/generic/install.rdf
diff --git a/toolkit/locales/jar.mn b/system/locales/jar.mn
index 7ba95cc00..580b70130 100644
--- a/toolkit/locales/jar.mn
+++ b/system/locales/jar.mn
@@ -114,9 +114,9 @@
   locale/@AB_CD@/mozapps/profile/createProfileWizard.dtd          (/components/profile/locale/createProfileWizard.dtd)
   locale/@AB_CD@/mozapps/profile/profileSelection.properties      (/components/profile/locale/profileSelection.properties)
   locale/@AB_CD@/mozapps/profile/profileSelection.dtd             (/components/profile/locale/profileSelection.dtd)
-  locale/@AB_CD@/mozapps/update/updates.dtd                       (/components/update/locale/updates.dtd)
-  locale/@AB_CD@/mozapps/update/updates.properties                (/components/update/locale/updates.properties)
-  locale/@AB_CD@/mozapps/update/history.dtd                       (/components/update/locale/history.dtd)
+  locale/@AB_CD@/mozapps/update/updates.dtd                       (/system/updater/locale/updates.dtd)
+  locale/@AB_CD@/mozapps/update/updates.properties                (/system/updater/locale/updates.properties)
+  locale/@AB_CD@/mozapps/update/history.dtd                       (/system/updater/locale/history.dtd)
   locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd           (/components/addons/locale/xpinstallConfirm.dtd)
   locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties    (/components/addons/locale/xpinstallConfirm.properties)
 
diff --git a/toolkit/locales/l10n.ini b/system/locales/l10n.ini
index 076ed499e..076ed499e 100644
--- a/toolkit/locales/l10n.ini
+++ b/system/locales/l10n.ini
diff --git a/toolkit/locales/l10n.mk b/system/locales/l10n.mk
index f1825438d..b7668645b 100644
--- a/toolkit/locales/l10n.mk
+++ b/system/locales/l10n.mk
@@ -126,7 +126,7 @@ endif
 	cd $(DIST)/l10n-stage; \
 	  $(MAKE_PACKAGE)
 ifdef MAKE_COMPLETE_MAR
-	$(MAKE) -C $(MOZDEPTH)/tools/update-packaging full-update AB_CD=$(AB_CD) \
+	$(MAKE) -C $(MOZDEPTH)/system/updater/package full-update AB_CD=$(AB_CD) \
 	  MOZ_PKG_PRETTYNAMES=$(MOZ_PKG_PRETTYNAMES) \
 	  PACKAGE_BASE_DIR='$(ABS_DIST)/l10n-stage'
 endif
@@ -146,8 +146,8 @@ repackage-zip-%: $(STAGEDIST)
 APP_DEFINES = $(firstword $(wildcard $(LOCALE_SRCDIR)/defines.inc) \
                           $(srcdir)/en-US/defines.inc)
 TK_DEFINES = $(firstword \
-   $(wildcard $(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc) \
-   $(MOZILLA_DIR)/toolkit/locales/en-US/defines.inc)
+   $(wildcard $(call EXPAND_LOCALE_SRCDIR,system/locales)/defines.inc) \
+   $(MOZILLA_DIR)/system/locales/en-US/defines.inc)
 
 # Dealing with app sub dirs: If DIST_SUBDIRS is defined it contains a
 # listing of app sub-dirs we should include in langpack xpis. If not,
@@ -162,7 +162,7 @@ langpack-%: libs-%
 	@echo 'Making langpack $(LANGPACK_FILE)'
 	$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)
 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \
-	  -DTK_DEFINES=$(TK_DEFINES) -DAPP_DEFINES=$(APP_DEFINES) $(MOZILLA_DIR)/toolkit/locales/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf)
+	  -DTK_DEFINES=$(TK_DEFINES) -DAPP_DEFINES=$(APP_DEFINES) $(MOZILLA_DIR)/system/locales/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf)
 	$(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) $(LANGPACK_FILE) install.rdf $(PKG_ZIP_DIRS) chrome.manifest)
 
 # This variable is to allow the wget-en-US target to know which ftp server to download from
@@ -195,7 +195,7 @@ endif
 endif
 
 generate-snippet-%:
-	$(PYTHON) $(MOZILLA_DIR)/tools/update-packaging/generatesnippet.py \
+	$(PYTHON) $(MOZILLA_DIR)/system/updater/package/generatesnippet.py \
           --mar-path=$(ABS_DIST)/update \
           --application-ini-file='$(STAGEDIST)'/application.ini \
           --locale=$* \
diff --git a/toolkit/locales/moz.build b/system/locales/moz.build
index 73050f141..73050f141 100644
--- a/toolkit/locales/moz.build
+++ b/system/locales/moz.build
diff --git a/system/moz.build b/system/moz.build
index 8c3dd57dd..17b43af8e 100644
--- a/system/moz.build
+++ b/system/moz.build
@@ -11,11 +11,15 @@ DIRS += [
   'image',
   'interface',
   'intl',
+  'locales',
   'network',
   'security',
   'themes',
 ]
 
+if CONFIG['MOZ_UPDATER']:
+  DIRS += ['updater']
+
 DIRS += ['runtime']
 
 FINAL_TARGET_PP_FILES += ['goanna.js']
\ No newline at end of file
diff --git a/system/toolkit.mozbuild b/system/toolkit.mozbuild
index 2f1a4f3ba..ff41f5dfb 100644
--- a/system/toolkit.mozbuild
+++ b/system/toolkit.mozbuild
@@ -20,7 +20,6 @@ DIRS += [
   '/modules',
   '/services',
   '/system',
-  '/toolkit',
 ]
 
 DIRS += [
diff --git a/components/update/app/Launchd.plist b/system/updater/app/Launchd.plist
index f0b5cef08..f0b5cef08 100644
--- a/components/update/app/Launchd.plist
+++ b/system/updater/app/Launchd.plist
diff --git a/components/update/app/Makefile.in b/system/updater/app/Makefile.in
index c1cfcead7..c1cfcead7 100644
--- a/components/update/app/Makefile.in
+++ b/system/updater/app/Makefile.in
diff --git a/components/update/app/archivereader.cpp b/system/updater/app/archivereader.cpp
index 90cf45c3d..90cf45c3d 100644
--- a/components/update/app/archivereader.cpp
+++ b/system/updater/app/archivereader.cpp
diff --git a/components/update/app/archivereader.h b/system/updater/app/archivereader.h
index a9d78aab1..a9d78aab1 100644
--- a/components/update/app/archivereader.h
+++ b/system/updater/app/archivereader.h
diff --git a/components/update/app/bspatch.cpp b/system/updater/app/bspatch.cpp
index e632fe3d3..e632fe3d3 100644
--- a/components/update/app/bspatch.cpp
+++ b/system/updater/app/bspatch.cpp
diff --git a/components/update/app/bspatch.h b/system/updater/app/bspatch.h
index c24c001cc..c24c001cc 100644
--- a/components/update/app/bspatch.h
+++ b/system/updater/app/bspatch.h
diff --git a/components/update/app/dep1.der b/system/updater/app/dep1.der
index 95b4ef38c..95b4ef38c 100644
--- a/components/update/app/dep1.der
+++ b/system/updater/app/dep1.der
diff --git a/components/update/app/dep2.der b/system/updater/app/dep2.der
index a460d6a16..a460d6a16 100644
--- a/components/update/app/dep2.der
+++ b/system/updater/app/dep2.der
diff --git a/components/update/app/gen_cert_header.py b/system/updater/app/gen_cert_header.py
index 7ecb15619..7ecb15619 100644
--- a/components/update/app/gen_cert_header.py
+++ b/system/updater/app/gen_cert_header.py
diff --git a/components/update/app/loaddlls.cpp b/system/updater/app/loaddlls.cpp
index b4291a5df..b4291a5df 100644
--- a/components/update/app/loaddlls.cpp
+++ b/system/updater/app/loaddlls.cpp
diff --git a/components/update/app/module.ver b/system/updater/app/module.ver
index 771416bb1..771416bb1 100644
--- a/components/update/app/module.ver
+++ b/system/updater/app/module.ver
diff --git a/components/update/app/moz.build b/system/updater/app/moz.build
index 40fae342f..ddfbfc35a 100644
--- a/components/update/app/moz.build
+++ b/system/updater/app/moz.build
@@ -71,7 +71,7 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-  '/components/update/lib',
+  '/system/updater/lib',
   '/xpcom/glue',
 ]
 
diff --git a/components/update/app/nightly_aurora_level3_primary.der b/system/updater/app/nightly_aurora_level3_primary.der
index b22124798..b22124798 100644
--- a/components/update/app/nightly_aurora_level3_primary.der
+++ b/system/updater/app/nightly_aurora_level3_primary.der
diff --git a/components/update/app/nightly_aurora_level3_secondary.der b/system/updater/app/nightly_aurora_level3_secondary.der
index 2dffbd02d..2dffbd02d 100644
--- a/components/update/app/nightly_aurora_level3_secondary.der
+++ b/system/updater/app/nightly_aurora_level3_secondary.der
diff --git a/components/update/app/progressui.h b/system/updater/app/progressui.h
index 6dc20e06b..6dc20e06b 100644
--- a/components/update/app/progressui.h
+++ b/system/updater/app/progressui.h
diff --git a/components/update/app/progressui_gtk.cpp b/system/updater/app/progressui_gtk.cpp
index 902bc5ac8..902bc5ac8 100644
--- a/components/update/app/progressui_gtk.cpp
+++ b/system/updater/app/progressui_gtk.cpp
diff --git a/components/update/app/progressui_null.cpp b/system/updater/app/progressui_null.cpp
index cb3ac6369..cb3ac6369 100644
--- a/components/update/app/progressui_null.cpp
+++ b/system/updater/app/progressui_null.cpp
diff --git a/components/update/app/progressui_win.cpp b/system/updater/app/progressui_win.cpp
index 89bd71e85..89bd71e85 100644
--- a/components/update/app/progressui_win.cpp
+++ b/system/updater/app/progressui_win.cpp
diff --git a/components/update/app/release_primary.der b/system/updater/app/release_primary.der
index 11417c35e..11417c35e 100644
--- a/components/update/app/release_primary.der
+++ b/system/updater/app/release_primary.der
diff --git a/components/update/app/release_secondary.der b/system/updater/app/release_secondary.der
index 16a7ef6d9..16a7ef6d9 100644
--- a/components/update/app/release_secondary.der
+++ b/system/updater/app/release_secondary.der
diff --git a/components/update/app/resource.h b/system/updater/app/resource.h
index 3cfa4efda..3cfa4efda 100644
--- a/components/update/app/resource.h
+++ b/system/updater/app/resource.h
diff --git a/components/update/app/updater.cpp b/system/updater/app/updater.cpp
index f31c16d45..f31c16d45 100644
--- a/components/update/app/updater.cpp
+++ b/system/updater/app/updater.cpp
diff --git a/components/update/app/updater.exe.comctl32.manifest b/system/updater/app/updater.exe.comctl32.manifest
index 6bb850199..6bb850199 100644
--- a/components/update/app/updater.exe.comctl32.manifest
+++ b/system/updater/app/updater.exe.comctl32.manifest
diff --git a/components/update/app/updater.exe.manifest b/system/updater/app/updater.exe.manifest
index 619b4abfe..619b4abfe 100644
--- a/components/update/app/updater.exe.manifest
+++ b/system/updater/app/updater.exe.manifest
diff --git a/components/update/app/updater.ico b/system/updater/app/updater.ico
index 48457029d..48457029d 100644
--- a/components/update/app/updater.ico
+++ b/system/updater/app/updater.ico
diff --git a/components/update/app/updater.png b/system/updater/app/updater.png
index 7b5e78907..7b5e78907 100644
--- a/components/update/app/updater.png
+++ b/system/updater/app/updater.png
diff --git a/components/update/app/updater.rc b/system/updater/app/updater.rc
index 7603eecb6..7603eecb6 100644
--- a/components/update/app/updater.rc
+++ b/system/updater/app/updater.rc
diff --git a/components/update/app/win_dirent.cpp b/system/updater/app/win_dirent.cpp
index b0807ba5e..b0807ba5e 100644
--- a/components/update/app/win_dirent.cpp
+++ b/system/updater/app/win_dirent.cpp
diff --git a/components/update/app/xpcshellCertificate.der b/system/updater/app/xpcshellCertificate.der
index 185b2dff4..185b2dff4 100644
--- a/components/update/app/xpcshellCertificate.der
+++ b/system/updater/app/xpcshellCertificate.der
diff --git a/components/update/content/history.js b/system/updater/content/history.js
index 809eee478..809eee478 100644
--- a/components/update/content/history.js
+++ b/system/updater/content/history.js
diff --git a/components/update/content/history.xul b/system/updater/content/history.xul
index 92a32b6ef..92a32b6ef 100644
--- a/components/update/content/history.xul
+++ b/system/updater/content/history.xul
diff --git a/components/update/content/updates.css b/system/updater/content/updates.css
index e83c3be03..e83c3be03 100644
--- a/components/update/content/updates.css
+++ b/system/updater/content/updates.css
diff --git a/components/update/content/updates.js b/system/updater/content/updates.js
index 3e05566f1..3e05566f1 100644
--- a/components/update/content/updates.js
+++ b/system/updater/content/updates.js
diff --git a/components/update/content/updates.xml b/system/updater/content/updates.xml
index 9e8d4e936..9e8d4e936 100644
--- a/components/update/content/updates.xml
+++ b/system/updater/content/updates.xml
diff --git a/components/update/content/updates.xul b/system/updater/content/updates.xul
index e4cdc7a49..e4cdc7a49 100644
--- a/components/update/content/updates.xul
+++ b/system/updater/content/updates.xul
diff --git a/components/update/jar.mn b/system/updater/jar.mn
index 9bb5d2d05..9bb5d2d05 100644
--- a/components/update/jar.mn
+++ b/system/updater/jar.mn
diff --git a/components/update/lib/certificatecheck.cpp b/system/updater/lib/certificatecheck.cpp
index afb2e7ee3..afb2e7ee3 100644
--- a/components/update/lib/certificatecheck.cpp
+++ b/system/updater/lib/certificatecheck.cpp
diff --git a/components/update/lib/certificatecheck.h b/system/updater/lib/certificatecheck.h
index 43a7c85b6..43a7c85b6 100644
--- a/components/update/lib/certificatecheck.h
+++ b/system/updater/lib/certificatecheck.h
diff --git a/components/update/lib/errors.h b/system/updater/lib/errors.h
index 846118d55..846118d55 100644
--- a/components/update/lib/errors.h
+++ b/system/updater/lib/errors.h
diff --git a/components/update/lib/moz.build b/system/updater/lib/moz.build
index 714472b7f..714472b7f 100644
--- a/components/update/lib/moz.build
+++ b/system/updater/lib/moz.build
diff --git a/components/update/lib/pathhash.cpp b/system/updater/lib/pathhash.cpp
index 89a004cde..89a004cde 100644
--- a/components/update/lib/pathhash.cpp
+++ b/system/updater/lib/pathhash.cpp
diff --git a/components/update/lib/pathhash.h b/system/updater/lib/pathhash.h
index a238317e1..a238317e1 100644
--- a/components/update/lib/pathhash.h
+++ b/system/updater/lib/pathhash.h
diff --git a/components/update/lib/readstrings.cpp b/system/updater/lib/readstrings.cpp
index 428c91c0b..428c91c0b 100644
--- a/components/update/lib/readstrings.cpp
+++ b/system/updater/lib/readstrings.cpp
diff --git a/components/update/lib/readstrings.h b/system/updater/lib/readstrings.h
index cd1909fc9..cd1909fc9 100644
--- a/components/update/lib/readstrings.h
+++ b/system/updater/lib/readstrings.h
diff --git a/components/update/lib/registrycertificates.cpp b/system/updater/lib/registrycertificates.cpp
index 1c9c44619..1c9c44619 100644
--- a/components/update/lib/registrycertificates.cpp
+++ b/system/updater/lib/registrycertificates.cpp
diff --git a/components/update/lib/registrycertificates.h b/system/updater/lib/registrycertificates.h
index 9f68d1a8d..9f68d1a8d 100644
--- a/components/update/lib/registrycertificates.h
+++ b/system/updater/lib/registrycertificates.h
diff --git a/components/update/lib/uachelper.cpp b/system/updater/lib/uachelper.cpp
index 11647aa72..11647aa72 100644
--- a/components/update/lib/uachelper.cpp
+++ b/system/updater/lib/uachelper.cpp
diff --git a/components/update/lib/uachelper.h b/system/updater/lib/uachelper.h
index 6481ff5b5..6481ff5b5 100644
--- a/components/update/lib/uachelper.h
+++ b/system/updater/lib/uachelper.h
diff --git a/components/update/lib/updatecommon.cpp b/system/updater/lib/updatecommon.cpp
index 17a57eae3..17a57eae3 100644
--- a/components/update/lib/updatecommon.cpp
+++ b/system/updater/lib/updatecommon.cpp
diff --git a/components/update/lib/updatecommon.h b/system/updater/lib/updatecommon.h
index 3055851d8..3055851d8 100644
--- a/components/update/lib/updatecommon.h
+++ b/system/updater/lib/updatecommon.h
diff --git a/components/update/lib/updatedefines.h b/system/updater/lib/updatedefines.h
index 0db182219..0db182219 100644
--- a/components/update/lib/updatedefines.h
+++ b/system/updater/lib/updatedefines.h
diff --git a/components/update/lib/updatehelper.cpp b/system/updater/lib/updatehelper.cpp
index afb89bacf..afb89bacf 100644
--- a/components/update/lib/updatehelper.cpp
+++ b/system/updater/lib/updatehelper.cpp
diff --git a/components/update/lib/updatehelper.h b/system/updater/lib/updatehelper.h
index 3f010df49..3f010df49 100644
--- a/components/update/lib/updatehelper.h
+++ b/system/updater/lib/updatehelper.h
diff --git a/components/update/lib/win_dirent.h b/system/updater/lib/win_dirent.h
index 28f5317ff..28f5317ff 100644
--- a/components/update/lib/win_dirent.h
+++ b/system/updater/lib/win_dirent.h
diff --git a/components/update/locale/history.dtd b/system/updater/locale/history.dtd
index 100509999..100509999 100644
--- a/components/update/locale/history.dtd
+++ b/system/updater/locale/history.dtd
diff --git a/components/update/locale/updates.dtd b/system/updater/locale/updates.dtd
index 1247776b4..1247776b4 100644
--- a/components/update/locale/updates.dtd
+++ b/system/updater/locale/updates.dtd
diff --git a/components/update/locale/updates.properties b/system/updater/locale/updates.properties
index dadf03c47..dadf03c47 100644
--- a/components/update/locale/updates.properties
+++ b/system/updater/locale/updates.properties
diff --git a/components/update/moz.build b/system/updater/moz.build
index cc374e360..cc374e360 100644
--- a/components/update/moz.build
+++ b/system/updater/moz.build
diff --git a/components/update/nsUpdateService.manifest b/system/updater/nsUpdateService.manifest
index 59dbf0b5a..59dbf0b5a 100644
--- a/components/update/nsUpdateService.manifest
+++ b/system/updater/nsUpdateService.manifest
diff --git a/tools/update-packaging/Makefile.in b/system/updater/package/Makefile.in
index 4788a5575..4788a5575 100644
--- a/tools/update-packaging/Makefile.in
+++ b/system/updater/package/Makefile.in
diff --git a/tools/update-packaging/README b/system/updater/package/README
index 7029ffb8e..7029ffb8e 100644
--- a/tools/update-packaging/README
+++ b/system/updater/package/README
diff --git a/tools/update-packaging/common.sh b/system/updater/package/common.sh
index 24f1ca6eb..24f1ca6eb 100755..100644
--- a/tools/update-packaging/common.sh
+++ b/system/updater/package/common.sh
diff --git a/tools/update-packaging/generatesnippet.py b/system/updater/package/generatesnippet.py
index 15b7edf58..15b7edf58 100644
--- a/tools/update-packaging/generatesnippet.py
+++ b/system/updater/package/generatesnippet.py
diff --git a/tools/update-packaging/make_full_update.sh b/system/updater/package/make_full_update.sh
index ba1404474..ba1404474 100755..100644
--- a/tools/update-packaging/make_full_update.sh
+++ b/system/updater/package/make_full_update.sh
diff --git a/tools/update-packaging/make_incremental_update.sh b/system/updater/package/make_incremental_update.sh
index 90372c017..90372c017 100755..100644
--- a/tools/update-packaging/make_incremental_update.sh
+++ b/system/updater/package/make_incremental_update.sh
diff --git a/tools/update-packaging/make_incremental_updates.py b/system/updater/package/make_incremental_updates.py
index d346ee2df..d346ee2df 100755..100644
--- a/tools/update-packaging/make_incremental_updates.py
+++ b/system/updater/package/make_incremental_updates.py
diff --git a/tools/update-packaging/moz.build b/system/updater/package/moz.build
index 83ed8d9d9..83ed8d9d9 100644
--- a/tools/update-packaging/moz.build
+++ b/system/updater/package/moz.build
diff --git a/tools/update-packaging/test/buildrefmars.sh b/system/updater/package/test/buildrefmars.sh
index fd2d5384d..fd2d5384d 100755..100644
--- a/tools/update-packaging/test/buildrefmars.sh
+++ b/system/updater/package/test/buildrefmars.sh
diff --git a/tools/update-packaging/test/catmanifest.sh b/system/updater/package/test/catmanifest.sh
index 354c3ff41..354c3ff41 100755..100644
--- a/tools/update-packaging/test/catmanifest.sh
+++ b/system/updater/package/test/catmanifest.sh
diff --git a/tools/update-packaging/test/common.sh b/system/updater/package/test/common.sh
index 7c133724e..7c133724e 100755..100644
--- a/tools/update-packaging/test/common.sh
+++ b/system/updater/package/test/common.sh
diff --git a/tools/update-packaging/test/diffmar.sh b/system/updater/package/test/diffmar.sh
index 771b6b0ce..771b6b0ce 100755..100644
--- a/tools/update-packaging/test/diffmar.sh
+++ b/system/updater/package/test/diffmar.sh
diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/diff-patch-larger-than-file.txt b/system/updater/package/test/from-mac/Contents/MacOS/diff-patch-larger-than-file.txt
index 8098d2585..8098d2585 100644
--- a/tools/update-packaging/test/from-mac/Contents/MacOS/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/from-mac/Contents/MacOS/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/force.txt b/system/updater/package/test/from-mac/Contents/MacOS/force.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/from-mac/Contents/MacOS/force.txt
+++ b/system/updater/package/test/from-mac/Contents/MacOS/force.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/removed.txt b/system/updater/package/test/from-mac/Contents/MacOS/removed.txt
index 2c3f0b340..2c3f0b340 100644
--- a/tools/update-packaging/test/from-mac/Contents/MacOS/removed.txt
+++ b/system/updater/package/test/from-mac/Contents/MacOS/removed.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/same.bin b/system/updater/package/test/from-mac/Contents/MacOS/same.bin
index a9ee7258c..a9ee7258c 100644
--- a/tools/update-packaging/test/from-mac/Contents/MacOS/same.bin
+++ b/system/updater/package/test/from-mac/Contents/MacOS/same.bin
diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/update.manifest b/system/updater/package/test/from-mac/Contents/MacOS/update.manifest
index d3e8ed851..d3e8ed851 100644
--- a/tools/update-packaging/test/from-mac/Contents/MacOS/update.manifest
+++ b/system/updater/package/test/from-mac/Contents/MacOS/update.manifest
diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt b/system/updater/package/test/from-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt
index 8098d2585..8098d2585 100644
--- a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/from-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/readme.txt b/system/updater/package/test/from-mac/Contents/MacOS/{foodir/readme.txt
index d7c40c63c..d7c40c63c 100644
--- a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/readme.txt
+++ b/system/updater/package/test/from-mac/Contents/MacOS/{foodir/readme.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/removed.txt b/system/updater/package/test/from-mac/Contents/MacOS/{foodir/removed.txt
index 2c3f0b340..2c3f0b340 100644
--- a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/removed.txt
+++ b/system/updater/package/test/from-mac/Contents/MacOS/{foodir/removed.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/same.bin b/system/updater/package/test/from-mac/Contents/MacOS/{foodir/same.bin
index a9ee7258c..a9ee7258c 100644
--- a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/same.bin
+++ b/system/updater/package/test/from-mac/Contents/MacOS/{foodir/same.bin
diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/same.txt b/system/updater/package/test/from-mac/Contents/MacOS/{foodir/same.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/same.txt
+++ b/system/updater/package/test/from-mac/Contents/MacOS/{foodir/same.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/update.manifest b/system/updater/package/test/from-mac/Contents/MacOS/{foodir/update.manifest
index d3e8ed851..d3e8ed851 100644
--- a/tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/update.manifest
+++ b/system/updater/package/test/from-mac/Contents/MacOS/{foodir/update.manifest
diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/application.ini b/system/updater/package/test/from-mac/Contents/Resources/application.ini
index 942e91a16..942e91a16 100644
--- a/tools/update-packaging/test/from-mac/Contents/Resources/application.ini
+++ b/system/updater/package/test/from-mac/Contents/Resources/application.ini
diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt b/system/updater/package/test/from-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt
index 8098d2585..8098d2585 100644
--- a/tools/update-packaging/test/from-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/from-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt b/system/updater/package/test/from-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt
index 8098d2585..8098d2585 100644
--- a/tools/update-packaging/test/from-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/from-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/precomplete b/system/updater/package/test/from-mac/Contents/Resources/precomplete
index 2d9068d37..2d9068d37 100644
--- a/tools/update-packaging/test/from-mac/Contents/Resources/precomplete
+++ b/system/updater/package/test/from-mac/Contents/Resources/precomplete
diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/readme.txt b/system/updater/package/test/from-mac/Contents/Resources/readme.txt
index b1a96f1fe..b1a96f1fe 100644
--- a/tools/update-packaging/test/from-mac/Contents/Resources/readme.txt
+++ b/system/updater/package/test/from-mac/Contents/Resources/readme.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/removed-files b/system/updater/package/test/from-mac/Contents/Resources/removed-files
index 5bbdac6f6..5bbdac6f6 100644
--- a/tools/update-packaging/test/from-mac/Contents/Resources/removed-files
+++ b/system/updater/package/test/from-mac/Contents/Resources/removed-files
diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/removed.txt b/system/updater/package/test/from-mac/Contents/Resources/removed.txt
index 2c3f0b340..2c3f0b340 100644
--- a/tools/update-packaging/test/from-mac/Contents/Resources/removed.txt
+++ b/system/updater/package/test/from-mac/Contents/Resources/removed.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/same.txt b/system/updater/package/test/from-mac/Contents/Resources/same.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/from-mac/Contents/Resources/same.txt
+++ b/system/updater/package/test/from-mac/Contents/Resources/same.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt b/system/updater/package/test/from-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt
index 8098d2585..8098d2585 100644
--- a/tools/update-packaging/test/from-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/from-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/update-settings.ini b/system/updater/package/test/from-mac/Contents/Resources/update-settings.ini
index 5fa6a9909..5fa6a9909 100644
--- a/tools/update-packaging/test/from-mac/Contents/Resources/update-settings.ini
+++ b/system/updater/package/test/from-mac/Contents/Resources/update-settings.ini
diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/{foodir/channel-prefs.js b/system/updater/package/test/from-mac/Contents/Resources/{foodir/channel-prefs.js
index 5fa6a9909..5fa6a9909 100644
--- a/tools/update-packaging/test/from-mac/Contents/Resources/{foodir/channel-prefs.js
+++ b/system/updater/package/test/from-mac/Contents/Resources/{foodir/channel-prefs.js
diff --git a/tools/update-packaging/test/from-mac/Contents/Resources/{foodir/force.txt b/system/updater/package/test/from-mac/Contents/Resources/{foodir/force.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/from-mac/Contents/Resources/{foodir/force.txt
+++ b/system/updater/package/test/from-mac/Contents/Resources/{foodir/force.txt
diff --git a/tools/update-packaging/test/from/application.ini b/system/updater/package/test/from/application.ini
index 942e91a16..942e91a16 100644
--- a/tools/update-packaging/test/from/application.ini
+++ b/system/updater/package/test/from/application.ini
diff --git a/tools/update-packaging/test/from/diff-patch-larger-than-file.txt b/system/updater/package/test/from/diff-patch-larger-than-file.txt
index 8098d2585..8098d2585 100644
--- a/tools/update-packaging/test/from/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/from/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/from/distribution/extensions/diff/diff-patch-larger-than-file.txt b/system/updater/package/test/from/distribution/extensions/diff/diff-patch-larger-than-file.txt
index 8098d2585..8098d2585 100644
--- a/tools/update-packaging/test/from/distribution/extensions/diff/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/from/distribution/extensions/diff/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/from/extensions/diff/diff-patch-larger-than-file.txt b/system/updater/package/test/from/extensions/diff/diff-patch-larger-than-file.txt
index 8098d2585..8098d2585 100644
--- a/tools/update-packaging/test/from/extensions/diff/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/from/extensions/diff/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/from/force.txt b/system/updater/package/test/from/force.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/from/force.txt
+++ b/system/updater/package/test/from/force.txt
diff --git a/tools/update-packaging/test/from/precomplete b/system/updater/package/test/from/precomplete
index e27f4fc31..e27f4fc31 100644
--- a/tools/update-packaging/test/from/precomplete
+++ b/system/updater/package/test/from/precomplete
diff --git a/tools/update-packaging/test/from/readme.txt b/system/updater/package/test/from/readme.txt
index b1a96f1fe..b1a96f1fe 100644
--- a/tools/update-packaging/test/from/readme.txt
+++ b/system/updater/package/test/from/readme.txt
diff --git a/tools/update-packaging/test/from/removed-files b/system/updater/package/test/from/removed-files
index 73b348d9c..73b348d9c 100644
--- a/tools/update-packaging/test/from/removed-files
+++ b/system/updater/package/test/from/removed-files
diff --git a/tools/update-packaging/test/from/removed.txt b/system/updater/package/test/from/removed.txt
index 2c3f0b340..2c3f0b340 100644
--- a/tools/update-packaging/test/from/removed.txt
+++ b/system/updater/package/test/from/removed.txt
diff --git a/tools/update-packaging/test/from/same.bin b/system/updater/package/test/from/same.bin
index a9ee7258c..a9ee7258c 100644
--- a/tools/update-packaging/test/from/same.bin
+++ b/system/updater/package/test/from/same.bin
diff --git a/tools/update-packaging/test/from/same.txt b/system/updater/package/test/from/same.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/from/same.txt
+++ b/system/updater/package/test/from/same.txt
diff --git a/tools/update-packaging/test/from/searchplugins/diff/diff-patch-larger-than-file.txt b/system/updater/package/test/from/searchplugins/diff/diff-patch-larger-than-file.txt
index 8098d2585..8098d2585 100644
--- a/tools/update-packaging/test/from/searchplugins/diff/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/from/searchplugins/diff/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/from/update-settings.ini b/system/updater/package/test/from/update-settings.ini
index 5fa6a9909..5fa6a9909 100644
--- a/tools/update-packaging/test/from/update-settings.ini
+++ b/system/updater/package/test/from/update-settings.ini
diff --git a/tools/update-packaging/test/from/update.manifest b/system/updater/package/test/from/update.manifest
index d3e8ed851..d3e8ed851 100644
--- a/tools/update-packaging/test/from/update.manifest
+++ b/system/updater/package/test/from/update.manifest
diff --git a/tools/update-packaging/test/from/{foodir/channel-prefs.js b/system/updater/package/test/from/{foodir/channel-prefs.js
index 5fa6a9909..5fa6a9909 100644
--- a/tools/update-packaging/test/from/{foodir/channel-prefs.js
+++ b/system/updater/package/test/from/{foodir/channel-prefs.js
diff --git a/tools/update-packaging/test/from/{foodir/diff-patch-larger-than-file.txt b/system/updater/package/test/from/{foodir/diff-patch-larger-than-file.txt
index 8098d2585..8098d2585 100644
--- a/tools/update-packaging/test/from/{foodir/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/from/{foodir/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/from/{foodir/force.txt b/system/updater/package/test/from/{foodir/force.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/from/{foodir/force.txt
+++ b/system/updater/package/test/from/{foodir/force.txt
diff --git a/tools/update-packaging/test/from/{foodir/readme.txt b/system/updater/package/test/from/{foodir/readme.txt
index d7c40c63c..d7c40c63c 100644
--- a/tools/update-packaging/test/from/{foodir/readme.txt
+++ b/system/updater/package/test/from/{foodir/readme.txt
diff --git a/tools/update-packaging/test/from/{foodir/removed.txt b/system/updater/package/test/from/{foodir/removed.txt
index 2c3f0b340..2c3f0b340 100644
--- a/tools/update-packaging/test/from/{foodir/removed.txt
+++ b/system/updater/package/test/from/{foodir/removed.txt
diff --git a/tools/update-packaging/test/from/{foodir/same.bin b/system/updater/package/test/from/{foodir/same.bin
index a9ee7258c..a9ee7258c 100644
--- a/tools/update-packaging/test/from/{foodir/same.bin
+++ b/system/updater/package/test/from/{foodir/same.bin
diff --git a/tools/update-packaging/test/from/{foodir/same.txt b/system/updater/package/test/from/{foodir/same.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/from/{foodir/same.txt
+++ b/system/updater/package/test/from/{foodir/same.txt
diff --git a/tools/update-packaging/test/from/{foodir/update.manifest b/system/updater/package/test/from/{foodir/update.manifest
index d3e8ed851..d3e8ed851 100644
--- a/tools/update-packaging/test/from/{foodir/update.manifest
+++ b/system/updater/package/test/from/{foodir/update.manifest
diff --git a/tools/update-packaging/test/make_full_update.sh b/system/updater/package/test/make_full_update.sh
index f2907da9e..f2907da9e 100755..100644
--- a/tools/update-packaging/test/make_full_update.sh
+++ b/system/updater/package/test/make_full_update.sh
diff --git a/tools/update-packaging/test/runtests.sh b/system/updater/package/test/runtests.sh
index c66e54eaa..c66e54eaa 100755..100644
--- a/tools/update-packaging/test/runtests.sh
+++ b/system/updater/package/test/runtests.sh
diff --git a/tools/update-packaging/test/testpatchfile.txt b/system/updater/package/test/testpatchfile.txt
index a19c831eb..a19c831eb 100644
--- a/tools/update-packaging/test/testpatchfile.txt
+++ b/system/updater/package/test/testpatchfile.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/addFeedPrefs.js b/system/updater/package/test/to-mac/Contents/MacOS/addFeedPrefs.js
index 3b2aed8e0..3b2aed8e0 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/addFeedPrefs.js
+++ b/system/updater/package/test/to-mac/Contents/MacOS/addFeedPrefs.js
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/added.txt b/system/updater/package/test/to-mac/Contents/MacOS/added.txt
index b242c3606..b242c3606 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/added.txt
+++ b/system/updater/package/test/to-mac/Contents/MacOS/added.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.bin b/system/updater/package/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.bin
index a9ee7258c..a9ee7258c 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.bin
+++ b/system/updater/package/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.bin
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.txt b/system/updater/package/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.txt
index a61ffbb5e..a61ffbb5e 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/to-mac/Contents/MacOS/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/force.txt b/system/updater/package/test/to-mac/Contents/MacOS/force.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/force.txt
+++ b/system/updater/package/test/to-mac/Contents/MacOS/force.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/same.bin b/system/updater/package/test/to-mac/Contents/MacOS/same.bin
index a9ee7258c..a9ee7258c 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/same.bin
+++ b/system/updater/package/test/to-mac/Contents/MacOS/same.bin
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/update.manifest b/system/updater/package/test/to-mac/Contents/MacOS/update.manifest
index 73364fdca..73364fdca 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/update.manifest
+++ b/system/updater/package/test/to-mac/Contents/MacOS/update.manifest
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/added.txt b/system/updater/package/test/to-mac/Contents/MacOS/{foodir/added.txt
index b242c3606..b242c3606 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/added.txt
+++ b/system/updater/package/test/to-mac/Contents/MacOS/{foodir/added.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt b/system/updater/package/test/to-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt
index a61ffbb5e..a61ffbb5e 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/to-mac/Contents/MacOS/{foodir/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/readme.txt b/system/updater/package/test/to-mac/Contents/MacOS/{foodir/readme.txt
index b5f7004cc..b5f7004cc 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/readme.txt
+++ b/system/updater/package/test/to-mac/Contents/MacOS/{foodir/readme.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/same.bin b/system/updater/package/test/to-mac/Contents/MacOS/{foodir/same.bin
index a9ee7258c..a9ee7258c 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/same.bin
+++ b/system/updater/package/test/to-mac/Contents/MacOS/{foodir/same.bin
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/same.txt b/system/updater/package/test/to-mac/Contents/MacOS/{foodir/same.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/same.txt
+++ b/system/updater/package/test/to-mac/Contents/MacOS/{foodir/same.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/update.manifest b/system/updater/package/test/to-mac/Contents/MacOS/{foodir/update.manifest
index 73364fdca..73364fdca 100644
--- a/tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/update.manifest
+++ b/system/updater/package/test/to-mac/Contents/MacOS/{foodir/update.manifest
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/application.ini b/system/updater/package/test/to-mac/Contents/Resources/application.ini
index 7bdc78819..7bdc78819 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/application.ini
+++ b/system/updater/package/test/to-mac/Contents/Resources/application.ini
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/added/file.txt b/system/updater/package/test/to-mac/Contents/Resources/distribution/extensions/added/file.txt
index 4bbc6747e..4bbc6747e 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/added/file.txt
+++ b/system/updater/package/test/to-mac/Contents/Resources/distribution/extensions/added/file.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt b/system/updater/package/test/to-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt
index b779d9648..b779d9648 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/to-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/extensions/added/file.txt b/system/updater/package/test/to-mac/Contents/Resources/extensions/added/file.txt
index 4bbc6747e..4bbc6747e 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/extensions/added/file.txt
+++ b/system/updater/package/test/to-mac/Contents/Resources/extensions/added/file.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt b/system/updater/package/test/to-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt
index b779d9648..b779d9648 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/to-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/precomplete b/system/updater/package/test/to-mac/Contents/Resources/precomplete
index 7af8bfd76..7af8bfd76 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/precomplete
+++ b/system/updater/package/test/to-mac/Contents/Resources/precomplete
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/readme.txt b/system/updater/package/test/to-mac/Contents/Resources/readme.txt
index b5f7004cc..b5f7004cc 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/readme.txt
+++ b/system/updater/package/test/to-mac/Contents/Resources/readme.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/removed-files b/system/updater/package/test/to-mac/Contents/Resources/removed-files
index a756cc560..a756cc560 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/removed-files
+++ b/system/updater/package/test/to-mac/Contents/Resources/removed-files
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/same.txt b/system/updater/package/test/to-mac/Contents/Resources/same.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/same.txt
+++ b/system/updater/package/test/to-mac/Contents/Resources/same.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/added/file.txt b/system/updater/package/test/to-mac/Contents/Resources/searchplugins/added/file.txt
index 4bbc6747e..4bbc6747e 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/added/file.txt
+++ b/system/updater/package/test/to-mac/Contents/Resources/searchplugins/added/file.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt b/system/updater/package/test/to-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt
index b779d9648..b779d9648 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/to-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/update-settings.ini b/system/updater/package/test/to-mac/Contents/Resources/update-settings.ini
index 5fa6a9909..5fa6a9909 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/update-settings.ini
+++ b/system/updater/package/test/to-mac/Contents/Resources/update-settings.ini
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/{foodir/channel-prefs.js b/system/updater/package/test/to-mac/Contents/Resources/{foodir/channel-prefs.js
index d6ada4591..d6ada4591 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/{foodir/channel-prefs.js
+++ b/system/updater/package/test/to-mac/Contents/Resources/{foodir/channel-prefs.js
diff --git a/tools/update-packaging/test/to-mac/Contents/Resources/{foodir/force.txt b/system/updater/package/test/to-mac/Contents/Resources/{foodir/force.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/to-mac/Contents/Resources/{foodir/force.txt
+++ b/system/updater/package/test/to-mac/Contents/Resources/{foodir/force.txt
diff --git a/tools/update-packaging/test/to/addFeedPrefs.js b/system/updater/package/test/to/addFeedPrefs.js
index 3b2aed8e0..3b2aed8e0 100644
--- a/tools/update-packaging/test/to/addFeedPrefs.js
+++ b/system/updater/package/test/to/addFeedPrefs.js
diff --git a/tools/update-packaging/test/to/added.txt b/system/updater/package/test/to/added.txt
index b242c3606..b242c3606 100644
--- a/tools/update-packaging/test/to/added.txt
+++ b/system/updater/package/test/to/added.txt
diff --git a/tools/update-packaging/test/to/application.ini b/system/updater/package/test/to/application.ini
index 7bdc78819..7bdc78819 100644
--- a/tools/update-packaging/test/to/application.ini
+++ b/system/updater/package/test/to/application.ini
diff --git a/tools/update-packaging/test/to/diff-patch-larger-than-file.bin b/system/updater/package/test/to/diff-patch-larger-than-file.bin
index a9ee7258c..a9ee7258c 100644
--- a/tools/update-packaging/test/to/diff-patch-larger-than-file.bin
+++ b/system/updater/package/test/to/diff-patch-larger-than-file.bin
diff --git a/tools/update-packaging/test/to/diff-patch-larger-than-file.txt b/system/updater/package/test/to/diff-patch-larger-than-file.txt
index a61ffbb5e..a61ffbb5e 100644
--- a/tools/update-packaging/test/to/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/to/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/to/distribution/extensions/added/file.txt b/system/updater/package/test/to/distribution/extensions/added/file.txt
index 4bbc6747e..4bbc6747e 100644
--- a/tools/update-packaging/test/to/distribution/extensions/added/file.txt
+++ b/system/updater/package/test/to/distribution/extensions/added/file.txt
diff --git a/tools/update-packaging/test/to/distribution/extensions/diff/diff-patch-larger-than-file.txt b/system/updater/package/test/to/distribution/extensions/diff/diff-patch-larger-than-file.txt
index b779d9648..b779d9648 100644
--- a/tools/update-packaging/test/to/distribution/extensions/diff/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/to/distribution/extensions/diff/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/to/extensions/added/file.txt b/system/updater/package/test/to/extensions/added/file.txt
index 4bbc6747e..4bbc6747e 100644
--- a/tools/update-packaging/test/to/extensions/added/file.txt
+++ b/system/updater/package/test/to/extensions/added/file.txt
diff --git a/tools/update-packaging/test/to/extensions/diff/diff-patch-larger-than-file.txt b/system/updater/package/test/to/extensions/diff/diff-patch-larger-than-file.txt
index b779d9648..b779d9648 100644
--- a/tools/update-packaging/test/to/extensions/diff/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/to/extensions/diff/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/to/force.txt b/system/updater/package/test/to/force.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/to/force.txt
+++ b/system/updater/package/test/to/force.txt
diff --git a/tools/update-packaging/test/to/precomplete b/system/updater/package/test/to/precomplete
index c2700dd97..c2700dd97 100644
--- a/tools/update-packaging/test/to/precomplete
+++ b/system/updater/package/test/to/precomplete
diff --git a/tools/update-packaging/test/to/readme.txt b/system/updater/package/test/to/readme.txt
index b5f7004cc..b5f7004cc 100644
--- a/tools/update-packaging/test/to/readme.txt
+++ b/system/updater/package/test/to/readme.txt
diff --git a/tools/update-packaging/test/to/removed-files b/system/updater/package/test/to/removed-files
index 4fdfff7fd..4fdfff7fd 100644
--- a/tools/update-packaging/test/to/removed-files
+++ b/system/updater/package/test/to/removed-files
diff --git a/tools/update-packaging/test/to/same.bin b/system/updater/package/test/to/same.bin
index a9ee7258c..a9ee7258c 100644
--- a/tools/update-packaging/test/to/same.bin
+++ b/system/updater/package/test/to/same.bin
diff --git a/tools/update-packaging/test/to/same.txt b/system/updater/package/test/to/same.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/to/same.txt
+++ b/system/updater/package/test/to/same.txt
diff --git a/tools/update-packaging/test/to/searchplugins/added/file.txt b/system/updater/package/test/to/searchplugins/added/file.txt
index 4bbc6747e..4bbc6747e 100644
--- a/tools/update-packaging/test/to/searchplugins/added/file.txt
+++ b/system/updater/package/test/to/searchplugins/added/file.txt
diff --git a/tools/update-packaging/test/to/searchplugins/diff/diff-patch-larger-than-file.txt b/system/updater/package/test/to/searchplugins/diff/diff-patch-larger-than-file.txt
index b779d9648..b779d9648 100644
--- a/tools/update-packaging/test/to/searchplugins/diff/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/to/searchplugins/diff/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/to/update-settings.ini b/system/updater/package/test/to/update-settings.ini
index 5fa6a9909..5fa6a9909 100644
--- a/tools/update-packaging/test/to/update-settings.ini
+++ b/system/updater/package/test/to/update-settings.ini
diff --git a/tools/update-packaging/test/to/update.manifest b/system/updater/package/test/to/update.manifest
index 73364fdca..73364fdca 100644
--- a/tools/update-packaging/test/to/update.manifest
+++ b/system/updater/package/test/to/update.manifest
diff --git a/tools/update-packaging/test/to/{foodir/added.txt b/system/updater/package/test/to/{foodir/added.txt
index b242c3606..b242c3606 100644
--- a/tools/update-packaging/test/to/{foodir/added.txt
+++ b/system/updater/package/test/to/{foodir/added.txt
diff --git a/tools/update-packaging/test/to/{foodir/channel-prefs.js b/system/updater/package/test/to/{foodir/channel-prefs.js
index 5fa6a9909..5fa6a9909 100644
--- a/tools/update-packaging/test/to/{foodir/channel-prefs.js
+++ b/system/updater/package/test/to/{foodir/channel-prefs.js
diff --git a/tools/update-packaging/test/to/{foodir/diff-patch-larger-than-file.txt b/system/updater/package/test/to/{foodir/diff-patch-larger-than-file.txt
index a61ffbb5e..a61ffbb5e 100644
--- a/tools/update-packaging/test/to/{foodir/diff-patch-larger-than-file.txt
+++ b/system/updater/package/test/to/{foodir/diff-patch-larger-than-file.txt
diff --git a/tools/update-packaging/test/to/{foodir/force.txt b/system/updater/package/test/to/{foodir/force.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/to/{foodir/force.txt
+++ b/system/updater/package/test/to/{foodir/force.txt
diff --git a/tools/update-packaging/test/to/{foodir/readme.txt b/system/updater/package/test/to/{foodir/readme.txt
index b5f7004cc..b5f7004cc 100644
--- a/tools/update-packaging/test/to/{foodir/readme.txt
+++ b/system/updater/package/test/to/{foodir/readme.txt
diff --git a/tools/update-packaging/test/to/{foodir/same.bin b/system/updater/package/test/to/{foodir/same.bin
index a9ee7258c..a9ee7258c 100644
--- a/tools/update-packaging/test/to/{foodir/same.bin
+++ b/system/updater/package/test/to/{foodir/same.bin
diff --git a/tools/update-packaging/test/to/{foodir/same.txt b/system/updater/package/test/to/{foodir/same.txt
index 0ed0d5012..0ed0d5012 100644
--- a/tools/update-packaging/test/to/{foodir/same.txt
+++ b/system/updater/package/test/to/{foodir/same.txt
diff --git a/tools/update-packaging/test/to/{foodir/update.manifest b/system/updater/package/test/to/{foodir/update.manifest
index 73364fdca..73364fdca 100644
--- a/tools/update-packaging/test/to/{foodir/update.manifest
+++ b/system/updater/package/test/to/{foodir/update.manifest
diff --git a/tools/update-packaging/test_make_incremental_updates.py b/system/updater/package/test_make_incremental_updates.py
index 016823dee..016823dee 100644
--- a/tools/update-packaging/test_make_incremental_updates.py
+++ b/system/updater/package/test_make_incremental_updates.py
diff --git a/tools/update-packaging/unwrap_full_update.pl b/system/updater/package/unwrap_full_update.pl
index ead1157db..ead1157db 100755..100644
--- a/tools/update-packaging/unwrap_full_update.pl
+++ b/system/updater/package/unwrap_full_update.pl
diff --git a/components/update/public/nsIUpdateService.idl b/system/updater/public/nsIUpdateService.idl
index 817df5a67..817df5a67 100644
--- a/components/update/public/nsIUpdateService.idl
+++ b/system/updater/public/nsIUpdateService.idl
diff --git a/components/update/src/nsUpdateService.js b/system/updater/src/nsUpdateService.js
index 9bea453db..9bea453db 100644
--- a/components/update/src/nsUpdateService.js
+++ b/system/updater/src/nsUpdateService.js
diff --git a/components/update/src/nsUpdateServiceStub.js b/system/updater/src/nsUpdateServiceStub.js
index dbb841b84..dbb841b84 100644
--- a/components/update/src/nsUpdateServiceStub.js
+++ b/system/updater/src/nsUpdateServiceStub.js
diff --git a/taskcluster/ci/l10n/kind.yml b/taskcluster/ci/l10n/kind.yml
index dfd011e9a..e3408e715 100644
--- a/taskcluster/ci/l10n/kind.yml
+++ b/taskcluster/ci/l10n/kind.yml
@@ -40,7 +40,7 @@ job-defaults:
             - testing/mozharness/configs/single_locale/**
             - testing/mozharness/mozharness/mozilla/l10n/locales.py
             - testing/mozharness/scripts/desktop_l10n.py
-            - toolkit/locales/**
+            - system/locales/**
             - toolkit/mozapps/installer/**
 
 jobs:
diff --git a/toolkit/locales/Makefile.in b/toolkit/locales/Makefile.in
deleted file mode 100644
index 0c44915e5..000000000
--- a/toolkit/locales/Makefile.in
+++ /dev/null
@@ -1,31 +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/.
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef LOCALE_MERGEDIR
-vpath crashreporter.% $(LOCALE_MERGEDIR)/toolkit/crashreporter
-endif
-vpath crashreporter.% $(LOCALE_SRCDIR)/crashreporter
-ifdef LOCALE_MERGEDIR
-vpath crashreporter.% @srcdir@/en-US/crashreporter
-endif
-
-libs-%:
-	@$(MAKE) -C ../../system/network/locales/ libs AB_CD=$* XPI_NAME=locale-$*
-	@$(MAKE) -C ../../dom/locales/ libs AB_CD=$* XPI_NAME=locale-$*
-	@$(MAKE) -C ../../security/manager/locales/ libs AB_CD=$* XPI_NAME=locale-$*
-ifdef MOZ_DEVTOOLS_SERVER
-	@$(MAKE) -C ../../devtools/shared/locales/ libs AB_CD=$* XPI_NAME=locale-$*
-endif
-	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$*
-
-# target to be used by multi-locale l10n builds, just add this locale
-# like regular chrome code
-chrome-%:
-	@$(MAKE) -C $(DEPTH)/system/network/locales/ chrome AB_CD=$*
-	@$(MAKE) -C $(DEPTH)/dom/locales/ chrome AB_CD=$*
-	@$(MAKE) -C $(DEPTH)/security/manager/locales/ chrome AB_CD=$*
-	@$(MAKE) chrome AB_CD=$*
-
diff --git a/toolkit/moz.build b/toolkit/moz.build
deleted file mode 100644
index 47a91c881..000000000
--- a/toolkit/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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 += ['locales']
\ No newline at end of file