From fb58d06f1ca37dc5d850384d6d4f5e4b12da6116 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Sun, 11 Sep 2011 17:52:46 +0000
Subject: [PATCH] Rename 'Post Tags' to 'Tags'. props scribu, fixes #17683.

git-svn-id: https://develop.svn.wordpress.org/trunk@18661 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/edit-tags.php   | 4 ++--
 wp-admin/press-this.php  | 4 ++--
 wp-includes/taxonomy.php | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 12867a280c..b0e9fc55e4 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -178,7 +178,7 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t
 	elseif ( 'link_category' == $taxonomy )
 		$help = '<p>' . __( 'You can create groups of links by using link categories. Link category names must be unique and link categories are separate from the categories you use for posts.' ) . '</p>';
 	else
-		$help = '<p>' . __( 'You can assign keywords to your posts using Post Tags. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
+		$help = '<p>' . __( 'You can assign keywords to your posts using Tags. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
 
 	if ( 'link_category' == $taxonomy )
 		$help .= '<p>' . __( 'You can delete link categories in the Bulk Action pulldown, but that action does not delete the links within the category. Instead, it moves them to the default link category.' ) . '</p>';
@@ -213,7 +213,7 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t
 	elseif ( 'link_category' == $taxonomy )
 		$help .= '<p>' . __( '<a href="http://codex.wordpress.org/Links_Link_Categories_Screen" target="_blank">Documentation on Link Categories</a>' ) . '</p>';
 	else
-		$help .= '<p>' . __( '<a href="http://codex.wordpress.org/Posts_Post_Tags_Screen" target="_blank">Documentation on Post Tags</a>' ) . '</p>';
+		$help .= '<p>' . __( '<a href="http://codex.wordpress.org/Posts_Tags_Screen" target="_blank">Documentation on Tags</a>' ) . '</p>';
 
 	$help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
 
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index a1187be499..fb056a6b3a 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -524,11 +524,11 @@ var photostorage = false;
 
 			<div id="tagsdiv-post_tag" class="postbox">
 				<div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>"><br /></div>
-				<h3><span><?php _e('Post Tags'); ?></span></h3>
+				<h3><span><?php _e('Tags'); ?></span></h3>
 				<div class="inside">
 					<div class="tagsdiv" id="post_tag">
 						<div class="jaxtag">
-							<label class="screen-reader-text" for="newtag"><?php _e('Post Tags'); ?></label>
+							<label class="screen-reader-text" for="newtag"><?php _e('Tags'); ?></label>
 							<input type="hidden" name="tax_input[post_tag]" class="the-tags" id="tax-input[post_tag]" value="" />
 							<div class="ajaxtag">
 								<input type="text" name="newtag[post_tag]" class="newtag form-input-tip" size="16" autocomplete="off" value="" />
diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index cf7e0d6744..e231a6cdef 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -369,8 +369,8 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
  * Builds an object with all taxonomy labels out of a taxonomy object
  *
  * Accepted keys of the label array in the taxonomy object:
- * - name - general name for the taxonomy, usually plural. The same as and overridden by $tax->label. Default is Post Tags/Categories
- * - singular_name - name for one object of this taxonomy. Default is Post Tag/Category
+ * - name - general name for the taxonomy, usually plural. The same as and overridden by $tax->label. Default is Tags/Categories
+ * - singular_name - name for one object of this taxonomy. Default is Tag/Category
  * - search_items - Default is Search Tags/Search Categories
  * - popular_items - This string isn't used on hierarchical taxonomies. Default is Popular Tags
  * - all_items - Default is All Tags/All Categories
@@ -396,8 +396,8 @@ function get_taxonomy_labels( $tax ) {
 		$tax->labels['separate_items_with_commas'] = $tax->helps;
 
 	$nohier_vs_hier_defaults = array(
-		'name' => array( _x( 'Post Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
-		'singular_name' => array( _x( 'Post Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ),
+		'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
+		'singular_name' => array( _x( 'Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ),
 		'search_items' => array( __( 'Search Tags' ), __( 'Search Categories' ) ),
 		'popular_items' => array( __( 'Popular Tags' ), null ),
 		'all_items' => array( __( 'All Tags' ), __( 'All Categories' ) ),