From 49ae4dd579c6fa73805872b3cfc3489944c18c54 Mon Sep 17 00:00:00 2001
From: Maria Emerson <memerson@mozilla.com>
Date: Mon, 30 Jun 2008 18:00:55 -0700
Subject: [PATCH] reverted back to original weave logo, increased wizard height
 for linux problem, added passphrase verification

---
 services/sync/locales/en-US/wizard.dtd        | 8 ++++----
 services/sync/locales/en-US/wizard.properties | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/services/sync/locales/en-US/wizard.dtd b/services/sync/locales/en-US/wizard.dtd
index 6b4fd06be1b..03e56e7ec02 100644
--- a/services/sync/locales/en-US/wizard.dtd
+++ b/services/sync/locales/en-US/wizard.dtd
@@ -1,6 +1,6 @@
 <!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.">
@@ -14,7 +14,7 @@
 <!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.">
@@ -55,9 +55,9 @@
 <!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">
diff --git a/services/sync/locales/en-US/wizard.properties b/services/sync/locales/en-US/wizard.properties
index 549d1ff2feb..7deabb6b584 100644
--- a/services/sync/locales/en-US/wizard.properties
+++ b/services/sync/locales/en-US/wizard.properties
@@ -1,7 +1,9 @@
 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