From ad9451dc5092fd9bf5bd468495fec3bd3f371964 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 26 Jan 2010 01:07:59 +0000
Subject: [PATCH] Remove in-development message from Sync pane of the
 preferences -- replace with "About Sync" link

---
 chrome/content/zotero/preferences/preferences.xul | 14 ++------------
 chrome/locale/en-US/zotero/preferences.dtd        |  1 +
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index 0d9230fc3..f8d64ad49 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -172,18 +172,6 @@ To add a new preference:
 			<preference id="pref-group-storage-enabled" name="extensions.zotero.sync.storage.groups.enabled" type="bool"/>
 		</preferences>
 		
-		<!-- This doesn't wrap without an explicit width, for some reason -->
-		<vbox style="margin-top: .75em; margin-bottom: 1.25em">
-			<description width="45em" style="font-size: 12px">
-				<label class="text-link" href="http://www.zotero.org/support/sync"
-					value="Sync functionality"/> is under active development.
-				We welcome you to participate in our testing by using Zotero Sync,
-				but we encourage you to
-				<label class="text-link" href="http://www.zotero.org/support/zotero_data"
-					value="back up your Zotero data"/> daily.
-			</description>
-		</vbox>
-		
 		<tabbox>
 			<tabs>
 				<tab label="Settings"/>
@@ -239,6 +227,8 @@ To add a new preference:
 						<hbox>
 							<checkbox label="&zotero.preferences.sync.syncAutomatically;" preference="pref-sync-autosync"/>
 						</hbox>
+						
+						<label class="text-link" style="margin-top:.7em; margin-left: 0" value="&zotero.preferences.sync.about;" href="http://www.zotero.org/support/sync"/>
 					</groupbox>
 					
 					
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index df20be650..409c1cd8f 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -46,6 +46,7 @@
 <!ENTITY zotero.preferences.sync.createAccount						"Create Account">
 <!ENTITY zotero.preferences.sync.lostPassword						"Lost Password?">
 <!ENTITY zotero.preferences.sync.syncAutomatically					"Sync automatically">
+<!ENTITY zotero.preferences.sync.about								"About Syncing">
 <!ENTITY zotero.preferences.sync.fileSyncing						"File Syncing">
 <!ENTITY zotero.preferences.sync.fileSyncing.url					"URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary				"Sync attachment files in My Library using">