Issue %3030 - Sync-UI: Move locale from browser to weave

12 files changed, 25 insertions, 27 deletions

diff --git a/components/weave/content/aboutSyncTabs.xul b/components/weave/content/aboutSyncTabs.xul
index f2c2560be..9b57a6731 100644
--- a/components/weave/content/aboutSyncTabs.xul
+++ b/components/weave/content/aboutSyncTabs.xul
@@ -9,7 +9,7 @@
 <?xml-stylesheet href="chrome://weave/content/aboutSyncTabs.css" type="text/css"?>
 
 <!DOCTYPE window [
-  <!ENTITY % aboutSyncTabsDTD SYSTEM "chrome://browser/locale/aboutSyncTabs.dtd">
+  <!ENTITY % aboutSyncTabsDTD SYSTEM "chrome://weave/locale/aboutSyncTabs.dtd">
   %aboutSyncTabsDTD;
 ]>
 
diff --git a/components/weave/content/addDevice.xul b/components/weave/content/addDevice.xul
index 8f0c62132..ec25d15c9 100644
--- a/components/weave/content/addDevice.xul
+++ b/components/weave/content/addDevice.xul
@@ -11,7 +11,7 @@
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 <!ENTITY % syncBrandDTD SYSTEM "chrome://branding/locale/syncBrand.dtd">
-<!ENTITY % syncSetupDTD SYSTEM "chrome://browser/locale/syncSetup.dtd">
+<!ENTITY % syncSetupDTD SYSTEM "chrome://weave/locale/syncSetup.dtd">
 %brandDTD;
 %syncBrandDTD;
 %syncSetupDTD;
