From c3399d64d7660cc1f869e2d189c31b04cab74943 Mon Sep 17 00:00:00 2001
From: Dan Mills <thunder@mozilla.com>
Date: Wed, 26 Dec 2007 14:56:52 -0800
Subject: [PATCH] Bug 409601: Ask for an email instead of a username (since
 Weave usernames are email addresses)

---
 services/sync/locales/en-US/login.dtd  | 2 +-
 services/sync/locales/en-US/wizard.dtd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/sync/locales/en-US/login.dtd b/services/sync/locales/en-US/login.dtd
index ea6df3f84f0b..501b5bb33b67 100644
--- a/services/sync/locales/en-US/login.dtd
+++ b/services/sync/locales/en-US/login.dtd
@@ -1,6 +1,6 @@
 <!ENTITY dialog.title                 "Mozilla Services Login">
 <!ENTITY dialog.label                 "Sign in to Weave from this computer.">
-<!ENTITY username.label               "Username:">
+<!ENTITY username.label               "Email:">
 <!ENTITY password.label               "Password:">
 <!ENTITY encryptionPassphrase.label   "Encryption Passphrase:">
 <!ENTITY savePassword.label           "Save password on this computer">
diff --git a/services/sync/locales/en-US/wizard.dtd b/services/sync/locales/en-US/wizard.dtd
index 97fa48455b20..592339da5d9a 100644
--- a/services/sync/locales/en-US/wizard.dtd
+++ b/services/sync/locales/en-US/wizard.dtd
@@ -16,7 +16,7 @@
 <!ENTITY step3.counter                    "Step 3 of 5">
 <!ENTITY step3.title                      "Account Details">
 <!ENTITY step3.description                "Please enter the Weave account details and click the &quot;Verify&quot; button to validate before proceeding.">
-<!ENTITY username.label                   "Username:">
+<!ENTITY username.label                   "Email:">
 <!ENTITY password.label                   "Password:">
 <!ENTITY encryptionPassphrase.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 encryptionPassphrase.label       "Encryption Passphrase:">