зеркало из https://github.com/mozilla/gecko-dev.git
fix login calls, do login and sync on final screen, add try again link to server errors throughout
This commit is contained in:
Maria Emerson
Родитель
0e87884e99
Коммит
bab9cb62c9
|
|
@ -1,87 +1,91 @@
|
|||
<!ENTITY serverError1.description "Server Error: ">
|
||||
<!ENTITY serverError2.description ", ">
|
||||
<!ENTITY serverError1.description "Server Error: ">
|
||||
<!ENTITY serverError2.description ", ">
|
||||
|
||||
<!ENTITY wizard.title "Weave Setup">
|
||||
|
||||
<!ENTITY intro.title "Welcome to Weave">
|
||||
<!ENTITY intro.description "[description of Weave]">
|
||||
<!ENTITY intro-more.label "Learn more">
|
||||
<!ENTITY intro-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 with Weave">
|
||||
<!ENTITY newUser.description "Create a new account.">
|
||||
|
||||
<!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 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 "Name this device... explain why... ">
|
||||
<!ENTITY instanceName.label "Device name:">
|
||||
<!ENTITY examples.label "Examples: "Home computer", "Mobile phone", "Work laptop"">
|
||||
|
||||
<!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 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 "Your account will be created with the following preferences [this screen in progress]">
|
||||
|
||||
<!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 wizard.title "Weave Setup">
|
||||
<!ENTITY thankyou.title "Thank you!">
|
||||
<!ENTITY thankyou.description "You successfully installed Weave. etc... ">
|
||||
|
||||
<!ENTITY intro.title "Welcome to Weave">
|
||||
<!ENTITY intro.description "[description of Weave]">
|
||||
<!ENTITY intro-more.label "Learn more">
|
||||
<!ENTITY intro-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 with Weave">
|
||||
<!ENTITY newUser.description "Create a new account.">
|
||||
|
||||
<!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 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 "Name this device... explain why... ">
|
||||
<!ENTITY instanceName.label "Device name:">
|
||||
<!ENTITY examples.label "Examples: "Home computer", "Mobile phone", "Work laptop"">
|
||||
|
||||
<!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 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 "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 finalStep1Finished.label "Signed in.">
|
||||
<!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 "Done" 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 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 clickHere.text "Click here">
|
||||
<!ENTITY tryAgain.text "Try again">
|
||||
<!ENTITY final-pref-title.description "Preferences">
<!ENTITY final-account-title.description "Account">
<!ENTITY final-sync-title.description "Initial Synchronization">
|
||||
<!ENTITY userCheckFailed1.description "Our server is having problems and we couldn't check that username. ">
|
||||
<!ENTITY userCheckFailed2.description " to try again, or click "Done" 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 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 clickHere.text "Click here">
|
||||
<!ENTITY tryAgain.text "Try again">
|
||||
|
|
|
|||
|
|
@ -1,52 +1,73 @@
|
|||
serverError.label = Server Error
|
||||
serverTimeoutError.label = Server Error
|
||||
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.
|
||||
|
||||
email-progress.label = Checking email
|
||||
email-unavailable.label = %S is already taken. Please choose another.
|
||||
email-invalid.label = Please re-enter a valid email address.
|
||||
email-success.label = %S is available.
|
||||
|
||||
|
||||
passwordsUnmatched.label = Passwords do not match
|
||||
passphrasesUnmatched.label = Passphrases do not match.
|
||||
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
|
||||
create-password-missing.label = Password missing
|
||||
create-password-incorrect.label = Password incorrect
|
||||
|
||||
create-success.label = Account for %S created.
|
||||
|
||||
createUsername-progress.label =
|
||||
createUsername-error.label = %S is already taken. Please choose another.
|
||||
createUsername-success.label = %S is available.
|
||||
final-pref-value.label = %S
|
||||
final-account-value.label = Username: %S
|
||||
final-sync-value.label = [Explain that a sync will happen]
|
||||
final-success.label = Weave was successfully installed.
|
||||
|
||||
email-progress.label =
|
||||
email-unavailable.label = %S is already taken. Please choose another.
|
||||
email-invalid.label = Please re-enter a valid email address.
|
||||
email-success.label = %S is available.
|
||||
default-name.label = %S's Firefox
|
||||
default-name-nouser.label = Firefox
|
||||
|
||||
bookmarks.label = Bookmarks
|
||||
history.label = Browsing History
|
||||
cookies.label = Cookies
|
||||
passwords.label = Saved Passwords
|
||||
tabs.label = Tabs
|
||||
formdata.label = Saved Form Data
|
||||
|
||||
initialLogin-progress.label = Signing you in
|
||||
initialLogin-error.label = Problem signing in.
|
||||
|
||||
initialPrefs-progress.label = Setting your preferences
|
||||
|
||||
passwordsUnmatched.label = Passwords do not match
|
||||
passphrasesUnmatched.label = Passphrases do not match.
|
||||
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
|
||||
|
||||
|
||||
|
||||
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-progress.label = Synchronizing your data
|
||||
initialSync-error.label = Problem syncing data.
|
||||
|
||||
|
||||
tryAgain.text = Try again now.
|
||||
clickHere.text = Click here
|
||||
|
||||
data-verify.title = Data (Step 2 of 3)
|
||||
data-create.title = Data (Step 4 of 5)
|
||||
final-verify.title = Finish (Step 3 of 3)
|
||||
final-create.title = Finish (Step 5 of 5)
|
||||
installation-complete.label = Installation complete.
|
||||
|
||||
|
||||
tryAgain.text = Try again now.
|
||||
clickHere.text = Click here
|
||||
|
||||
data-verify.title = Data (Step 2 of 3)
|
||||
data-create.title = Data (Step 4 of 5)
|
||||
final-verify.title = Finish (Step 3 of 3)
|
||||
final-create.title = Finish (Step 5 of 5)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче