Ticket #20294: 20294.2.diff

wp-admin/user-new.php

@@ -341 +341 @@
         </tr>
 <?php if ( apply_filters('show_password_fields', true) ) : ?>
         <tr class="form-field form-required">
-                <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php /* translators: password input field */_e('(twice, required)'); ?></span></label></th>
+                <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php /* translators: password input field */_e('(required)'); ?></span></label></th>
                 <td><input name="pass1" type="password" id="pass1" autocomplete="off" />
-                <br />
+                </td>
+        </tr>
+        <tr>
+                <th scope="row"><label for="pass2"><?php _e('Repeat Password'); ?> <span class="description"><?php /* translators: password input field */_e('(required)'); ?></span></label></th>
+                <td scope="row">
                 <input name="pass2" type="password" id="pass2" autocomplete="off" />
                 <br />
                 <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>

wp-admin/user-edit.php

@@ -378 +378 @@
 <tr id="password">
         <th><label for="pass1"><?php _e('New Password'); ?></label></th>
         <td><input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("If you would like to change the password type a new one. Otherwise leave this blank."); ?></span><br />
-                <input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("Type your new password again."); ?></span><br />
+                <input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" /> <label class="description" for="pass2"><?php _e("Type your new password again."); ?></label><br />
                 <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
                 <p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
         </td>

wp-admin/css/wp-admin.css

@@ -3466 +3466 @@
 p.help,
 p.description,
 span.description,
+label.description,
 .form-wrap p {
         font-size: 12px;
         font-style: italic;
@@ -8270 +8271 @@
 .locale-zh-cn p.help,
 .locale-zh-cn p.description,
 .locale-zh-cn span.description,
+.locale-zh-cn label.description,
 .locale-zh-cn .form-wrap p {
         font-style: normal;
 }