Bug 1075607 - create mozilla-b2g34_v2_1 branch. Swith L10N repos. r=b…

…hearsum, a=mergeday --HG-- extra : amend_source : 29572d5bf1a095baeca5223a62fd66463818d1ba
daoshengmu · Oct 13, 2014 · 8bfbabe · 8bfbabe
1 parent fc559c3
commit 8bfbabe
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 27 deletions.
diff --git a/b2g/config/dolphin/config.json b/b2g/config/dolphin/config.json
@@ -28,11 +28,11 @@
     "b2g_manifest": "dolphin.xml",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": [],
-    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "https://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/releases/gaia-l10n/v2_1"
         }
     }
 }
diff --git a/b2g/config/emulator-ics/config.json b/b2g/config/emulator-ics/config.json
@@ -13,11 +13,11 @@
         "{workdir}/sources.xml"
     ],
     "upload_platform": "emulator-ics",
-    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "https://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/releases/gaia-l10n/v2_1"
         }
     },
     "b2g_manifest": "emulator.xml",

diff --git a/b2g/config/emulator-jb/config.json b/b2g/config/emulator-jb/config.json
@@ -20,11 +20,11 @@
         "{workdir}/sources.xml"
     ],
     "upload_platform": "emulator-jb",
-    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "https://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/releases/gaia-l10n/v2_1"
         }
     },
     "b2g_manifest": "emulator-jb.xml",

diff --git a/b2g/config/emulator-kk/config.json b/b2g/config/emulator-kk/config.json
@@ -20,11 +20,11 @@
         "{workdir}/sources.xml"
     ],
     "upload_platform": "emulator-kk",
-    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "https://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/releases/gaia-l10n/v2_1"
         }
     },
     "b2g_manifest": "emulator-kk.xml",

diff --git a/b2g/config/emulator/config.json b/b2g/config/emulator/config.json
@@ -19,11 +19,11 @@
         "{objdir}/dist/b2g-*.tar.gz",
         "{workdir}/sources.xml"
     ],
-    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "https://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/releases/gaia-l10n/v2_1"
         }
     },
     "b2g_manifest": "emulator.xml",

diff --git a/b2g/config/flame-kk/config.json b/b2g/config/flame-kk/config.json
@@ -28,17 +28,17 @@
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1",
         "MOZ_TELEMETRY_REPORTING": "1",
-        "B2G_UPDATE_CHANNEL": "aurora",
+        "B2G_UPDATE_CHANNEL": "nightly-b2g34",
         "GAIA_KEYBOARD_LAYOUTS": "en,pt-BR,es,de,fr,pl,zh-Hans-Pinyin,zh-Hant-Zhuyin,en-Dvorak"
     },
     "b2g_manifest": "flame-kk.xml",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": ["backup-flame.tar.xz"],
-    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "https://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/releases/gaia-l10n/v2_1"
         }
     }
 }
diff --git a/b2g/config/flame/config.json b/b2g/config/flame/config.json
@@ -28,17 +28,17 @@
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1",
         "MOZ_TELEMETRY_REPORTING": "1",
-        "B2G_UPDATE_CHANNEL": "aurora",
+        "B2G_UPDATE_CHANNEL": "nightly-b2g34",
         "GAIA_KEYBOARD_LAYOUTS": "en,pt-BR,es,de,fr,pl,zh-Hans-Pinyin,zh-Hant-Zhuyin,en-Dvorak"
     },
     "b2g_manifest": "flame.xml",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": ["backup-flame.tar.xz"],
-    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "https://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/releases/gaia-l10n/v2_1"
         }
     }
 }
diff --git a/b2g/config/hamachi/config.json b/b2g/config/hamachi/config.json
@@ -20,16 +20,16 @@
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1",
         "MOZ_TELEMETRY_REPORTING": "1",
-        "B2G_UPDATE_CHANNEL": "aurora"
+        "B2G_UPDATE_CHANNEL": "nightly-b2g34"
     },
     "b2g_manifest": "hamachi.xml",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": ["backup-hamachi.tar.xz"],
-    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "https://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/releases/gaia-l10n/v2_1"
         }
     }
 }
diff --git a/b2g/config/helix/config.json b/b2g/config/helix/config.json
@@ -28,16 +28,16 @@
         "MOZILLA_OFFICIAL": "1",
         "MOZ_TELEMETRY_REPORTING": "1",
         "ANDROIDFS_DIR": "{workdir}/helix-ics",
-        "B2G_UPDATE_CHANNEL": "aurora"
+        "B2G_UPDATE_CHANNEL": "nightly-b2g34"
     },
     "b2g_manifest": "helix.xml",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": ["helix-ics.tar.xz"],
-    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "https://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/releases/gaia-l10n/v2_1"
         }
     }
 }
diff --git a/b2g/config/nexus-4/config.json b/b2g/config/nexus-4/config.json
@@ -28,16 +28,16 @@
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1",
         "MOZ_TELEMETRY_REPORTING": "1",
-        "B2G_UPDATE_CHANNEL": "aurora"
+        "B2G_UPDATE_CHANNEL": "nightly-b2g34"
     },
     "b2g_manifest": "nexus-4.xml",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": [],
-    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "https://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/releases/gaia-l10n/v2_1"
         }
     }
 }
diff --git a/b2g/config/wasabi/config.json b/b2g/config/wasabi/config.json
@@ -26,11 +26,11 @@
     "b2g_manifest": "wasabi.xml",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": ["backup-wasabi.tar.gz"],
-    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-aurora",
+    "gecko_l10n_root": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "https://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/releases/gaia-l10n/v2_1"
         }
     }
 }