From 5f34a40dd6481c1ac64f78fac6af85fe38f990f0 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 1 Sep 2006 00:01:33 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=11055
---
 checkin_notes                      | 9 +++++++++
 clientgui/AccountInfoPage.cpp      | 4 ++--
 clientgui/ValidateEmailAddress.cpp | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index e25c9f0e15..3f5688cbf5 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9616,3 +9616,12 @@ Rom    31 Aug 2006
         AccountInfoPage.cpp
         AccountManagerPropertiesPage.cpp, .h
         ProjectPropertiesPage.cpp
+
+David  31 Aug 2006
+	- manager: say "choose password" only if user is picking new password.
+		otherwise say "enter password".
+	- manager: if user leaves email address blank,
+		ask for email address, not account key
+
+    clientgui/
+        AccountInfoPage.cpp
diff --git a/clientgui/AccountInfoPage.cpp b/clientgui/AccountInfoPage.cpp
index 076dfeab57..cec281fbdf 100644
--- a/clientgui/AccountInfoPage.cpp
+++ b/clientgui/AccountInfoPage.cpp
@@ -457,13 +457,13 @@ void CAccountInfoPage::OnPageChanging( wxWizardExEvent& event )
         if (strPassword.Length() < iMinLength) {
             if (IS_ATTACHTOPROJECTWIZARD()) {
                 strMessage.Printf(
-                    _("The minimum password length for this project is %d. Please choose a different password."),
+                    _("The minimum password length for this project is %d. Please enter a different password."),
                     iMinLength
                 );
             }
             if (IS_ACCOUNTMANAGERWIZARD()) {
                 strMessage.Printf(
-                    _("The minimum password length for this account manager is %d. Please choose a different password."),
+                    _("The minimum password length for this account manager is %d. Please enter a different password."),
                     iMinLength
                 );
             }
diff --git a/clientgui/ValidateEmailAddress.cpp b/clientgui/ValidateEmailAddress.cpp
index 67770e5b0f..e83054848b 100644
--- a/clientgui/ValidateEmailAddress.cpp
+++ b/clientgui/ValidateEmailAddress.cpp
@@ -75,7 +75,7 @@ bool CValidateEmailAddress::Validate(wxWindow *parent) {
 
     if (val.Length() == 0) {
         ok = FALSE;
-        m_errormsg = _("Please specify an account key to continue.");
+        m_errormsg = _("Please specify an email address");
     } else if (!reEmail.Matches(val)) {
         ok = FALSE;
         m_errormsg = _("Invalid email address; please enter a valid email address");