reverted back to original weave logo, increased wizard height for linux problem, added passphrase verification
authorMaria Emerson <memerson@mozilla.com>
Mon, 30 Jun 2008 18:00:55 -0700
changeset 44848 160a7147243ae4d363a32265b138c31d4fff00b3
parent 44847 220fe9d0125e8e7a556618adb9da5906cfc52663
child 44850 bc5e449c14c65dbb34d28edd49c36c4078ebd203
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)
reverted back to original weave logo, increased wizard height for linux problem, added passphrase verification
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,25 +1,25 @@
 <!ENTITY wizard.title                     "Weave Setup">
 
-<!ENTITY intro.title                      "   ">
+<!ENTITY intro.title                      "Welcome to Weave">
 <!ENTITY intro-weave1.description         "Weave is an experiment from Mozilla Labs that provides a framework for the deep integration of online services with the browser to enable exciting new user experiences.">
 <!ENTITY intro-weave2.description         "This development milestone adds additional data synchronization, encryption, and messaging capabilities to the platform.">
 <!ENTITY intro-weave3.description         "When you install this version of Weave it will encrypt and backup most of your browser settings and metadata to a server (e.g. bookmarks, browsing history, cookies, etc.) and synchronize them between multiple computers. It will also enable read-only sharing of bookmark folders with another Weave user.">
 <!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			  "Setup Options">
-<!ENTITY curUser-title.label              "Setup Another Computer">
+<!ENTITY curUser-title.label              "Set up Another Computer">
 <!ENTITY curUser.description              "Sign in and associate this computer with your existing Weave account.">
 <!ENTITY newUser-title.label              "Get Started with Weave">
 <!ENTITY newUser.description              "Create a new account and configure the automated backup and synchronization of your browser settings and metadata to a Weave server.">
 
 <!ENTITY verify.title                     "Account Verification (Step 1 of 3)">
 <!ENTITY username.label                   "User name:">
 <!ENTITY password.label                   "Password:">
 <!ENTITY passphrase.label                 "Passphrase:">
@@ -50,19 +50,19 @@
 <!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;, &quot;Mobile&quot;"> 
 
 <!ENTITY data.description                 "Please select the browser settings and metadata you would like to backup and synchronize to a Weave server.">
 <!ENTITY bookmarks.label                  "Bookmarks">
 <!ENTITY history.label                    "Browsing History">
 <!ENTITY cookies.label                    "Cookies">
-<!ENTITY passwords.label                  "Saved Passwords">
+<!ENTITY passwords.label                  "Saved Passwords [experimental]">
 <!ENTITY tabs.label                       "Tabs">
-<!ENTITY formdata.label                   "Saved Form Data">
+<!ENTITY formdata.label                   "Saved Form Data [experimental]">
 
 <!ENTITY captcha.label                    "Type the characters you see in the image below:">
 <!ENTITY reloadCaptcha.text               "Reload">
 <!ENTITY captchaHint.label                "Letters are not case-sensitive, spaces are optional.">
 
 <!ENTITY terms.label                      "Terms of Service">
 <!ENTITY acceptTerms.label                "I agree to the ">
 <!ENTITY acceptTerms.link                 "Weave Terms of Service">
--- a/services/sync/locales/en-US/wizard.properties
+++ b/services/sync/locales/en-US/wizard.properties
@@ -1,12 +1,14 @@
 verify-progress.label           = Verifying username and password
 verify-error.label              = Invalid username and password
 verify-success.label            = Username and password verified
-
+passphrase-progress.label       = Verifying passphrase
+passphrase-success.label        = Passphrase verified
+passphrase-error.label          = Invalid passphrase
 
 serverError.label               = Server Error 
 serverTimeoutError.label        = Server Timeout 
 
 
 createUsername-progress.label   = Checking username
 createUsername-error.label      = %S is already taken. Please choose another.
 createUsername-success.label    = %S is available.