diff --git a/services/sync/locales/en-US/about.properties b/services/sync/locales/en-US/about.properties
index 9281926311c..d5917e83333 100644
--- a/services/sync/locales/en-US/about.properties
+++ b/services/sync/locales/en-US/about.properties
@@ -1,3 +1,5 @@
+# Status messages (below the arrow in the center)
+
 status-offline       = signed out
 status-offline-2     = (offline)
 status-signing-in    = 
@@ -7,36 +9,70 @@ status-idle-2        = (idle)
 status-sync          = signed in as %S
 status-sync-2        = (syncing)
 
-welcome              = Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam id neque lectus. Donec cursus pulvinar nibh at pretium. Vivamus ante tellus, accumsan vel placerat vestibulum, tristique ac augue. 'Cause that's how I roll.
+# Bubbles
 
-#prev                 = « prev
-#next                 = next »
 prev                 = prev
 next                 = next
 
-signedin-title       = Signed In
-signedin-text        = You are currently logged in as %S
 signedin-signout     = sign out
+signedin-change-password   = change password
+signedin-change-passphrase = change passphrase
 
 signin-title         = Sign Into Weave
-signin-newacct       = new account
+signin-newacct       = new user
 signin-username      = username
 signin-password      = password
 signin-passphrase    = passphrase
-signin-help          = help
-signin-help-url      = https://services.mozilla.com/help/login/
+signin-next          = sign in
 
 newacct-title        = New Weave Account
 newacct-username     = username
 newacct-password     = password
 newacct-passphrase   = passphrase
 newacct-email        = email address
-newacct-tos-label    = I agree to the
-newacct-tos-label2   = 
-newacct-tos-link     = Terms of Service
-newacct-tos-url      = http://labs.mozilla.com/projects/weave/tos/
+newacct-tos-label    = I agree to the %S
+newacct-tos          = Terms of Service
 captcha-response     = Type in the words above
+user-taken-password  = My username won't work
 
 willsync-title       = Account Created!
-willsync-text        = Sync will begin in %S seconds...
-willsync-config      = choose what to sync
\ No newline at end of file
+willsync-1           = Sync will begin in %S seconds...
+willsync-config      = choose what to sync
+
+setup-title          = Sync Settings
+setup-1              = Check the things you'd like to sync:
+setup-sync           = sync now
+
+clientinfo-type-desktop = desktop
+clientinfo-type-laptop  = laptop
+clientinfo-type-mobile  = mobile
+clientinfo-prefs     = choose what to sync
+
+cloudinfo-title      = What's In The Cloud?
+
+# Help items
+
+help-forgot-password = I forgot my password
+forgot-password-1    = Type in your username and we'll send you an email so you can reset it:
+forgot-password-box  = username
+forgot-password-ok   = send email
+
+help-forgot-passphrase = I forgot my passphrase
+forgot-passphrase-1  = You can pick a new passphrase, but all your server data will need to be deleted (it cannot be recovered).
+forgot-passphrase-2  = To go ahead, click the button below:
+forgot-passphrase-ok = reset passphrase
+
+help-helpme          = I'm stuck! What do I do?
+help-helpme-1        = If you're stuck, you might want to try the %S or the %S for help.
+help-helpme-faq      = FAQ
+help-helpme-forum    = Weave discussion forum
+
+help-user-taken      = My username won't work
+help-user-taken-1    = Your username might be taken, try adding numbers or additional words to it.
+help-user-taken-2    = Additionally, you can't use special symbols or spaces inside usernames.
+
+help-newacct-pass    = Weave won't accept my password or passphrase
+help-newacct-pass-1  = The password and passphrase must be different from each other.
+
+help-no-captcha      = I can't see the verification image
+help-no-captcha-1    = Some add-ons can interfere with the verification image.  Try disabling NoScript or similar add-ons.
diff --git a/services/sync/modules/util.js b/services/sync/modules/util.js
index 6a4aaa7c404..1efd3416e69 100644
--- a/services/sync/modules/util.js
+++ b/services/sync/modules/util.js
@@ -792,6 +792,7 @@ Utils.EventListener.prototype = {
 
 let Svc = {};
 Svc.Prefs = new Preferences(PREFS_BRANCH);
+Svc.GPrefs = new Preferences();
 [["Annos", "@mozilla.org/browser/annotation-service;1", "nsIAnnotationService"],
  ["AppInfo", "@mozilla.org/xre/app-info;1", "nsIXULAppInfo"],
  ["Bookmark", "@mozilla.org/browser/nav-bookmarks-service;1", "nsINavBookmarksService"],
diff --git a/services/sync/services-sync.js b/services/sync/services-sync.js
index ae040ee5b48..d20b86ddc1b 100644
--- a/services/sync/services-sync.js
+++ b/services/sync/services-sync.js
@@ -1,5 +1,6 @@
 pref("extensions.weave.serverURL", "https://auth.services.mozilla.com/user/");
 pref("extensions.weave.miscURL", "https://auth.services.mozilla.com/misc/");
+pref("extensions.weave.termsURL", "https://labs.mozilla.com/projects/weave/tos/");
 
 pref("extensions.weave.encryption", "aes-256-cbc");