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

@@ -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.">

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);