* Removed inconsistent hard coding of colons

* Reworded the tips a little
* Removed enotif related message which is not referenced anywhere in trunk

diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 2c63560..92c0ef0 100644 (file)
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -33,7 +33,7 @@ class UserloginTemplate extends QuickTemplate {
        <?php if( @$this->haveData( 'languages' ) ) { ?><div id="languagelinks"><p><?php $this->html( 'languages' ); ?></p></div><?php } ?>
        <table>
                <tr>
-                       <td align='right'><label for='wpName1'><?php $this->msg('yourname') ?>:</label></td>
+                       <td align='right'><label for='wpName1'><?php $this->msg('yourname') ?></label></td>
                        <td align='left'>
                                <input type='text' class='loginText' name="wpName" id="wpName1"
                                        tabindex="1"
@@ -41,7 +41,7 @@ class UserloginTemplate extends QuickTemplate {
                        </td>
                </tr>
                <tr>
-                       <td align='right'><label for='wpPassword1'><?php $this->msg('yourpassword') ?>:</label></td>
+                       <td align='right'><label for='wpPassword1'><?php $this->msg('yourpassword') ?></label></td>
                        <td align='left'>
                                <input type='password' class='loginPassword' name="wpPassword" id="wpPassword1"
                                        tabindex="2"
@@ -55,7 +55,7 @@ class UserloginTemplate extends QuickTemplate {
                }
        ?>
                <tr>
-                       <td align='right'><?php $this->msg( 'yourdomainname' ) ?>:</td>
+                       <td align='right'><?php $this->msg( 'yourdomainname' ) ?></td>
                        <td align='left'>
                                <select name="wpDomain" value="<?php $this->text( 'domain' ) ?>"
                                        tabindex="3">
@@ -117,7 +117,7 @@ class UsercreateTemplate extends QuickTemplate {
        <?php if( @$this->haveData( 'languages' ) ) { ?><div id="languagelinks"><p><?php $this->html( 'languages' ); ?></p></div><?php } ?>
        <table>
                <tr>
-                       <td align='right'><label for='wpName2'><?php $this->msg('yourname') ?>:</label></td>
+                       <td align='right'><label for='wpName2'><?php $this->msg('yourname') ?></label></td>
                        <td align='left'>
                                <input type='text' class='loginText' name="wpName" id="wpName2"
                                        tabindex="1"
@@ -125,7 +125,7 @@ class UsercreateTemplate extends QuickTemplate {
                        </td>
                </tr>
                <tr>
-                       <td align='right'><label for='wpPassword2'><?php $this->msg('yourpassword') ?>:</label></td>
+                       <td align='right'><label for='wpPassword2'><?php $this->msg('yourpassword') ?></label></td>
                        <td align='left'>
                                <input type='password' class='loginPassword' name="wpPassword" id="wpPassword2"
                                        tabindex="2"
@@ -139,7 +139,7 @@ class UsercreateTemplate extends QuickTemplate {
                }
        ?>
                <tr>
-                       <td align='right'><?php $this->msg( 'yourdomainname' ) ?>:</td>
+                       <td align='right'><?php $this->msg( 'yourdomainname' ) ?></td>
                        <td align='left'>
                                <select name="wpDomain" value="<?php $this->text( 'domain' ) ?>"
                                        tabindex="3">
@@ -149,7 +149,7 @@ class UsercreateTemplate extends QuickTemplate {
                </tr>
        <?php } ?>
                <tr>
-                       <td align='right'><label for='wpRetype'><?php $this->msg('yourpasswordagain') ?>:</label></td>
+                       <td align='right'><label for='wpRetype'><?php $this->msg('yourpasswordagain') ?></label></td>
                        <td align='left'>
                                <input type='password' class='loginPassword' name="wpRetype" id="wpRetype"
                                        tabindex="4"

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 8e77ef4..6c091a3 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -799,11 +799,11 @@ your browser cache.',
 Your account has been created. Don't forget to change your {{SITENAME}} preferences.",
 
 'loginpagetitle' => 'User login',
-'yourname'             => 'Username',
-'yourpassword' => 'Password',
-'yourpasswordagain' => 'Retype password',
+'yourname'             => 'Username:',
+'yourpassword' => 'Password:',
+'yourpasswordagain' => 'Retype password:',
 'remembermypassword'   => 'Remember my login on this computer',
-'yourdomainname'       => 'Your domain',
+'yourdomainname'       => 'Your domain:',
 'externaldberror'      => 'There was either an external authentication database error or you are not allowed to update your external account.',
 'loginproblem' => '<b>There has been a problem with your login.</b><br />Try again!',
 'alreadyloggedin' => "<strong>User $1, you are already logged in!</strong><br />",
@@ -831,10 +831,9 @@ Your account has been created. Don't forget to change your {{SITENAME}} preferen
 'yournick'             => 'Nickname:',
 'badsig'               => 'Invalid raw signature; check HTML tags.',
 'email'                        => 'E-mail',
-'prefs-help-email-enotif' => 'This address is also used to send you e-mail notifications if you enabled the options.',
-'prefs-help-realname'  => 'Optional: if you choose to provide it this will be used for giving you attribution for your work.',
+'prefs-help-realname'  => 'Real name is optional and if you choose to provide it this will be used for giving you attribution for your work.',
 'loginerror'   => 'Login error',
-'prefs-help-email'      => 'Optional: Enables others to contact you through your user or user_talk page without needing to reveal your identity.',
+'prefs-help-email'      => 'E-mail address is optional, but it enables others to contact you through your user or user_talk page without needing to reveal your identity.',
 'nocookiesnew' => 'The user account was created, but you are not logged in. {{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them, then log in with your new username and password.',
 'nocookieslogin'       => '{{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them and try again.',
 'noname'               => 'You have not specified a valid user name.',