work in progress, push for wizard
authorMaria Emerson <memerson@mozilla.com>
Mon, 23 Jun 2008 15:48:01 -0700
changeset 44700 8726de6e2e3b711adfb64cd1df7a5f6858ad67a4
parent 44699 5576783c527d4543c39ca801b26dd91422ff3b16
child 44701 6b973f3b421a7c6f7a64c4ca5a7151306fb511fe
push id14033
push useredward.lee@engineering.uiuc.edu
push dateWed, 23 Jun 2010 22:21:35 +0000
treeherderautoland@227db4ad8cdf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
work in progress, push for wizard
services/sync/locales/en-US/wizard.dtd
services/sync/locales/en-US/wizard.properties
--- a/services/sync/locales/en-US/wizard.dtd
+++ b/services/sync/locales/en-US/wizard.dtd
@@ -1,61 +1,79 @@
+<!ENTITY serverError1.description         "Our server is having problems.">
+<!ENTITY serverError2.description         " to try again, or click &quot;Done&quot; to exit the setup wizard and try again later">
+
+
 <!ENTITY wizard.title                     "Weave Setup">
 
-<!ENTITY welcome.title                    "Welcome">
-<!ENTITY welcome.description              "Explain what Weave is...">
-<!ENTITY curUser-title.label	          "Sign in">
-<!ENTITY curUser.description       	  "Synchronize data here with your existing Weave data, or recover data from an existing account.">
-<!ENTITY newUser-title.label	          "Create a new account.">
-<!ENTITY newUser.description       	  "Create a new Weave account and choose the data you would like Weave to store.">
+<!ENTITY welcome.title                    "Welcome (Step 1 of 4)">
 
-<!ENTITY verify.title                     "Account Verification">
-<!ENTITY msg.label	                  "Please enter all fields.">
+<!ENTITY instanceName.description         "Name this device... explain why... ">
+<!ENTITY instanceName.label               "Device name:">
+<!ENTITY examples.label                   "Examples: &quot;Home computer&quot;, &quot;Mobile phone&quot;, &quot;Work laptop&quot;"> 
+<!ENTITY curUser-title.label              "Sign in">
+<!ENTITY curUser.description              "Synchronize data here with your existing Weave data, or recover data from an existing account.">
+<!ENTITY newUser-title.label              "Create a new account.">
+<!ENTITY newUser.description              "Create a new Weave account and choose the data you would like Weave to store.">
+
+
+<!ENTITY verify.title                     "Account Verification (Step 2 of 4)">
+
 <!ENTITY username.label                   "User name:">
-<!ENTITY password.label            	  "Password:">
-<!ENTITY passphrase.label		  "Passphrase:">
-<!ENTITY reminder.label		          "Forget your password? ">
-<!ENTITY verify.label			  "Verifying username and password...">
-
+<!ENTITY password.label                   "Password:">
+<!ENTITY passphrase.label                 "Passphrase:">
+<!ENTITY reminder.label                   "Forgot your password? If you provided your email address, ">
+<!ENTITY unverified.label                 "Unverified">
 <!ENTITY recovery.link                    "https://sm-labs01.mozilla.org:81/client/forgot.php">
 
-<!ENTITY create.title			  "Create Account">
-<!ENTITY username.description		  "Enter a unique username."> 
-<!ENTITY reenterPassword.label		  "Re-enter password:">
-<!ENTITY passphrase.description		  "Explain what a passphrase is..."> 
-<!ENTITY reenterPassphrase.label	  "Re-enter passphrase:">
-<!ENTITY moreInfo.label			  "More information on choosing a phrase.">
-<!ENTITY email.description		  "Explain email address...">
-<!ENTITY email.label			  "Email address:">
-<!ENTITY captcha.label		  	  "So we can verify you are a real person...">
+
+<!ENTITY create1.title                    "Create Account (Step 2 of 6)">
+
+<!ENTITY usernameUnchecked.label          "Enter a unique username.">
+<!ENTITY reenterPassword.label            "Re-enter password:">
+<!ENTITY passwordMatchError.label         "Passwords do not match.">
+
+<!ENTITY create2.title                    "Create Account (Step 3 of 6)">
+
+<!ENTITY passphrase.description           "Explain what a passphrase is..."> 
+<!ENTITY reenterPassphrase.label          "Re-enter passphrase:">
+<!ENTITY moreInfo.label                   "More information on choosing a phrase.">
+
+<!ENTITY create3.title                    "Create Account (Step 4 of 6)">
+
+<!ENTITY email.description                "Explain email address...">
+<!ENTITY email.label                      "Email address:">
+<!ENTITY captcha.label                    "So we can verify you are a real person...">
 <!ENTITY captchaDirections.label          "Type the two words, or ">
 <!ENTITY reloadCaptcha.text               "try another image">
