Index: edit-link-form.php
===================================================================
--- edit-link-form.php	(revision 5083)
+++ edit-link-form.php	(working copy)
@@ -1,11 +1,11 @@
 <?php
 if ( ! empty($link_id) ) {
-	$heading = __('Edit Link');
+	$heading = __('Edit Bookmark');
 	$submit_text = __('Save Changes &raquo;');
 	$form = '<form name="editlink" id="editlink" method="post" action="link.php">';
 	$nonce_action = 'update-bookmark_' . $link_id;
 } else {
-	$heading = __('Add Link');
+	$heading = __('Add Bookmark');
 	$submit_text = __('Add Link &raquo;');
 	$form = '<form name="addlink" id="addlink" method="post" action="link.php">';
 	$nonce_action = 'add-bookmark';
Index: link-add.php
===================================================================
--- link-add.php	(revision 5083)
+++ link-add.php	(working copy)
@@ -1,11 +1,11 @@
 <?php
 require_once('admin.php');
 
-$title = __('Add Link');
-$this_file = 'link-manager.php';
-$parent_file = 'link-manager.php';
+$title = __('Add Bookmark');
+$this_file = 'link-add.php';
+$parent_file = 'edit.php';
+$submenu_file = 'link-manager.php';
 
-
 wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image',
 	'description', 'visible', 'target', 'category', 'link_id',
 	'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
Index: link-import.php
===================================================================
--- link-import.php	(revision 5083)
+++ link-import.php	(working copy)
@@ -3,9 +3,10 @@
 // Copyright (C) 2002 Mike Little -- mike@zed1.com
 
 require_once('admin.php');
-$parent_file = 'link-manager.php';
 $title = __('Import Blogroll');
 $this_file = 'link-import.php';
+$parent_file = 'edit.php';
+$submenu_file = 'link-import.php';
 
 $step = $_POST['step'];
 if (!$step) $step = 0;
@@ -22,7 +23,7 @@
 
 <div class="wrap">
 
-<h2><?php _e('Import your blogroll from another system') ?> </h2>
+<h2><?php _e('Import your bookmarks from another system') ?> </h2>
 <form enctype="multipart/form-data" action="link-import.php" method="post" name="blogroll">
 <?php wp_nonce_field('import-bookmarks') ?>
 
@@ -42,7 +43,7 @@
 
 </div>
 
-<p style="clear: both; margin-top: 1em;"><?php _e('Now select a category you want to put these links in.') ?><br />
+<p style="clear: both; margin-top: 1em;"><?php _e('Now select a category you want to put these bookmarks in.') ?><br />
 <?php _e('Category:') ?> <select name="cat_id">
 <?php
 $categories = get_categories('hide_empty=0');
Index: link-manager.php
===================================================================
--- link-manager.php	(revision 5083)
+++ link-manager.php	(working copy)
@@ -16,12 +16,15 @@
 if (empty ($order_by))
 	$order_by = 'order_name';
 
-$title = __('Manage Blogroll');
-$this_file = $parent_file = 'link-manager.php';
+$title = __('Bookmarks');
+$this_file = 'link-manager.php';
+$parent_file = 'edit.php';
+$submenu_file = 'link-manager.php';
+
 include_once ("./admin-header.php");
 
 if (!current_user_can('manage_links'))
-	wp_die(__("You do not have sufficient permissions to edit the links for this blog."));
+	wp_die(__("You do not have sufficient permissions to edit the Bookmarks for this blog."));
 
 switch ($order_by) {
 	case 'order_id' :
@@ -65,15 +68,15 @@
 if ( isset($_GET['deleted']) ) {
 	echo '<div style="background-color: rgb(207, 235, 247);" id="message" class="updated fade"><p>';
 	$deleted = (int) $_GET['deleted'];
-	printf(__ngettext('%s link deleted.', '%s links deleted', $deleted), $deleted);
+	printf(__ngettext('%s bookmark deleted.', '%s bookmarks deleted', $deleted), $deleted);
 	echo '</p></div>';
 }
 ?>
 
 <div class="wrap">
 
-<h2><?php _e('Blogroll Management'); ?></h2>
-<p><?php _e('Here you <a href="link-add.php">add links</a> 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>
+<h2><?php _e('Bookmark Management'); ?></h2>
+<p><?php _e('Here you <a href="link-add.php">add bookmarks</a> to sites that you visit often and share them on your blog. When you have a list of bookmarks in your sidebar to other blogs, it&#8217;s called a &#8220;blogroll.&#8221;'); ?></p>
 <form id="cats" method="get" action="">
 <p><?php
 $categories = get_categories("hide_empty=1&type=link");
@@ -84,13 +87,13 @@
 $select_cat .= "</select>\n";
 
 $select_order = "<select name=\"order_by\">\n";
-$select_order .= '<option value="order_id"' . (($order_by == 'order_id') ? " selected='selected'" : '') . '>' .  __('Link ID') . "</option>\n";
+$select_order .= '<option value="order_id"' . (($order_by == 'order_id') ? " selected='selected'" : '') . '>' .  __('Bookmark ID') . "</option>\n";
 $select_order .= '<option value="order_name"' . (($order_by == 'order_name') ? " selected='selected'" : '') . '>' .  __('Name') . "</option>\n";
 $select_order .= '<option value="order_url"' . (($order_by == 'order_url') ? " selected='selected'" : '') . '>' .  __('Address') . "</option>\n";
 $select_order .= '<option value="order_rating"' . (($order_by == 'order_rating') ? " selected='selected'" : '') . '>' .  __('Rating') . "</option>\n";
 $select_order .= "</select>\n";
 
-printf(__('Currently showing %1$s links ordered by %2$s'), $select_cat, $select_order);
+printf(__('Currently showing %1$s Bookmarks ordered by %2$s'), $select_cat, $select_order);
 ?>
 <input type="submit" name="action" value="<?php _e('Update &raquo;') ?>" /></p>
 </form>
@@ -195,7 +198,7 @@
 
 <div id="ajax-response"></div>
 
-<p class="submit"><input type="submit" class="button" name="deletebookmarks" id="deletebookmarks" value="<?php _e('Delete Checked Links') ?> &raquo;" onclick="return confirm('<?php echo js_escape(__("You are about to delete these links permanently.\n'Cancel' to stop, 'OK' to delete.")); ?>')" /></p>
+<p class="submit"><input type="submit" class="button" name="deletebookmarks" id="deletebookmarks" value="<?php _e('Delete Checked Bookmarks') ?> &raquo;" onclick="return confirm('<?php echo js_escape(__("You are about to delete these Bookmarks permanently.\n'Cancel' to stop, 'OK' to delete.")); ?>')" /></p>
 </form>
 
 <?php } ?>
Index: menu.php
===================================================================
--- menu.php	(revision 5083)
+++ menu.php	(working copy)
@@ -16,7 +16,6 @@
 	$menu[10] = array(__('Manage'), 'edit_posts', 'edit.php');
 
 $menu[15] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
-$menu[20] = array(__('Blogroll'), 'manage_links', 'link-manager.php');
 $menu[25] = array(__('Presentation'), 'switch_themes', 'themes.php');
 $menu[30] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
 if ( current_user_can('edit_users') )
@@ -40,12 +39,11 @@
 $submenu['edit.php'][12] = array(__('Uploads'), 'upload_files', 'upload.php');
 $submenu['edit.php'][15] = array(__('Categories'), 'manage_categories', 'categories.php');
 $submenu['edit.php'][30] = array(__('Files'), 'edit_files', 'templates.php');
+$submenu['edit.php'][32] = array(__('Bookmarks'), 'manage_links', 'link-manager.php');
 $submenu['edit.php'][35] = array(__('Import'), 'import', 'import.php');
 $submenu['edit.php'][40] = array(__('Export'), 'import', 'export.php');
+$submenu['edit.php'][45] = array(__('Import Bookmarks'), 'manage_links', 'link-import.php');
 
-$submenu['link-manager.php'][5] = array(__('Manage Blogroll'), 'manage_links', 'link-manager.php');
-$submenu['link-manager.php'][10] = array(__('Add Link'), 'manage_links', 'link-add.php');
-$submenu['link-manager.php'][20] = array(__('Import Links'), 'manage_links', 'link-import.php');
 
 if ( current_user_can('edit_users') ) {
 	$_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.