diff -r 2f6f6f7551ca -r 32102edaa81b web/wp-admin/edit-tag-form.php
--- a/web/wp-admin/edit-tag-form.php	Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-admin/edit-tag-form.php	Mon Nov 19 18:26:13 2012 +0100
@@ -10,20 +10,25 @@
 if ( !defined('ABSPATH') )
 	die('-1');
 
-if ( !current_user_can('manage_categories') )
-	wp_die(__('You do not have sufficient permissions to edit tags for this blog.'));
-
 if ( empty($tag_ID) ) { ?>
-	<div id="message" class="updated fade"><p><strong><?php _e('A tag was not selected for editing.'); ?></strong></p></div>
+	<div id="message" class="updated"><p><strong><?php _e( 'You did not select an item for editing.' ); ?></strong></p></div>
 <?php
 	return;
 }
 
-do_action('edit_tag_form_pre', $tag); ?>
+// Back compat hooks
+if ( 'category' == $taxonomy )
+	do_action('edit_category_form_pre', $tag );
+elseif ( 'link_category' == $taxonomy )
+	do_action('edit_link_category_form_pre', $tag );
+else
+	do_action('edit_tag_form_pre', $tag);
+
+do_action($taxonomy . '_pre_edit_form', $tag, $taxonomy); ?>
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php _e('Edit Tag'); ?></h2>
+<h2><?php echo $tax->labels->edit_item; ?></h2>
 <div id="ajax-response"></div>
 <form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">
 <input type="hidden" name="action" value="editedtag" />
@@ -32,22 +37,57 @@
 <?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?>
 	<table class="form-table">
 		<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 if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" /></td>
+			<th scope="row" valign="top"><label for="name"><?php _ex('Name', 'Taxonomy Name'); ?></label></th>
+			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
+			<p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
 		</tr>
+<?php if ( !global_terms_enabled() ) { ?>
 		<tr class="form-field">
-			<th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th>
+			<th scope="row" valign="top"><label for="slug"><?php _ex('Slug', 'Taxonomy Slug'); ?></label></th>
 			<td><input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo esc_attr(apply_filters('editable_slug', $tag->slug)); ?>" size="40" />
-            <p class="description"><?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.'); ?></p></td>
+			<p class="description"><?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.'); ?></p></td>
 		</tr>
+<?php } ?>
+<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
+		<tr class="form-field">
+			<th scope="row" valign="top"><label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label></th>
+			<td>
+				<?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'name' => 'parent', 'orderby' => 'name', 'taxonomy' => $taxonomy, 'selected' => $tag->parent, 'exclude_tree' => $tag->term_id, 'hierarchical' => true, 'show_option_none' => __('None'))); ?>
+				<?php if ( 'category' == $taxonomy ) : ?>
+				<p class="description"><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
+				<?php endif; ?>
+			</td>
+		</tr>
+<?php endif; // is_taxonomy_hierarchical() ?>
 		<tr class="form-field">
-			<th scope="row" valign="top"><label for="description"><?php _e('Description') ?></label></th>
-			<td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo esc_html($tag->description); ?></textarea><br />
-            <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
+			<th scope="row" valign="top"><label for="description"><?php _ex('Description', 'Taxonomy Description'); ?></label></th>
+			<td><textarea name="description" id="description" rows="5" cols="50" class="large-text"><?php echo $tag->description; // textarea_escaped ?></textarea><br />
+			<span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
 		</tr>
-		<?php do_action('edit_tag_form_fields', $tag); ?>
+		<?php
+		// Back compat hooks
+		if ( 'category' == $taxonomy )
+			do_action('edit_category_form_fields', $tag);
+		elseif ( 'link_category' == $taxonomy )
+			do_action('edit_link_category_form_fields', $tag);
+		else
+			do_action('edit_tag_form_fields', $tag);
+
+		do_action($taxonomy . '_edit_form_fields', $tag, $taxonomy);
+		?>
 	</table>
-<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php esc_attr_e('Update Tag'); ?>" /></p>
-<?php do_action('edit_tag_form', $tag); ?>
+<?php
+// Back compat hooks
+if ( 'category' == $taxonomy )
+	do_action('edit_category_form', $tag);
+elseif ( 'link_category' == $taxonomy )
+	do_action('edit_link_category_form', $tag);
+else
+	do_action('edit_tag_form', $tag);
+
+do_action($taxonomy . '_edit_form', $tag, $taxonomy);
+
+submit_button( __('Update') );
+?>
 </form>
 </div>