From 79e8443f283fe9dddf1e5f27726c5c4761ce5b6d Mon Sep 17 00:00:00 2001
From: Steven MacLeod <smacleod@mozilla.com>
Date: Sun, 2 Mar 2014 20:57:47 -0500
Subject: [PATCH] Bug 971765 - Reorder Sync datatype options to match
 marketing. r=ttaubert

---
 browser/base/content/sync/customize.xul | 12 ++++++------
 browser/components/preferences/sync.xul | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/browser/base/content/sync/customize.xul b/browser/base/content/sync/customize.xul
index 5b4f90b7aa17..fcc16fef5a7f 100644
--- a/browser/base/content/sync/customize.xul
+++ b/browser/base/content/sync/customize.xul
@@ -38,18 +38,18 @@
 #endif
                  />
 
-    <checkbox label="&engine.bookmarks.label;"
-              accesskey="&engine.bookmarks.accesskey;"
-              preference="engine.bookmarks"/>
-    <checkbox label="&engine.history.label;"
-              accesskey="&engine.history.accesskey;"
-              preference="engine.history"/>
     <checkbox label="&engine.tabs.label;"
               accesskey="&engine.tabs.accesskey;"
               preference="engine.tabs"/>
+    <checkbox label="&engine.bookmarks.label;"
+              accesskey="&engine.bookmarks.accesskey;"
+              preference="engine.bookmarks"/>
     <checkbox label="&engine.passwords.label;"
               accesskey="&engine.passwords.accesskey;"
               preference="engine.passwords"/>
+    <checkbox label="&engine.history.label;"
+              accesskey="&engine.history.accesskey;"
+              preference="engine.history"/>
     <checkbox label="&engine.addons.label;"
               accesskey="&engine.addons.accesskey;"
               preference="engine.addons"/>
diff --git a/browser/components/preferences/sync.xul b/browser/components/preferences/sync.xul
index 4dc1f8534edf..ca05e4703521 100644
--- a/browser/components/preferences/sync.xul
+++ b/browser/components/preferences/sync.xul
@@ -264,9 +264,9 @@
                            orient="vertical"
                            onselect="if (this.selectedCount) this.clearSelection();">
                 <richlistitem>
-                  <checkbox label="&engine.addons.label;"
-                            accesskey="&engine.addons.accesskey;"
-                            preference="engine.addons"/>
+                  <checkbox label="&engine.tabs.label;"
+                            accesskey="&engine.tabs.accesskey;"
+                            preference="engine.tabs"/>
                 </richlistitem>
                 <richlistitem>
                   <checkbox label="&engine.bookmarks.label;"
@@ -278,20 +278,20 @@
                             accesskey="&engine.passwords.accesskey;"
                             preference="engine.passwords"/>
                 </richlistitem>
-                <richlistitem>
-                  <checkbox label="&engine.prefs.label;"
-                            accesskey="&engine.prefs.accesskey;"
-                            preference="engine.prefs"/>
-                </richlistitem>
                 <richlistitem>
                   <checkbox label="&engine.history.label;"
                             accesskey="&engine.history.accesskey;"
                             preference="engine.history"/>
                 </richlistitem>
                 <richlistitem>
-                  <checkbox label="&engine.tabs.label;"
-                            accesskey="&engine.tabs.accesskey;"
-                            preference="engine.tabs"/>
+                  <checkbox label="&engine.addons.label;"
+                            accesskey="&engine.addons.accesskey;"
+                            preference="engine.addons"/>
+                </richlistitem>
+                <richlistitem>
+                  <checkbox label="&engine.prefs.label;"
+                            accesskey="&engine.prefs.accesskey;"
+                            preference="engine.prefs"/>
                 </richlistitem>
               </richlistbox>
             </vbox>