fixed captcha screen
authorMaria Emerson <memerson@mozilla.com>
Thu, 26 Jun 2008 17:08:44 -0700
changeset 44788 fe37a870f262c2b397da5c28d5707e4ac65b4c9b
parent 44782 69a9be37804d07fb26e84b533e2714769ebc6095
child 44789 5d7003b9641067711999739ca10779c37455bf99
push idunknown
push userunknown
push dateunknown
fixed captcha screen
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,84 +1,85 @@
 <!ENTITY wizard.title                     "Weave Setup">
 
 <!ENTITY intro.title                      "Welcome to Weave">
 <!ENTITY intro-weave.description          "Weave is an experimental prototype from Mozilla Labs that integrates online services with Firefox. ">
-<!ENTITY intro-more.label                 "Learn more about the Weave project">
-<!ENTITY intro-more.link                  "http://labs.mozilla.com">
-<!ENTITY intro-warning.description        "Warning: Use at your own risk! Backup Firefox data before continuing with installation.">
+<!ENTITY intro-more.label                 "Learn more about the Weave project">
+<!ENTITY intro-more.link                  "http://labs.mozilla.com">
+<!ENTITY intro-warning.description        "Warning: Use at your own risk! Backup Firefox data before continuing with installation.">
 
 <!ENTITY eula.title                       "Software License Agreement">
 <!ENTITY eula.description                 "Terms and conditions for using this software.">
 <!ENTITY eula.accept                      "I accept the terms of the License Agreement">
 <!ENTITY eula.decline                     "I do NOT accept the terms of the License Agreement">
-
-<!ENTITY welcome.title			  "Installation Type">
-<!ENTITY curUser-title.label              "Sign In">
-<!ENTITY curUser.description              "Sign into your existing account to set up Weave on this computer.">
-<!ENTITY newUser-title.label              "Get Started">
-<!ENTITY newUser.description              "Create a new account and upload your Weave data to the server.">
-
-<!ENTITY verify.title                     "Account Verification (Step 1 of 3)">
-<!ENTITY username.label                   "User name:">
-<!ENTITY password.label                   "Password:">
-<!ENTITY passphrase.label                 "Passphrase:">
-<!ENTITY reminder.label                   "Forgot your password? ">
-<!ENTITY unverified.label                 "Unverified">
-<!ENTITY recovery.link                    "https://sm-labs01.mozilla.org:81/client/forgot.php">
-
-<!ENTITY create.title                     "Create Account (Step 1 of 5)">
-<!ENTITY createUsername.label             "Desired login name:">
-<!ENTITY createUsernameHint.label         "Examples: Maria, Maria.Emerson">
-<!ENTITY createPassword.label             "Choose a password:">
-<!ENTITY createPasswordHint.label         "Minimum of 5 characters in length.">
-<!ENTITY createReenterPassword.label      "Re-enter password:">
-<!ENTITY createEmail.label                "Current email address:">
-<!ENTITY createEmailHint.label            "e.g. yourname@domain.com">
-
-<!ENTITY create2.title                    "Create Account (Step 2 of 5)">
-
-<!ENTITY passphrase.description           "You must also now choose an encryption passphrase that is different from your password. This will be used to protect your data on the server."> 
-<!ENTITY passphrase-more.label            "Learn More">
-<!ENTITY passphrase-more.link             "http://labs.mozilla.com">
+
+<!ENTITY welcome.title			  "Installation Type">
+<!ENTITY curUser-title.label              "Sign In">
+<!ENTITY curUser.description              "Sign into your existing account to set up Weave on this computer.">
+<!ENTITY newUser-title.label              "Get Started">
+<!ENTITY newUser.description              "Create a new account and upload your Weave data to the server.">
+
+<!ENTITY verify.title                     "Account Verification (Step 1 of 3)">
+<!ENTITY username.label                   "User name:">
+<!ENTITY password.label                   "Password:">
+<!ENTITY passphrase.label                 "Passphrase:">
+<!ENTITY reminder.label                   "Forgot your password? ">
+<!ENTITY recovery.link                    "https://sm-labs01.mozilla.org:81/client/forgot.php">
+
+<!ENTITY create.title                     "Create Account (Step 1 of 5)">
+<!ENTITY createUsername.label             "Desired login name:">
+<!ENTITY createUsernameHint.label         "Examples: Maria, Maria.Emerson">
+<!ENTITY createPassword.label             "Choose a password:">
+<!ENTITY createPasswordHint.label         "Minimum of 5 characters in length.">
+<!ENTITY createReenterPassword.label      "Re-enter password:">
+<!ENTITY createEmail.label                "Current email address:">
+<!ENTITY createEmailHint.label            "e.g. yourname@domain.com">
+
+<!ENTITY create2.title                    "Create Account (Step 2 of 5)">
+
+<!ENTITY passphrase.description           "You must also now choose an encryption passphrase that is different from your password. This will be used to protect your data on the server."> 
+<!ENTITY passphrase-more.label            "Learn More">
+<!ENTITY passphrase-more.link             "http://labs.mozilla.com">
+
+<!ENTITY reenterPassphrase.label          "Re-enter passphrase:">
+<!ENTITY moreInfo.label                   "More information on choosing a phrase.">
+
+<!ENTITY create3.title                    "Create Account (Step 3 of 5)">
+<!ENTITY create3.description              "Continuing past this screen will create your Weave account.">
+
+<!ENTITY instanceName.description         "Choose a name for this device">
+<!ENTITY instanceName.label               "Device name:">
+<!ENTITY examples.label                   "Examples: &quot;Home computer&quot;, &quot;Mobile phone&quot;, &quot;Work laptop&quot;"> 
+
+<!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 captcha.label                    "Type the characters you see in the image below:">
+<!ENTITY reloadCaptcha.text               "Reload">
+<!ENTITY captchaHint.label                "Letters are not case-sensitive.">
+
+<!ENTITY terms.label                      "Terms of Service">
+<!ENTITY acceptTerms.label                "I agree to the ">
+<!ENTITY acceptTerms.link                 "Weave Terms of Service">
+
+<!ENTITY final.description                "Weave perform an initial synchronization with the following settings. Continue to the next wizard page to accept.">
+
+<!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 finalStep3Finished.label         "Data synchronized.">
 
