more porting work

3 files changed, 8 insertions, 8 deletions

diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index 39984aeaf..14efbc367 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -73,8 +73,8 @@
             id="log_in[% qs_suffix %]">
     <script type="text/javascript">
       mini_login_constants = {
-          "login" : "login",
-          "warning" : "You must set the login and password before logging in."
+          "login" : "email address",
+          "warning" : "You must set the email address and password before logging in."
       };
       [%# We need this event to fire after autocomplete, because it does
         # something different depending on whether or not there's already
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index 80dd12153..f11c33cdc 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -37,14 +37,14 @@
 [% USE Bugzilla %]
 
 <p>
-  I need a legitimate login and password to continue.
+  I need an email address and password to continue.
 </p>
 
 <form name="login" action="[% target FILTER html %]" method="POST"
 [%- IF Bugzilla.cgi.param("data") %] enctype="multipart/form-data"[% END %]>
   <table>
     <tr>
-      <th align="right"><label for="Bugzilla_login">Login:</label></th>
+      <th align="right"><label for="Bugzilla_login">Email Address:</label></th>
       <td>
         <input size="35" id="Bugzilla_login" name="Bugzilla_login">
         [% Param('emailsuffix') FILTER html %]
@@ -64,7 +64,7 @@
         <td>
           <input type="checkbox" id="Bugzilla_remember" name="Bugzilla_remember" value="on"
                  [%+ "checked" IF Param('rememberlogin') == "defaulton" %]>
-          <label for="Bugzilla_remember">Remember my Login</label>
+          <label for="Bugzilla_remember">Remember my email address</label>
         </td>
       </tr>
     [% END %]
@@ -110,7 +110,7 @@
     <form id="forgot" method="get" action="token.cgi">
       <input type="hidden" name="a" value="reqpw">
       If you have an account, but have forgotten your password,
-      enter your login name below and submit a request
+      enter your email address below and submit a request
       to change your password.<br>
       <input size="35" name="loginname">
       <input type="submit" id="request" value="Reset Password">
diff --git a/template/en/default/account/prefs/permissions.html.tmpl b/template/en/default/account/prefs/permissions.html.tmpl
index 5e8dc9ca2..d3c787b07 100644
--- a/template/en/default/account/prefs/permissions.html.tmpl
+++ b/template/en/default/account/prefs/permissions.html.tmpl
@@ -65,9 +65,9 @@
         There are no permission bits set on your account.
       [% END %]
 
-      [% IF user.in_group('editusers') %]
+      [% IF user.in_group('admin') %]
         <br>
-        You have editusers privileges.  You can turn on and off
+        You have admin privileges.  You can turn on and off
         all permissions for all users.
       [% ELSIF set_bits.size %]
         <br>