Ticket #6362: 6362.patch

wp-admin/edit-category-form.php

@@ -26 +26 @@
         <table class="form-table">
                 <tr class="form-field form-required">
                         <th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th>
-                        <td><input name="cat_name" id="cat_name" type="text" value="<?php echo attribute_escape($category->name); ?>" size="40" aria-required="true" /><br />
-            <?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></td>
+                        <td><input name="cat_name" id="cat_name" type="text" value="<?php echo attribute_escape($category->name); ?>" size="40" aria-required="true" /></td>
                 </tr>
                 <tr class="form-field">
                         <th scope="row" valign="top"><label for="category_nicename"><?php _e('Category Slug') ?></label></th>
@@ -44 +43 @@
                 <tr class="form-field">
                         <th scope="row" valign="top"><label for="category_description"><?php _e('Description') ?></label></th>
                         <td><textarea name="category_description" id="category_description" rows="5" cols="50" style="width: 97%;"><?php echo wp_specialchars($category->description); ?></textarea><br />
-            <?php _e('The description is not prominent by default, however some themes may show it.'); ?></td>
+            <?php _e('The description is not prominent by default; however, some themes may show it.'); ?></td>
                 </tr>
         </table>
 <p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p>

wp-admin/edit-form-advanced.php

@@ -304 +304 @@
 <p><label for="comment_status" class="selectit">
 <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
 <?php _e('Allow Comments') ?></label></p>
-<p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
-<p><?php _e('These settings apply to this post only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
+<p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.') ?></label></p>
 </div>
 </div>
 
@@ -313 +312 @@
 <h3><?php _e('Password Protect This Post') ?></h3>
 <div class="inside">
 <p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
-<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p>
+<p><?php _e('Setting a password will require visitors to enter it to view this post and its comments.'); ?></p>
 </div>
 </div>
 

wp-admin/edit-link-category-form.php

@@ -30 +30 @@
                 </tr>
                 <tr class="form-field">
                         <th scope="row" valign="top"><label for="slug"><?php _e('Category slug') ?></label></th>
-                        <td><input name="slug" id="slug" type="text" value="<?php echo rawurldecode($category->slug); ?>" size="40" />
+                        <td><input name="slug" id="slug" type="text" value="<?php echo rawurldecode($category->slug); ?>" size="40" /><br />
             <?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></td>
                 </tr>
                 <tr class="form-field">
                         <th scope="row" valign="top"><label for="description"><?php _e('Description (optional)') ?></label></th>
-                        <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $category->description; ?></textarea></td>
+                        <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $category->description; ?></textarea><br />
+                        <?php _e('The description is not prominent by default; however, some themes may show it.'); ?></td>
                 </tr>
         </table>
 <p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p>

wp-admin/edit-page-form.php

@@ -216 +216 @@
 <p><label for="comment_status" class="selectit">
 <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
 <?php _e('Allow Comments') ?></label></p>
-<p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
-<p><?php _e('These settings apply to this page only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
+<p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.') ?></label></p>
 </div>
 </div>
 
@@ -225 +224 @@
 <h3><?php _e('Password Protect This Page') ?></h3>
 <div class="inside">
 <p><label class="hidden" for="post_password"><?php _e('Password Protect This Page') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
-<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this page and its comments.'); ?></p>
+<p><?php _e('Setting a password will require visitors to enter it to view this page and its comments.'); ?></p>
 </div>
 </div>
 
@@ -243 +242 @@
 <option value='0'><?php _e('Main Page (no parent)'); ?></option>
 <?php parent_dropdown($post->post_parent); ?>
 </select>
-<p><?php _e('You can arrange your pages in hierarchies, for example you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how deeply nested you can make pages.'); ?></p>
+<p><?php _e('You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how deeply nested you can make pages.'); ?></p>
 </div>
 </div>
 

wp-admin/edit-tag-form.php

@@ -27 +27 @@
                 <tr class="form-field form-required">
                         <th scope="row" valign="top"><label for="name"><?php _e('Tag name') ?></label></th>
                         <td><input name="name" id="name" type="text" value="<?php echo attribute_escape($tag->name); ?>" size="40" aria-required="true" />
-            <p><?php _e('The name is how the tag appears on your site.'); ?></p></td>
+      </td>
                 </tr>
                 <tr class="form-field">
                         <th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th>