-<!ENTITY reenterPassphrase.label          "Re-enter passphrase:">
-<!ENTITY moreInfo.label                   "More information on choosing a phrase.">
-
-<!ENTITY create3.title                    "Create Account (Step 3 of 5)">
-
-<!ENTITY instanceName.description         "Choose a name for this device for Weave">
-<!ENTITY instanceName.label               "Device name:">
-<!ENTITY examples.label                   "Examples: &quot;Home computer&quot;, &quot;Mobile phone&quot;, &quot;Work laptop&quot;"> 
-
-<!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 captcha.label                    "Type the characters you see in the image below:">
-<!ENTITY captchaDirections.label          "">
-<!ENTITY reloadCaptcha.text               "Reload">
-<!ENTITY captchaHint.label                "Letters are not case-sensitive.">
-
-<!ENTITY terms.label                      "Terms of Service">
-<!ENTITY acceptTerms.label                "I have read and accept the Terms of Service.">
-
-<!ENTITY final.description                "Weave perform an initial synchronization with the following settings. Continue to the next wizard page to accept.">
-
-<!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 finalStep3Finished.label         "Data synchronized.">
 
 <!ENTITY thankyou.title                   "Thank you!">
 <!ENTITY thankyou.description             "Weave has been installed on this device and your data has been synchronized. To change your Weave preferences, use the Weave tab of your browser preferences. ">
 
 
 <!ENTITY final-pref-title.description     "Preferences">
 <!ENTITY final-account-title.description  "Account">
 <!ENTITY final-sync-title.description     "Initial Synchronization">
--- a/services/sync/locales/en-US/wizard.properties
+++ b/services/sync/locales/en-US/wizard.properties
@@ -1,8 +1,13 @@
+verify-progress.label           = Verifying username and password
+verify-error.label              = Invalid username and password
+verify-success.label            = Username and password verified
+
+
 serverError.label               = Server Error
 serverTimeoutError.label        = Server Error
 
 
 createUsername-progress.label   = Checking username
 createUsername-error.label      = %S is already taken. Please choose another.
 createUsername-success.label    = %S is available.
 
@@ -17,19 +22,16 @@ passphrasesUnmatched.label      = Passph
 samePasswordAndPassphrase.label = Your password and passphrase must be different
 
 
 
 missingCaptchaResponse.label    = Please enter the words in the Captcha box.
 incorrectCaptcha.label          = Incorrect Captcha response. Try again.
 
 
-verify-progress.label           = Verifying username and password
-verify-error.label              = Invalid username and password
-verify-success.label            = Username and password verified
 
 create-progress.label           = Creating your account
 create-uid-inuse.label          = Username in use
 create-uid-missing.label        = Username missing
 create-uid-invalid.label        = Username invalid
 create-mail-invalid.label       = Email invalid
 create-mail-inuse.label         = Emali in use
 create-captcha-missing.label    = Captcha response missing