WordPress.org
Get WordPress

Make WordPress Core

Ticket #26156: 26156.diff

File 26156.diff, 25.9 KB (added by voldemortensen, 10 years ago)

  • src/wp-admin/comment.php

     
    164164</tr>
    165165<?php if ( $comment->comment_author_email ) { ?>
    166166<tr>
    167 <th scope="row"><?php _e('E-mail'); ?></th>
     167<th scope="row"><?php _e('Email'); ?></th>
    168168<td><?php echo $comment->comment_author_email; ?></td>
    169169</tr>
    170170<?php } ?>

  • src/wp-admin/edit-form-comment.php

     
    3636        <td class="first">
    3737        <?php
    3838                if ( $comment->comment_author_email ) {
    39                         printf( __( 'E-mail (%s):' ), get_comment_author_email_link( __( 'send e-mail' ), '', '' ) );
     39                        printf( __( 'Email (%s):' ), get_comment_author_email_link( __( 'send email' ), '', '' ) );
    4040                } else {
    41                         _e( 'E-mail:' );
     41                        _e( 'Email:' );
    4242                }
    4343?></td>
    4444        <td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" id="email" /></td>

  • src/wp-admin/includes/class-wp-ms-users-list-table.php

     
    120120                        'cb'         => '<input type="checkbox" />',
    121121                        'username'   => __( 'Username' ),
    122122                        'name'       => __( 'Name' ),
    123                         'email'      => __( 'E-mail' ),
     123                        'email'      => __( 'Email' ),
    124124                        'registered' => _x( 'Registered', 'user' ),
    125125                        'blogs'      => __( 'Sites' )
    126126                );

  • src/wp-admin/includes/class-wp-users-list-table.php

     
    261261                        'cb'       => '<input type="checkbox" />',
    262262                        'username' => __( 'Username' ),
    263263                        'name'     => __( 'Name' ),
    264                         'email'    => __( 'E-mail' ),
     264                        'email'    => __( 'Email' ),
    265265                        'role'     => __( 'Role' ),
    266266                        'posts'    => __( 'Posts' )
    267267                );
    … …  
    418418                                        $r .= "<td $attributes>$user_object->first_name $user_object->last_name</td>";
    419419                                        break;
    420420                                case 'email':
    421                                         $r .= "<td $attributes><a href='mailto:$email' title='" . esc_attr( sprintf( __( 'E-mail: %s' ), $email ) ) . "'>$email</a></td>";
     421                                        $r .= "<td $attributes><a href='mailto:$email' title='" . esc_attr( sprintf( __( 'Email: %s' ), $email ) ) . "'>$email</a></td>";
    422422                                        break;
    423423                                case 'role':
    424424                                        $r .= "<td $attributes>$role_name</td>";

  • src/wp-admin/includes/schema.php

     
    874874
    875875        $site_user = get_user_by( 'email', $email );
    876876        if ( ! is_email( $email ) )
    877                 $errors->add( 'invalid_email', __( 'You must provide a valid e-mail address.' ) );
     877                $errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
    878878
    879879        if ( $errors->get_error_code() )
    880880                return $errors;

  • src/wp-admin/includes/template.php

     
    459459                </div>
    460460
    461461                <div class="inside">
    462                 <label for="author-email"><?php _e('E-mail') ?></label>
     462                <label for="author-email"><?php _e('Email') ?></label>
    463463                <input type="text" name="newcomment_author_email" size="50" value="" id="author-email" />
    464464                </div>
    465465

  • src/wp-admin/includes/user.php

     
    149149        if ( !$update && username_exists( $user->user_login ) )
    150150                $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
    151151
    152         /* checking e-mail address */
     152        /* checking email address */
    153153        if ( empty( $user->user_email ) ) {
    154                 $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
     154                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
    155155        } elseif ( !is_email( $user->user_email ) ) {
    156156                $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
    157157        } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {

  • src/wp-admin/install.php

     
    138138                </tr>
    139139                <?php endif; ?>
    140140                <tr>
    141                         <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
     141                        <th scope="row"><label for="admin_email"><?php _e( 'Your Email' ); ?></label></th>
    142142                        <td><input name="admin_email" type="email" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
    143143                        <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
    144144                </tr>
    … …  
    243243                $admin_email  = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
    244244                $public       = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
    245245
    246                 // Check e-mail address.
     246                // Check email address.
    247247                $error = false;
    248248                if ( empty( $user_name ) ) {
    249249                        // TODO: poka-yoke

  • src/wp-admin/options-discussion.php

     
    7878<tr>
    7979<th scope="row"><?php _e('Other comment settings'); ?></th>
    8080<td><fieldset><legend class="screen-reader-text"><span><?php _e('Other comment settings'); ?></span></legend>
    81 <label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail'); ?></label>
     81<label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and email'); ?></label>
    8282<br />
    8383<label for="comment_registration">
    8484<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
    … …  
    144144</fieldset></td>
    145145</tr>
    146146<tr>
    147 <th scope="row"><?php _e('E-mail me whenever'); ?></th>
    148 <td><fieldset><legend class="screen-reader-text"><span><?php _e('E-mail me whenever'); ?></span></legend>
     147<th scope="row"><?php _e('Email me whenever'); ?></th>
     148<td><fieldset><legend class="screen-reader-text"><span><?php _e('Email me whenever'); ?></span></legend>
    149149<label for="comments_notify">
    150150<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
    151151<?php _e('Anyone posts a comment'); ?> </label>
    … …  
    170170<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
    171171<p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ); ?></label></p>
    172172
    173 <p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
     173<p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
    174174<p>
    175175<textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
    176176</p>
    … …  
    179179<tr>
    180180<th scope="row"><?php _e('Comment Blacklist'); ?></th>
    181181<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
    182 <p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
     182<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
    183183<p>
    184184<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
    185185</p>
    … …  
    235235<th scope="row"><?php _e('Default Avatar'); ?></th>
    236236<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
    237237
    238 <?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their e-mail address.'); ?><br />
     238<?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their email address.'); ?><br />
    239239
    240240<?php
    241241$avatar_defaults = array(

  • src/wp-admin/options-general.php

     
    135135<p class="description"><?php _e('Enter the address here if you want your site homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></p></td>
    136136</tr>
    137137<tr>
    138 <th scope="row"><label for="admin_email"><?php _e('E-mail Address') ?> </label></th>
     138<th scope="row"><label for="admin_email"><?php _e('Email Address') ?> </label></th>
    139139<td><input name="admin_email" type="email" id="admin_email" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
    140140<p class="description"><?php _e('This address is used for admin purposes, like new user notification.') ?></p></td>
    141141</tr>
    … …  
    154154</tr>
    155155<?php } else { ?>
    156156<tr>
    157 <th scope="row"><label for="new_admin_email"><?php _e('E-mail Address') ?> </label></th>
     157<th scope="row"><label for="new_admin_email"><?php _e('Email Address') ?> </label></th>
    158158<td><input name="new_admin_email" type="email" id="new_admin_email" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
    159 <p class="description"><?php _e('This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></p>
     159<p class="description"><?php _e('This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></p>
    160160<?php
    161161$new_admin_email = get_option( 'new_admin_email' );
    162162if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
    163163<div class="updated inline">
    164 <p><?php printf( __('There is a pending change of the admin e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), esc_html( $new_admin_email ), esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
     164<p><?php printf( __('There is a pending change of the admin email to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), esc_html( $new_admin_email ), esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
    165165</div>
    166166<?php endif; ?>
    167167</td>

  • src/wp-admin/options-writing.php

     
    3333        get_current_screen()->add_help_tab( array(
    3434                'id'      => 'options-postemail',
    3535                'title'   => __( 'Post Via Email' ),
    36                 'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.' ) . '</p>',
     36                'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.' ) . '</p>',
    3737        ) );
    3838}
    3939
    … …  
    127127/** This filter is documented in wp-admin/options.php */
    128128if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
    129129?>
    130 <h3 class="title"><?php _e('Post via e-mail') ?></h3>
    131 <p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <kbd>%s</kbd>, <kbd>%s</kbd>, <kbd>%s</kbd>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
     130<h3 class="title"><?php _e('Post via email') ?></h3>
     131<p><?php printf(__('To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <kbd>%s</kbd>, <kbd>%s</kbd>, <kbd>%s</kbd>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
    132132
    133133<table class="form-table">
    134134<tr>

  • src/wp-admin/user-edit.php

     
    407407
    408408<table class="form-table">
    409409<tr class="user-email-wrap">
    410         <th><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
     410        <th><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
    411411        <td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
    412412        <?php
    413413        $new_email = get_option( $current_user->ID . '_new_email' );
    414414        if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?>
    415415        <div class="updated inline">
    416         <p><?php printf( __('There is a pending change of your e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_email['newemail'], esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) ) ); ?></p>
     416        <p><?php printf( __('There is a pending change of your email to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_email['newemail'], esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) ) ); ?></p>
    417417        </div>
    418418        <?php endif; ?>
    419419        </td>

  • src/wp-admin/user-new.php

     
    272272                echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
    273273        if ( !is_super_admin() ) {
    274274                echo '<p>' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
    275                 $label = __('E-mail');
     275                $label = __('Email');
    276276                $type  = 'email';
    277277        } else {
    278278                echo '<p>' . __( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
    279                 $label = __('E-mail or Username');
     279                $label = __('Email or Username');
    280280                $type  = 'text';
    281281        }
    282282?>
    … …  
    360360                <td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr($new_user_login); ?>" aria-required="true" /></td>
    361361        </tr>
    362362        <tr class="form-field form-required">
    363                 <th scope="row"><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
     363                <th scope="row"><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
    364364                <td><input name="email" type="email" id="email" value="<?php echo esc_attr( $new_user_email ); ?>" /></td>
    365365        </tr>
    366366<?php if ( !is_multisite() ) { ?>

  • src/wp-includes/pluggable.php

     
    14021402                        $notify_message  = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
    14031403                        /* translators: 1: comment author, 2: author IP, 3: author domain */
    14041404                        $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    1405                         $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n";
     1405                        $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
    14061406                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    14071407                        $notify_message .= sprintf( __( 'Whois: %s' ), "http://whois.arin.net/rest/ip/{$comment->comment_author_IP}" ) . "\r\n";
    14081408                        $notify_message .= sprintf( __('Comment: %s' ), $comment->comment_content ) . "\r\n\r\n";
    … …  
    15311531                        $notify_message  = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
    15321532                        $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
    15331533                        $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    1534                         $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n";
     1534                        $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
    15351535                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    15361536                        $notify_message .= sprintf( __( 'Whois: %s' ), "http://whois.arin.net/rest/ip/{$comment->comment_author_IP}" ) . "\r\n";
    15371537                        $notify_message .= sprintf( __( 'Comment: %s' ), $comment->comment_content ) . "\r\n\r\n";
    … …  
    16411641
    16421642        $message  = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n";
    16431643        $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
    1644         $message .= sprintf(__('E-mail: %s'), $user->user_email) . "\r\n";
     1644        $message .= sprintf(__('Email: %s'), $user->user_email) . "\r\n";
    16451645
    16461646        @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
    16471647

  • src/wp-includes/theme-compat/comments-popup.php

     
    6363
    6464<?php if ( comments_open() ) { ?>
    6565<h2><?php _e('Leave a comment'); ?></h2>
    66 <p><?php printf(__('Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code>%s</code>'), allowed_tags()); ?></p>
     66<p><?php printf(__('Line and paragraph breaks automatic, email address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code>%s</code>'), allowed_tags()); ?></p>
    6767
    6868<form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
    6969<?php if ( $user_ID ) : ?>
    … …  
    7676
    7777        <p>
    7878          <input type="text" name="email" id="email" value="<?php echo esc_attr( $commenter['comment_author_email'] ); ?>" size="28" tabindex="2" />
    79            <label for="email"><?php _e('E-mail'); ?></label>
     79           <label for="email"><?php _e('Email'); ?></label>
    8080        </p>
    8181
    8282        <p>

  • src/wp-includes/user.php

     
    22362236                $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
    22372237        }
    22382238
    2239         // Check the e-mail address
     2239        // Check the email address
    22402240        if ( $user_email == '' ) {
    2241                 $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your e-mail address.' ) );
     2241                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your email address.' ) );
    22422242        } elseif ( ! is_email( $user_email ) ) {
    22432243                $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ) );
    22442244                $user_email = '';

  • src/wp-login.php

     
    275275        $errors = new WP_Error();
    276276
    277277        if ( empty( $_POST['user_login'] ) ) {
    278                 $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.'));
     278                $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or email address.'));
    279279        } elseif ( strpos( $_POST['user_login'], '@' ) ) {
    280280                $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
    281281                if ( empty( $user_data ) )
    … …  
    296296                return $errors;
    297297
    298298        if ( !$user_data ) {
    299                 $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.'));
     299                $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or email.'));
    300300                return $errors;
    301301        }
    302302
    … …  
    401401        $message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data );
    402402
    403403        if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) )
    404                 wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
     404                wp_die( __('The email could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
    405405
    406406        return true;
    407407}
    … …  
    534534
    535535<form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
    536536        <p>
    537                 <label for="user_login" ><?php _e('Username or E-mail:') ?><br />
     537                <label for="user_login" ><?php _e('Username or Email:') ?><br />
    538538                <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label>
    539539        </p>
    540540        <?php
    … …  
    718718                <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr(wp_unslash($user_login)); ?>" size="20" /></label>
    719719        </p>
    720720        <p>
    721                 <label for="user_email"><?php _e('E-mail') ?><br />
     721                <label for="user_email"><?php _e('Email') ?><br />
    722722                <input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /></label>
    723723        </p>
    724724        <?php
    725725        /**
    726          * Fires following the 'E-mail' field in the user registration form.
     726         * Fires following the 'Email' field in the user registration form.
    727727         *
    728728         * @since 2.1.0
    729729         */
    730730        do_action( 'register_form' );
    731731        ?>
    732         <p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p>
     732        <p id="reg_passmail"><?php _e('A password will be emailed to you.') ?></p>
    733733        <br class="clear" />
    734734        <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
    735735        <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Register'); ?>" /></p>
    … …  
    842842                elseif  ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
    843843                        $errors->add('registerdisabled', __('User registration is currently not allowed.'));
    844844                elseif  ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
    845                         $errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message');
     845                        $errors->add('confirm', __('Check your email for the confirmation link.'), 'message');
    846846                elseif  ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
    847                         $errors->add('newpass', __('Check your e-mail for your new password.'), 'message');
     847                        $errors->add('newpass', __('Check your email for your new password.'), 'message');
    848848                elseif  ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
    849                         $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message');
     849                        $errors->add('registered', __('Registration complete. Please check your email.'), 'message');
    850850                elseif ( strpos( $redirect_to, 'about.php?updated' ) )
    851851                        $errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
    852852        }