11 files changed, 14 insertions, 10 deletions
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/about.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/about.dtd
index 4f9098966..4f9098966 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/about.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/about.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd
index f393cc906..f393cc906 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.dtd
index 99c940b33..99c940b33 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties
index 10c0f81c3..10c0f81c3 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.dtd
index 1307cebb9..1307cebb9 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.properties
index bd5997a26..bd5997a26 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.properties
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/update.dtd
index 6dd64a9c6..6dd64a9c6 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/update.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/update.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/update.properties
index c2d4ed90f..c2d4ed90f 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/update.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/update.properties
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.dtd
index 6a7d17a16..6a7d17a16 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.properties
index d0b4e46ad..d0b4e46ad 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.properties
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index c28cf6f49..e42f0de00 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -105,15 +105,17 @@
   locale/@AB_CD@/mozapps/downloads/settingsChange.dtd             (%chrome/mozapps/downloads/settingsChange.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.dtd                  (%chrome/mozapps/downloads/downloads.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.properties           (%chrome/mozapps/downloads/downloads.properties)
-  locale/@AB_CD@/mozapps/extensions/extensions.dtd                (%chrome/mozapps/extensions/extensions.dtd)
+#ifdef MOZ_WEBEXTENSIONS
+  locale/@AB_CD@/mozapps/extensions/extensions.dtd                (%chrome/mozapps/webextensions/extensions.dtd)
 #ifndef MOZ_FENNEC
-  locale/@AB_CD@/mozapps/extensions/extensions.properties         (%chrome/mozapps/extensions/extensions.properties)
-  locale/@AB_CD@/mozapps/extensions/blocklist.dtd                 (%chrome/mozapps/extensions/blocklist.dtd)
-  locale/@AB_CD@/mozapps/extensions/about.dtd                     (%chrome/mozapps/extensions/about.dtd)
-  locale/@AB_CD@/mozapps/extensions/update.dtd                    (%chrome/mozapps/extensions/update.dtd)
-  locale/@AB_CD@/mozapps/extensions/update.properties             (%chrome/mozapps/extensions/update.properties)
-  locale/@AB_CD@/mozapps/extensions/newaddon.dtd                  (%chrome/mozapps/extensions/newaddon.dtd)
-  locale/@AB_CD@/mozapps/extensions/newaddon.properties           (%chrome/mozapps/extensions/newaddon.properties)
+  locale/@AB_CD@/mozapps/extensions/extensions.properties         (%chrome/mozapps/webextensions/extensions.properties)
+  locale/@AB_CD@/mozapps/extensions/blocklist.dtd                 (%chrome/mozapps/webextensions/blocklist.dtd)
+  locale/@AB_CD@/mozapps/extensions/about.dtd                     (%chrome/mozapps/webextensions/about.dtd)
+  locale/@AB_CD@/mozapps/extensions/update.dtd                    (%chrome/mozapps/webextensions/update.dtd)
+  locale/@AB_CD@/mozapps/extensions/update.properties             (%chrome/mozapps/webextensions/update.properties)
+  locale/@AB_CD@/mozapps/extensions/newaddon.dtd                  (%chrome/mozapps/webextensions/newaddon.dtd)
+  locale/@AB_CD@/mozapps/extensions/newaddon.properties           (%chrome/mozapps/webextensions/newaddon.properties)
+#endif
 #endif
   locale/@AB_CD@/mozapps/handling/handling.dtd                    (%chrome/mozapps/handling/handling.dtd)
   locale/@AB_CD@/mozapps/handling/handling.properties             (%chrome/mozapps/handling/handling.properties)
@@ -128,8 +130,10 @@
   locale/@AB_CD@/mozapps/update/updates.properties                (%chrome/mozapps/update/updates.properties)
 #endif
   locale/@AB_CD@/mozapps/update/history.dtd                       (%chrome/mozapps/update/history.dtd)
-  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd           (%chrome/mozapps/extensions/xpinstallConfirm.dtd)
-  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties    (%chrome/mozapps/extensions/xpinstallConfirm.properties)
+#ifdef MOZ_WEBEXTENSIONS
+  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd           (%chrome/mozapps/webextensions/xpinstallConfirm.dtd)
+  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties    (%chrome/mozapps/webextensions/xpinstallConfirm.properties)
+#endif
 % locale pluginproblem @AB_CD@ %locale/@AB_CD@/pluginproblem/
   locale/@AB_CD@/pluginproblem/pluginproblem.dtd                  (%chrome/pluginproblem/pluginproblem.dtd)
 % locale alerts @AB_CD@ %locale/@AB_CD@/alerts/