merge upstream changes
authorDan Mills <thunder@mozilla.com>
Thu, 31 Jul 2008 00:21:53 -0700
changeset 44980 f9b6f10e8a822cb6ebeeec1f189bde3d12645e82
parent 44979 ef85392cc4cf85b1b3ea3de0b3b4e2846dee635a (current diff)
parent 44977 5eb9aa986b8fb40a712bba9d224bd6b8478bb7e0 (diff)
child 44981 1e2147c7eabbbe1d3df76fa630ac599162019510
push idunknown
push userunknown
push dateunknown
merge upstream changes
--- a/services/sync/locales/en-US/preferences.dtd
+++ b/services/sync/locales/en-US/preferences.dtd
@@ -17,16 +17,20 @@
 <!ENTITY changePassword.caption             "Change Password">
 <!ENTITY changePassword.description         "Change the password you use to sign into Weave.">
 <!ENTITY oldPassword.label                  "Current Password:">
 <!ENTITY newPassword.label                  "New Password:">
 <!ENTITY newPasswordAgain.label             "Re-enter:">
 <!ENTITY showPasswords.label                "Show Passwords">
 <!ENTITY changePasswordButton.label         "Change">
 
+<!ENTITY instanceName.description         "Please choose a unique name for this computer so you will be able to distinguish it from your other computers.">
+<!ENTITY instanceName.label               "Computer name:">
+<!ENTITY examples.label                   "Examples: &quot;Home&quot;, &quot;Work&quot;">
+
 <!ENTITY backUpCheckbox.label               "Back up and synchronize my data to a Weave server">
 <!ENTITY encryptOnServerCheckbox.label      "Encrypt my data on the server">
 <!ENTITY syncNowButton.label                "Sync Now...">
 <!ENTITY syncItemsList.label                "Synchronize these items:">
 <!ENTITY bookmarksCheckbox.label            "Bookmarks">
 <!ENTITY historyCheckbox.label              "Browsing History">
 <!ENTITY cookiesCheckbox.label              "Cookies">
 <!ENTITY passwordsCheckbox.label            "Saved Passwords">
--- a/services/sync/services-sync.js
+++ b/services/sync/services-sync.js
@@ -30,11 +30,10 @@ pref("extensions.weave.log.appender.debu
 pref("extensions.weave.log.rootLogger", "Trace");
 pref("extensions.weave.log.logger.async", "Debug");
 pref("extensions.weave.log.logger.service.crypto", "Debug");
 pref("extensions.weave.log.logger.service.dav", "Debug");
 pref("extensions.weave.log.logger.service.engine", "Debug");
 pref("extensions.weave.log.logger.service.main", "Trace");
 
 pref("extensions.weave.xmpp.enabled", false);
-pref("extensions.weave.xmpp.server.url",
-     "https://sm-labs01.mozilla.org:81/xmpp");
+pref("extensions.weave.xmpp.server.url", "https://sm-labs01.mozilla.org:81/xmpp");
 pref("extensions.weave.xmpp.server.realm", "sm-labs01.mozilla.org");