-<!ENTITY terms.label			  "Terms, license (?)">
+<!ENTITY terms.label                      "Terms, license (?)">
+<!ENTITY acceptTerms.label                "I accept">
 
-<!ENTITY data.title			  "Data">
-<!ENTITY data.description		  "Choose the data that you would like Weave to store for you.">
-<!ENTITY bookmarks.label	          "Bookmarks">
-<!ENTITY history.label	          	  "Browsing History">
-<!ENTITY cookies.label	          	  "Cookies">
-<!ENTITY passwords.label	          "Saved Passwords">
-<!ENTITY tabs.label	          	  "Tabs">
-<!ENTITY formdata.label	          	  "Saved Form Data">
-<!ENTITY data.note		  	  "Weave will synchronize this data every 30 seconds.">
+<!ENTITY data.description                 "Choose the data that you would like Weave to store for you.">
+<!ENTITY bookmarks.label                  "Bookmarks">
+<!ENTITY history.label                    "Browsing History">
+<!ENTITY cookies.label                    "Cookies">
+<!ENTITY passwords.label                  "Saved Passwords">
+<!ENTITY tabs.label                       "Tabs">
+<!ENTITY formdata.label                   "Saved Form Data">
+<!ENTITY data.note                        "Weave will synchronize this data every 30 seconds.">
 <!ENTITY removeBookmarks.label            "Remove default bookmarks on this device before synchronizing with Weave.">
 
-<!ENTITY final.title			  "Finish">
-<!ENTITY final.description		  "Installing Weave...">
+<!ENTITY final.description                "Installing Weave...">
 
-<!ENTITY initialLogin.label               "Signing you in...">
-<!ENTITY initialPrefs.label               "Setting your preferences...">
-<!ENTITY initialReset.label               "Clearing your default bookmarks...">
-<!ENTITY initialSync.label		  "Synchronizing your data...">
+<!ENTITY initialLogin.label               "Signing you in.">
+<!ENTITY initialPrefs.label               "Setting your preferences.">
+<!ENTITY initialReset.label               "Clearing your default bookmarks.">
+<!ENTITY initialSync.label                "Synchronizing your data.">
 <!ENTITY finalStep1Finished.label         "Signed in.">
-<!ENTITY finalStep2.label		  "Synchronizing data...">
+<!ENTITY finalStep2.label                 "Synchronizing data...">
 <!ENTITY finalStep3Finished.label         "Data synchronized.">
 
+<!ENTITY userCheckFailed1.description     "Our server is having problems and we couldn't check that username. ">
+<!ENTITY userCheckFailed2.description     " to try again, or click &quot;Done&quot; to exit the setup wizard and try again later.">
+
 <!ENTITY finished.description             "Good job. You installed Weave. You can change preferences in the Weave tab...">
-<!ENTITY initialLoginFailed1.description "Our server is having problems and we couldn't log you in. ">
-<!ENTITY initialLoginFailed2.description  " to try again, or click Done to exit the setup wizard and try again later.">
+<!ENTITY initialLoginFailed1.description  "Our server is having problems and we couldn't log you in. ">
+<!ENTITY initialLoginFailed2.description  " to try again, or click &quot;Done&quot; to exit the setup wizard and try again later.">
 <!ENTITY initialSyncFailed1.description   "Our server is having problems and we couldn't synchronize your data. ">
-<!ENTITY initialSyncFailed2.description    " to try again, or click Done to exit the setup wizard and try again later."> 
+<!ENTITY initialSyncFailed2.description   " to try again, or click &quot;Done&quot; to exit the setup wizard and try again later."> 
 
 <!ENTITY clickHere.text                   "Click here">
