WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@638 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 5 insertions, 4 deletions

diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index c5e2049..783c938 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -22,7 +22,7 @@ $title = __('Manage Bookmarks');
 include_once ("./admin-header.php");
 
 if (!current_user_can('manage_links'))
-	die(__("You do not have sufficient permissions to edit the bookmarks for this blog."));
+	wp_die(__("You do not have sufficient permissions to edit the bookmarks for this blog."));
 
 switch ($order_by) {
 	case 'order_id' :
@@ -73,7 +73,7 @@ if ( isset($_GET['deleted']) ) {
 
 <div class="wrap">
 
-<h2><?php _e('Bookmark Management'); ?></h2>
+<h2><?php _e('Blogroll Management'); ?></h2>
 <p><?php _e('Here you add links to sites that you visit often and share them on your blog. When you have a list of links in your sidebar to other blogs, it&#8217;s called a &#8220;blogroll.&#8221;'); ?></p>
 <form id="cats" method="get" action="">
 <p>Currently showing 
@@ -85,11 +85,11 @@ if ( isset($_GET['deleted']) ) {
 </option>
 <?php endforeach; ?>
 </select>
-bookmarks ordered by 
+links ordered by 
 <select name="order_by">
 <option value="order_id" <?php if ($order_by == 'order_id') echo " selected='selected'";?>><?php _e('Bookmark ID') ?></option>
 <option value="order_name" <?php if ($order_by == 'order_name') echo " selected='selected'";?>><?php _e('Name') ?></option>
-<option value="order_url" <?php if ($order_by == 'order_url') echo " selected='selected'";?>><?php _e('URI') ?></option>
+<option value="order_url" <?php if ($order_by == 'order_url') echo " selected='selected'";?>><?php _e('Address') ?></option>
 </select>
 <input type="submit" name="action" value="<?php _e('Update &raquo;') ?>" /></p>
 </form>
@@ -174,6 +174,7 @@ if ($links)
 <p class="submit"><input type="submit" class="button" name="deletebookmarks" id="deletebookmarks" value="<?php _e('Delete Checked Bookmarks') ?> &raquo;" onclick="return confirm('<?php _e("You are about to delete these bookmarks permanently \\n  \'Cancel\' to stop, \'OK\' to delete.") ?>')" /></p>
 </form>
 </div>
+
 <?php
 if( wp_cache_get( "checked_bookmarks_table", "options" ) == false ) {
 	$results = $wpdb->get_results( "SELECT link_id, category_id, count( * ) AS c FROM {$wpdb->link2cat} GROUP BY link_id, category_id" );