From f82bbb533c3a947a193c1241ed8642855d7f8ba1 Mon Sep 17 00:00:00 2001
From: Mike Connor <mconnor@mozilla.com>
Date: Wed, 28 Apr 2010 22:14:12 -0400
Subject: [PATCH] Bug 551612 - Changes to Weave Sync Client to comply with
 European Privacy Policy, r=Mardak

--HG--
extra : rebase_source : 981175b74c23e54d131a2aa32b965493c9d8af30
---
 services/sync/locales/en-US/fx-prefs.dtd | 4 +++-
 services/sync/services-sync.js           | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/sync/locales/en-US/fx-prefs.dtd b/services/sync/locales/en-US/fx-prefs.dtd
index d83e2598e366..887143645667 100644
--- a/services/sync/locales/en-US/fx-prefs.dtd
+++ b/services/sync/locales/en-US/fx-prefs.dtd
@@ -24,7 +24,9 @@
 <!ENTITY setup.tosAgree1.label      "I agree to the">
 <!ENTITY setup.tosAgree1.accesskey  "a">
 <!ENTITY setup.tosLink.label        "Terms of Service">
-<!ENTITY setup.tosAgree2.label      "">
+<!ENTITY setup.tosAgree2.label      "and the">
+<!ENTITY setup.ppLink.label         "Privacy Policy">
+<!ENTITY setup.tosAgree3.label      "">
 <!ENTITY setup.tosAgree2.accesskey  "">
 
 <!ENTITY weaveDesc.label            "&brandShortName; can use a &syncBrand.fullName.label; account to sync your bookmarks, history, passwords, preferences, and tabs across multiple computers.">
diff --git a/services/sync/services-sync.js b/services/sync/services-sync.js
index 4e8f9ec0bba2..40ba32007cb3 100644
--- a/services/sync/services-sync.js
+++ b/services/sync/services-sync.js
@@ -2,7 +2,8 @@ pref("extensions.weave.serverURL", "@server_url@");
 pref("extensions.weave.storageAPI", "1.0");
 pref("extensions.weave.userURL", "user/");
 pref("extensions.weave.miscURL", "misc/");
-pref("extensions.weave.termsURL", "https://mozillalabs.com/weave/tos/");
+pref("extensions.weave.termsURL", "http://mozillalabs.com/weave/tos/");
+pref("extensions.weave.privacyURL", "http://mozillalabs.com/weave/weave-privacy-policy/");
 
 pref("extensions.weave.lastversion", "firstrun");
 pref("extensions.weave.autoconnect", true);