Bug 103439 : Correctly use noun/verb forms of Login/Log In and Logout/Log Out where appropriate

Patch by Shane H. W. Travis <travis@sedsystems.ca>   r=myk  a=myk

4 files changed, 6 insertions, 6 deletions

diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index 0970cd9d0..0370aa296 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -31,7 +31,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl
-  title = "Login",
+  title = "Log in to $terms.Bugzilla",
   onload = "document.forms['login'].Bugzilla_login.focus()"
 %]
 
@@ -90,11 +90,11 @@
   [% PROCESS "global/hidden-fields.html.tmpl"
      exclude="^Bugzilla_(login|password|restrictlogin)$" %]
 
-  <input type="submit" name="GoAheadAndLogIn" value="Login">
+  <input type="submit" name="GoAheadAndLogIn" value="Log in">
   
   <p>
     (Note: you should make sure cookies are enabled for this site. 
-    Otherwise, you will frequently be required to re-login.)
+    Otherwise, you will be required to log in frequently.)
   </p>
 </form>
 
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index d7f6be6f7..e0d941372 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -69,7 +69,7 @@ function addSidebar() {
 [% IF user.id %]
     <li id="userprefs"><a href="userprefs.cgi">Change password or user preferences</a></li>
   [% IF user.get_flag('can_logout') %]
-    <li id="logout"><a href="relogin.cgi">Logout [% user.login FILTER html %]</a></li>
+    <li id="logout"><a href="relogin.cgi">Log out [% user.login FILTER html %]</a></li>
   [% END %]
 [% ELSE %]
     <li id="login"><a href="index.cgi?GoAheadAndLogIn=1">Log in to an existing account</a></li>
diff --git a/template/en/default/pages/bug-writing.html.tmpl b/template/en/default/pages/bug-writing.html.tmpl
index c007b043b..d2bf81e26 100644
--- a/template/en/default/pages/bug-writing.html.tmpl
+++ b/template/en/default/pages/bug-writing.html.tmpl
@@ -113,7 +113,7 @@
 
     <li>Select the product that you've found a [% terms.bug %] in.</li>
 
-    <li>Enter your e-mail address, password, and press the "Login" button.
+    <li>Enter your e-mail address, password, and press the "Log in" button.
     (If you don't yet have a password, leave the password field empty, and
     press the "E-mail me a password" button instead. You'll quickly receive
     an e-mail message with your password.)</li>
diff --git a/template/en/default/sidebar.xul.tmpl b/template/en/default/sidebar.xul.tmpl
index b285cac56..b04aa08dc 100644
--- a/template/en/default/sidebar.xul.tmpl
+++ b/template/en/default/sidebar.xul.tmpl
@@ -96,7 +96,7 @@ function normal_keypress_handler( aEvent ) {
       <text class="text-link" onclick="load_relative_url('sanitycheck.cgi')" value="sanity check"/>
   [%- END %]
   [%- IF user.get_flag('can_logout') %]
-      <text class="text-link" onclick="load_relative_url('relogin.cgi')" value="logout [% user.login FILTER html %]"/>
+      <text class="text-link" onclick="load_relative_url('relogin.cgi')" value="log out [% user.login FILTER html %]"/>
   [%- END %]
       <separator class="thin"/>
   [%- IF user.showmybugslink %]