--- a/services/sync/locales/en-US/wizard.properties
+++ b/services/sync/locales/en-US/wizard.properties
@@ -1,58 +1,54 @@
-verifyStatusUnverified.label    = Status: Unverified
-verifyStatusVerifying.label     = Status: Verifying account...
-verifyStatusLoginVerified.label = Status: Account Verified
-verifyStatusLoginFailed.label   = Status: Authentication Failed
+verifyStatusUnverified.label    = Unverified
+verifyStatusVerifying.label     = Verifying username and password
+verifyStatusLoginVerified.label = Username and password verified
+verifyStatusLoginFailed.label   = Incorrect username or password
 
-initStatusReadyToSync.label     = Status: Ready to Transfer Data
-initStatusSyncing.label         = Status: Transferring Data...
-initStatusSyncComplete.label    = Status: Transfer Complete
-initStatusSyncFailed.label      = Status: Transfer Failed
 
 invalidCredentials.alert        = You must provide a valid Weave user name and password to continue.
+missingUsername.label           = Please enter all fields.
 
-usernameTaken.label		= That username is already taken. Please choose another.
-usernameAvailable.label		= Available.
-
-loginFailed.label		= Please enter a valid username and password.
 
-requiredFields.label		= Please enter all required fields.
+checkingUsername.label          = Checking if it's available... 
+usernameTaken.label             = That username is already taken. Please choose another.
+usernameAvailable.label	        = Available.
+usernameUnverified.label        = Unverified
 
-passwordsUnmatched.label	= Passwords don't match. Please re-enter.
-passphrasesUnmatched.label 	= Passphrases don't match. Please re-enter.
+loginFailed.label               = Please enter a valid username and password.
 
-noPassphrase.alert = You must enter a passphrase
+requiredFields.label            = Please enter all required fields.
+
+passphrasesUnmatched.label      = Passphrases do not match.
 samePasswordAndPassphrase.label = Your password and passphrase must be different
-samePasswordAndPassphrase.alert = Your password and passphrase must be different
-
-invalidEmail.label		= Invalid email address.
-emailAlreadyExists.label	= Email address already exists. 
 
-emailTaken.label 		= Email address already exists.
-emailInvalid.label 		= Invalid email address.
-emailOk.label			= Email address is valid.
+emailUnverified.label           = Unverified
+checkingEmail.label             = Checking your email address.
+emailTaken.label                = Email address already exists.
+emailInvalid.label              = Invalid email address.
+emailOk.label                   = Email address is valid.
 
-missingCaptchaResponse.label	= Please enter the words in the Captcha box.
-incorrectCaptcha.label		= Incorrect Captcha response. Try again.
-internalError.label		= Sorry! We had a problem. Please try again.
+missingCaptchaResponse.label    = Please enter the words in the Captcha box.
+incorrectCaptcha.label          = Incorrect Captcha response. Try again.
+internalError.label             = Sorry! We had a problem. Please try again.
 
 initialLogin-progress.label     = Signing you in...
 initialLogin-done.label         = Sign-in successful. 
 initialLogin-error.label        = Problem signing in.
 
 initialPrefs-progress.label     = Setting your preferences...
 initialPrefs-done.label         = Preferences set. 
 
 initialReset-progress.label     = Clearing your default bookmarks...
 initialReset-done.label         = Default bookmarks cleared. 
 
 initialSync-progress.label      = Synchronizing your data...
 initialSync-done.label          = Sync successful.
 initialSync-error.label         = Problem syncing data. 
 
-initialLoginFailed.description1 = Our server is having problems and we couldn't log you in. 
-initialLoginFailed.description2 = to try again, or click "Done" to exit the setup wizard and try again later. 
+
+tryAgain.text                   = Click here
+
 
-initialSyncFailed.description1  = Our server is having problems and we couldn't synchronize your data. 
-initialSyncFailed.description2  = to try again, or click "Done" to exit the setup wizard and try again later. 
-
-tryAgain.text			= Click here
+data-verify.title               = Data (Step 3 of 4)
+data-create.title               = Data (Step 5 of 6)
+final-verify.title              = Finish (Step 4 of 4)
+final-create.title              = Finish (Step 6 of 6)