[PATCH 3/3] Add login by email address and revise some messages to the user in Savane

[Andrea G. Monaco]

 frontend/php/account/register.php |  2 +-
 frontend/php/include/account.php  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/php/account/register.php 
b/frontend/php/account/register.php
index 5116ab4..882d5cc 100644
--- a/frontend/php/account/register.php
+++ b/frontend/php/account/register.php
@@ -262,7 +262,7 @@ else
           .'</span>'."<br />\n".'&nbsp;&nbsp;';
     print form_input("text", "form_loginname", $form_loginname);
     print '<p><span class="preinput">'.account_password_help().'</span></p>';
-    print '<p><span class="preinput">'._("Password / passphrase:")
+    print '<p><span class="preinput">'._("Password or passphrase:")
            .'</span><br />&nbsp;&nbsp;';
     print form_input("password", "form_pw", $form_pw);
     print "</p>\n";
diff --git a/frontend/php/include/account.php b/frontend/php/include/account.php
index c64c6ef..83bc989 100644
--- a/frontend/php/include/account.php
+++ b/frontend/php/include/account.php
@@ -107,8 +107,8 @@ function account_password_help()
 {
   global $use_pwqcheck, $pwqcheck_args;
   $help =
-_("Note: The password should be long enough
-or containing multiple character classes:
+_("The password should be long enough
+or contain multiple character classes:
 symbols, digits (0-9), upper and lower case letters.");
   if ($use_pwqcheck)
     {
@@ -136,15 +136,15 @@ function account_pwvalid ($newpass, $oldpass = '', $user 
= '')
       $check = 0;
 # TRANSLATORS: this string in used in the context "Bad password (%s)".
       if (strlen($newpass) < 7)
-        $check = _('way too short');
+        $check = _('The password is too short.');
       elseif (stristr($oldpass, $newpass)
               || (strlen($oldpass) >= 4 && stristr($newpass, $oldpass)))
 # TRANSLATORS: this string in used in the context "Bad password (%s)".
-        $check = _('based on the old one');
+        $check = _('The password is based on the old one.');
       elseif (stristr($user, $newpass)
               || (strlen($user) >= 4 && stristr($newpass, $user)))
 # TRANSLATORS: this string in used in the context "Bad password (%s)".
-        $check = _('based on the username');
+        $check = _('The password is based on the username.');
     }
 
   if ($check !== 0)
-- 
2.20.1