diff --git a/components/weave/content/genericChange.js b/components/weave/content/genericChange.js
index 7ab5c6b8f..75adc4893 100644
--- a/components/weave/content/genericChange.js
+++ b/components/weave/content/genericChange.js
@@ -49,7 +49,7 @@ var Change = {
     this._dialog.getButton("back").hidden = true;
 
     this._stringBundle =
-      Services.strings.createBundle("chrome://browser/locale/syncGenericChange.properties");
+      Services.strings.createBundle("chrome://weave/locale/syncGenericChange.properties");
 
     switch (this._dialogType) {
       case "UpdatePassphrase":
diff --git a/components/weave/content/genericChange.xul b/components/weave/content/genericChange.xul
index 5dfc59d42..62a1f25b8 100644
--- a/components/weave/content/genericChange.xul
+++ b/components/weave/content/genericChange.xul
@@ -11,7 +11,7 @@
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 <!ENTITY % syncBrandDTD SYSTEM "chrome://branding/locale/syncBrand.dtd">
-<!ENTITY % syncSetupDTD SYSTEM "chrome://browser/locale/syncSetup.dtd">
+<!ENTITY % syncSetupDTD SYSTEM "chrome://weave/locale/syncSetup.dtd">
 %brandDTD;
 %syncBrandDTD;
 %syncSetupDTD;
diff --git a/components/weave/content/key.xhtml b/components/weave/content/key.xhtml
index 11963e669..ca9d03d42 100644
--- a/components/weave/content/key.xhtml
+++ b/components/weave/content/key.xhtml
@@ -9,7 +9,7 @@
   %htmlDTD;
   <!ENTITY % syncBrandDTD SYSTEM "chrome://branding/locale/syncBrand.dtd">
   %syncBrandDTD;
-  <!ENTITY % syncKeyDTD SYSTEM "chrome://browser/locale/syncKey.dtd">
+  <!ENTITY % syncKeyDTD SYSTEM "chrome://weave/locale/syncKey.dtd">
   %syncKeyDTD;
   <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd" >
   %globalDTD;
diff --git a/components/weave/content/progress.xhtml b/components/weave/content/progress.xhtml
index 7656fddac..f6b61635c 100644
--- a/components/weave/content/progress.xhtml
+++ b/components/weave/content/progress.xhtml
@@ -9,10 +9,10 @@
     "DTD/xhtml1-strict.dtd">
   %htmlDTD;
   <!ENTITY % syncProgressDTD
-    SYSTEM "chrome://browser/locale/syncProgress.dtd">
+    SYSTEM "chrome://weave/locale/syncProgress.dtd">
     %syncProgressDTD;
   <!ENTITY % syncSetupDTD
-    SYSTEM "chrome://browser/locale/syncSetup.dtd">
+    SYSTEM "chrome://weave/locale/syncSetup.dtd">
     %syncSetupDTD;
   <!ENTITY % globalDTD 
     SYSTEM "chrome://global/locale/global.dtd">
diff --git a/components/weave/content/quota.xul b/components/weave/content/quota.xul
index a83297cb7..628854a42 100644
--- a/components/weave/content/quota.xul
+++ b/components/weave/content/quota.xul
@@ -10,7 +10,7 @@
 <!DOCTYPE dialog [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 <!ENTITY % syncBrandDTD SYSTEM "chrome://branding/locale/syncBrand.dtd">
-<!ENTITY % syncQuotaDTD SYSTEM "chrome://browser/locale/syncQuota.dtd">
+<!ENTITY % syncQuotaDTD SYSTEM "chrome://weave/locale/syncQuota.dtd">
 %brandDTD;
 %syncBrandDTD;
 %syncQuotaDTD;
@@ -31,7 +31,7 @@
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="quotaStrings"
-                  src="chrome://browser/locale/syncQuota.properties"/>
+                  src="chrome://weave/locale/syncQuota.properties"/>
   </stringbundleset>
 
   <vbox flex="1">
diff --git a/components/weave/content/setup.js b/components/weave/content/setup.js
index 9ff70d471..c44f2bed9 100644
--- a/components/weave/content/setup.js
+++ b/components/weave/content/setup.js
@@ -1067,5 +1067,5 @@ XPCOMUtils.defineLazyGetter(gSyncSetup, "nextFocusEl", function() {
           pin3: this.wizard.getButton("next")};
 });
 XPCOMUtils.defineLazyGetter(gSyncSetup, "_stringBundle", function() {
-  return Services.strings.createBundle("chrome://browser/locale/syncSetup.properties");
+  return Services.strings.createBundle("chrome://weave/locale/syncSetup.properties");
 });
diff --git a/components/weave/content/setup.xul b/components/weave/content/setup.xul
index ca41dbdc0..66719bd0e 100644
--- a/components/weave/content/setup.xul
+++ b/components/weave/content/setup.xul
@@ -11,7 +11,7 @@
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 <!ENTITY % syncBrandDTD SYSTEM "chrome://branding/locale/syncBrand.dtd">
-<!ENTITY % syncSetupDTD SYSTEM "chrome://browser/locale/syncSetup.dtd">
+<!ENTITY % syncSetupDTD SYSTEM "chrome://weave/locale/syncSetup.dtd">
 %brandDTD;
 %syncBrandDTD;
 %syncSetupDTD;
diff --git a/components/weave/content/utils.js b/components/weave/content/utils.js
index d855acfb0..fa5d6a5ac 100644
--- a/components/weave/content/utils.js
+++ b/components/weave/content/utils.js
@@ -11,7 +11,7 @@ const PERMISSIONS_RWUSR = 0x180;
 var gSyncUtils = {
   get bundle() {
     delete this.bundle;
-    return this.bundle = Services.strings.createBundle("chrome://browser/locale/syncSetup.properties");
+    return this.bundle = Services.strings.createBundle("chrome://weave/locale/syncSetup.properties");
   },
 
   // opens in a new window if we're in a modal prefwindow world, in a new tab otherwise
diff --git a/components/weave/locales/jar.mn b/components/weave/locales/jar.mn
index 9788eb082..aafcf4af6 100644
--- a/components/weave/locales/jar.mn
+++ b/components/weave/locales/jar.mn
@@ -5,16 +5,14 @@
 
 
 @AB_CD@.jar:
-% locale weave @AB_CD@ %locale/@AB_CD@/
-  locale/@AB_CD@/services/errors.properties                             (%errors.properties)
-  locale/@AB_CD@/services/sync.properties                               (%sync.properties)
-
-% locale browser @AB_CD@ %locale/@AB_CD@/browser/
-  locale/@AB_CD@/browser/syncProgress.dtd                               (%syncProgress.dtd)
-  locale/@AB_CD@/browser/aboutSyncTabs.dtd                              (%aboutSyncTabs.dtd)
-  locale/@AB_CD@/browser/syncSetup.dtd                                  (%syncSetup.dtd)
-  locale/@AB_CD@/browser/syncSetup.properties                           (%syncSetup.properties)
-  locale/@AB_CD@/browser/syncGenericChange.properties                   (%syncGenericChange.properties)
-  locale/@AB_CD@/browser/syncKey.dtd                                    (%syncKey.dtd)
-  locale/@AB_CD@/browser/syncQuota.dtd                                  (%syncQuota.dtd)
-  locale/@AB_CD@/browser/syncQuota.properties                           (%syncQuota.properties)
\ No newline at end of file
+% locale weave @AB_CD@ %locale/@AB_CD@/weave/
+  locale/@AB_CD@/weave/errors.properties                              (%errors.properties)
+  locale/@AB_CD@/weave/sync.properties                                (%sync.properties)
+  locale/@AB_CD@/weave/syncProgress.dtd                               (%syncProgress.dtd)
+  locale/@AB_CD@/weave/aboutSyncTabs.dtd                              (%aboutSyncTabs.dtd)
+  locale/@AB_CD@/weave/syncSetup.dtd                                  (%syncSetup.dtd)
+  locale/@AB_CD@/weave/syncSetup.properties                           (%syncSetup.properties)
+  locale/@AB_CD@/weave/syncGenericChange.properties                   (%syncGenericChange.properties)
+  locale/@AB_CD@/weave/syncKey.dtd                                    (%syncKey.dtd)
+  locale/@AB_CD@/weave/syncQuota.dtd                                  (%syncQuota.dtd)
+  locale/@AB_CD@/weave/syncQuota.properties                           (%syncQuota.properties)
\ No newline at end of file
diff --git a/components/weave/src/sync/util.js b/components/weave/src/sync/util.js
index af4f79384..08e4e1dfc 100644
--- a/components/weave/src/sync/util.js
+++ b/components/weave/src/sync/util.js
@@ -196,7 +196,7 @@ this.Utils = {
   },
 
   lazyStrings: function Weave_lazyStrings(name) {
-    let bundle = "chrome://weave/locale/services/" + name + ".properties";
+    let bundle = "chrome://weave/locale/" + name + ".properties";
     return () => new StringBundle(bundle);
   },
 
@@ -628,7 +628,7 @@ this.Utils = {
 
     let appName;
     try {
-      let syncStrings = new StringBundle("chrome://browser/locale/sync.properties");
+      let syncStrings = new StringBundle("chrome://weave/locale/sync.properties");
       appName = syncStrings.getFormattedString("sync.defaultAccountApplication", [brandName]);
     } catch (ex) {}
     appName = appName || brandName;