diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index d72c5955e5..9687594b68 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -4,7 +4,7 @@
 
 require_once('../wp-config.php');
 
-$title = 'Manage Links';
+$title = __('Manage Links');
 $this_file = 'link-manager.php';
 
 function xfn_check($class, $value = '', $type = 'check') {
@@ -87,7 +87,7 @@ switch ($action) {
 
     // check the current user's level first.
     if ($user_level < get_settings('links_minadminlevel'))
-      die ("Cheatin' uh ?");
+      die (__("Cheatin' uh ?"));
 
     //for each link id (in $linkcheck[]): if the current user level >= the
     //userlevel of the owner of the link then we can proceed.
@@ -118,7 +118,7 @@ switch ($action) {
 
     // check the current user's level first.
     if ($user_level < get_settings('links_minadminlevel'))
-      die ("Cheatin' uh ?");
+      die (__("Cheatin' uh ?"));
 
     //for each link id (in $linkcheck[]): toggle the visibility
     if (count($linkcheck) == 0) {
@@ -155,7 +155,7 @@ switch ($action) {
     include_once('admin-header.php');
     // check the current user's level first.
     if ($user_level < get_settings('links_minadminlevel'))
-      die ("Cheatin' uh ?");
+      die (__("Cheatin' uh ?"));
 
     //for each link id (in $linkcheck[]) change category to selected value
     if (count($linkcheck) == 0) {
@@ -189,7 +189,7 @@ switch ($action) {
     $auto_toggle = get_autotoggle($link_category);
 
     if ($user_level < get_settings('links_minadminlevel'))
-      die ("Cheatin' uh ?");
+      die (__("Cheatin' uh ?"));
 
     // if we are in an auto toggle category and this one is visible then we
     // need to make the others invisible before we add this new one.
@@ -237,7 +237,7 @@ switch ($action) {
       $auto_toggle = get_autotoggle($link_category);
 
       if ($user_level < get_settings('links_minadminlevel'))
-        die ("Cheatin' uh ?");
+        die (__("Cheatin' uh ?"));
 
       // if we are in an auto toggle category and this one is visible then we
       // need to make the others invisible before we update this one.
@@ -268,7 +268,7 @@ switch ($action) {
     $link_id = $_GET["link_id"];
 
     if ($user_level < get_settings('links_minadminlevel'))
-      die ("Cheatin' uh ?");
+      die (__("Cheatin' uh ?"));
 
     $wpdb->query("DELETE FROM $tablelinks WHERE link_id = $link_id");
 
@@ -290,7 +290,7 @@ switch ($action) {
     $standalone=0;
     include_once ('admin-header.php');
     if ($user_level < get_settings('links_minadminlevel')) {
-      die('You have do not have sufficent permissions to edit the links for this blog.');
+      die(__('You have do not have sufficent permissions to edit the links for this blog.'));
     }
 
     $row = $wpdb->get_row("SELECT * 
@@ -313,94 +313,94 @@ switch ($action) {
 
 ?>
 <ul id="adminmenu2"> 
-  <li><a href="link-manager.php" class="current">Manage Links</a></li> 
-  <li><a href="link-add.php">Add Link</a></li> 
-  <li><a href="link-categories.php">Link Categories</a></li> 
-  <li class="last"><a href="link-import.php">Import Blogroll</a></li> 
+  <li><a href="link-manager.php" class="current"><?php _e('Manage Links') ?></a></li> 
+  <li><a href="link-add.php"><?php _e('Add Link') ?></a></li> 
+  <li><a href="link-categories.php"><?php _e('Link Categories') ?></a></li> 
+  <li class="last"><a href="link-import.php"><?php _e('Import Blogroll') ?></a></li> 
 </ul> 
 <style media="screen" type="text/css">
 th { text-align: right; }
 </style>
 <div class="wrap"> 
   <form action="" method="post" name="editlink" id="editlink"> 
-  <h2>Edit a link:</h2>
+  <h2><?php _e('Edit a link:') ?></h2>
 <fieldset class="options">
-	<legend>Basics</legend>
+    <legend><?php _e('Basics') ?></legend>
         <table class="editform" width="100%" cellspacing="2" cellpadding="5">
          <tr>
-           <th width="33%" scope="row">URI:</th>
+           <th width="33%" scope="row"><?php _e('URI:') ?></th>
            <td width="67%"><input type="text" name="linkurl" value="<?php echo $link_url; ?>" style="width: 95%; /"></td>
          </tr>
          <tr>
-           <th scope="row">Link Name:</th>
+           <th scope="row"><?php _e('Link Name:') ?></th>
            <td><input type="text" name="name" value="<?php echo $link_name; ?>" style="width: 95%" /></td>
          </tr>
          <tr>
-         	<th scope="row">Short description:</th>
+            <th scope="row"><?php _e('Short description:') ?></th>
          	<td><input type="text" name="description" value="<?php echo $link_description; ?>" style="width: 95%" /></td>
          	</tr>
         <tr>
-           <th scope="row">Category:</th>
+           <th scope="row"><?php _e('Category:') ?></th>
            <td><?php category_dropdown('category', $link_category); ?></td>
          </tr>
 </table>
 </fieldset>
        <p class="submit">
-         <input type="submit" name="submit" value="Save Changes &raquo;" />
+       <input type="submit" name="submit" value="<?php _e('Save Changes &raquo;') ?>" />
        </p>
 	<fieldset class="options">
-	<legend>Link Relationship (XFN)</legend>
+        <legend><?php _e('Link Relationship (XFN)') ?></legend>
         <table class="editform" width="100%" cellspacing="2" cellpadding="5">
             <tr>
-            	<th width="33%" scope="row">rel:</th>
+                <th width="33%" scope="row"><?php _e('rel:') ?></th>
             	<td width="67%"><input type="text" name="rel" id="rel" size="50" value="<?php echo $link_rel; ?>"></td>
            	</tr>
             <tr>
-            	<th scope="row"><a href="http://gmpg.org/xfn/">XFN</a> Creator:</th>
+                <th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th>
             	<td><table cellpadding="3" cellspacing="5">
             <tr>
-              <th scope="row"> friendship </th>
+              <th scope="row"> <?php _e('friendship') ?> </th>
               <td>
                 <label for="label">
-                <input class="valinp" type="radio" name="friendship" value="acquaintance" id="label" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  acquaintance</label>
+                <input class="valinp" type="radio" name="friendship" value="acquaintance" id="label" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  <?php _e('acquaintance') ?></label>
                 <label for="label2">
-                <input class="valinp" type="radio" name="friendship" value="friend" id="label2" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> friend</label>
+                <input class="valinp" type="radio" name="friendship" value="friend" id="label2" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
                 <label for="label3">
                 <input name="friendship" type="radio" class="valinp" id="label3" value="" <?php xfn_check('friendship', '', 'radio'); ?> />
-          none</label>
+                <?php _e('none') ?></label>
               </td>
             </tr>
             <tr>
-              <th scope="row"> physical </th>
+              <th scope="row"> <?php _e('physical') ?> </th>
               <td>
                 <label for="label4">
                 <input class="valinp" type="checkbox" name="physical" value="met" id="label4" <?php xfn_check('physical', 'met'); ?> />
-          met</label>
+          <?php _e('met') ?></label>
               </td>
             </tr>
             <tr>
-              <th scope="row"> professional </th>
+              <th scope="row"> <?php _e('professional') ?> </th>
               <td>
                 <label for="label5">
                 <input class="valinp" type="checkbox" name="professional" value="co-worker" id="label5" <?php xfn_check('professional', 'co-worker'); ?> />
-          co-worker</label>
+          <?php _e('co-worker') ?></label>
                 <label for="label6">
                 <input class="valinp" type="checkbox" name="professional" value="colleague" id="label6" <?php xfn_check('professional', 'colleague'); ?> />
-          colleague</label>
+          <?php _e('colleague') ?></label>
               </td>
             </tr>
             <tr>
-              <th scope="row"> geographical </th>
+              <th scope="row"> <?php _e('geographical') ?> </th>
               <td>
                 <label for="label7">
                 <input class="valinp" type="radio" name="geographical" value="co-resident" id="label7" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
-          co-resident</label>
+          <?php _e('co-resident') ?></label>
                 <label for="label8">
                 <input class="valinp" type="radio" name="geographical" value="neighbor" id="label8" <?php xfn_check('geographical', 'neighbor', 'radio'); ?> />
-          neighbor</label>
+          <?php _e('neighbor') ?></label>
                 <label for="label9">
                 <input class="valinp" type="radio" name="geographical" value="" id="label9" <?php xfn_check('geographical', '', 'radio'); ?> />
-          none</label>
+          <?php _e('none') ?></label>
               </td>
             </tr>
             <tr>
@@ -408,36 +408,36 @@ th { text-align: right; }
               <td>
                 <label for="label10">
                 <input class="valinp" type="radio" name="family" value="child" id="label10" <?php xfn_check('family', 'child', 'radio'); ?>  />
-          child</label>
+          <?php _e('child') ?></label>
                 <label for="label11">
                 <input class="valinp" type="radio" name="family" value="parent" id="label11" <?php xfn_check('family', 'parent', 'radio'); ?> />
-          parent</label>
+          <?php _e('parent') ?></label>
                 <label for="label12">
                 <input class="valinp" type="radio" name="family" value="sibling" id="label12" <?php xfn_check('family', 'sibling', 'radio'); ?> />
-          sibling</label>
+          <?php _e('sibling') ?></label>
                 <label for="label13">
                 <input class="valinp" type="radio" name="family" value="spouse" id="label13" <?php xfn_check('family', 'spouse', 'radio'); ?> />
-          spouse</label>
+          <?php _e('spouse') ?></label>
                 <label for="label14">
                 <input class="valinp" type="radio" name="family" value="" id="label14" <?php xfn_check('family', '', 'radio'); ?> />
-          none</label>
+          <?php _e('none') ?></label>
               </td>
             </tr>
             <tr>
-              <th scope="row"> romantic </th>
+              <th scope="row"> <?php _e('romantic') ?> </th>
               <td>
                 <label for="label15">
                 <input class="valinp" type="checkbox" name="romantic" value="muse" id="label15" <?php xfn_check('romantic', 'muse'); ?> />
-          muse</label>
+         <?php _e('muse') ?></label>
                 <label for="label16">
                 <input class="valinp" type="checkbox" name="romantic" value="crush" id="label16" <?php xfn_check('romantic', 'crush'); ?> />
-          crush</label>
+         <?php _e('crush') ?></label>
                 <label for="label17">
                 <input class="valinp" type="checkbox" name="romantic" value="date" id="label17" <?php xfn_check('romantic', 'date'); ?> />
-          date</label>
+         <?php _e('date') ?></label>
                 <label for="label18">
                 <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="label18" <?php xfn_check('romantic', 'sweetheart'); ?> />
-          sweetheart</label>
+         <?php _e('sweetheart') ?></label>
               </td>
             </tr>
         </table></td>
@@ -445,25 +445,25 @@ th { text-align: right; }
 </table>
 </fieldset>
        <p class="submit">
-         <input type="submit" name="submit" value="Save Changes &raquo;" />
+       <input type="submit" name="submit" value="<?php _e('Save Changes &raquo;') ?>" />
        </p>
 <fieldset class="options">
-	<legend>Advanced</legend>
+        <legend><?php _e('Advanced') ?></legend>
         <table class="editform" width="100%" cellspacing="2" cellpadding="5">
          <tr>
-           <th width="33%" scope="row">Image URI:</th>
+           <th width="33%" scope="row"><?php _e('Image URI:') ?></th>
            <td width="67%"><input type="text" name="image" size="50" value="<?php echo $link_image; ?>" style="width: 95%" /></td>
          </tr>
 <tr>
-           <th scope="row">RSS URI: </th>
+           <th scope="row"><?php _e('RSS URI:') ?> </th>
            <td><input name="rss_uri" type="text" id="rss_uri" value="<?php echo $link_rss_uri; ?>" size="50" style="width: 95%" /></td>
          </tr>
          <tr>
-           <th scope="row">Notes:</th>
+           <th scope="row"><?php _e('Notes:') ?></th>
            <td><textarea name="notes" cols="50" rows="10" style="width: 95%"><?php echo $link_notes; ?></textarea></td>
          </tr>
          <tr>
-           <th scope="row">Rating:</th>
+           <th scope="row"><?php _e('Rating:') ?></th>
            <td><select name="rating" size="1">
 <?php
     for ($r = 0; $r < 10; $r++) {
@@ -474,10 +474,10 @@ th { text-align: right; }
     }
 ?>
            </select>
-           &nbsp;(Leave at 0 for no rating.) </td>
+         &nbsp;<?php _e('(Leave at 0 for no rating.)') ?> </td>
          </tr>
          <tr>
-           <th scope="row">Target</th>
+           <th scope="row"><?php _e('Target') ?></th>
            <td><label>
           <input type="radio" name="target" value="_blank"   <?php echo(($link_target == '_blank') ? 'checked="checked"' : ''); ?> />
           <code>_blank</code></label><br />
@@ -486,20 +486,20 @@ th { text-align: right; }
 <code>_top</code></label><br />
 <label>
 <input type="radio" name="target" value=""     <?php echo(($link_target == '') ? 'checked="checked"' : ''); ?> />
-none</label><br />
-(Note that the <code>target</code> attribute is illegal in XHTML 1.1 and 1.0 Strict.)</td>
+<?php _e('none') ?></label><br />
+<?php _e('(Note that the <code>target</code> attribute is illegal in XHTML 1.1 and 1.0 Strict.)') ?></td>
          </tr>
          <tr>
-           <th scope="row">Visible:</th>
+           <th scope="row"><?php _e('Visible:') ?></th>
            <td><label>
              <input type="radio" name="visible" <?php if ($link_visible == 'Y') echo "checked='checked'"; ?> value="Y" />
-Yes</label><br /><label>
+<?php _e('Yes') ?></label><br /><label>
 <input type="radio" name="visible" <?php if ($link_visible == 'N') echo "checked='checked'"; ?> value="N" />
-No</label></td>
+<?php _e('No') ?></label></td>
          </tr>
 </table>
 </fieldset>
-<p class="submit"><input type="submit" name="submit" value="Save Changes &raquo;" />
+<p class="submit"><input type="submit" name="submit" value="<?php _e('Save Changes &raquo;') ?>" />
           <input type="hidden" name="action" value="editlink" />
           <input type="hidden" name="link_id" value="<?php echo $link_id; ?>" />
           <input type="hidden" name="order_by" value="<?php echo $order_by ?>" />
@@ -509,7 +509,7 @@ No</label></td>
 <?php
     break;
   } // end linkedit
-  case "Show":
+  case __("Show"):
   {
     if (!isset($cat_id) || ($cat_id == '')) {
         if (!isset($links_show_cat_id) || ($links_show_cat_id == ''))
@@ -551,7 +551,7 @@ No</label></td>
     $standalone=0;
     include_once ("./admin-header.php");
     if ($user_level < get_settings('links_minadminlevel')) {
-      die("You have do not have sufficient permissions to edit the links for this blog.");
+      die(__("You have do not have sufficient permissions to edit the links for this blog."));
     }
 
     switch ($order_by)
@@ -583,10 +583,10 @@ function checkAll(form)
 //-->
 </script>
 <ul id="adminmenu2">
-	<li><a href="link-manager.php" class="current">Manage Links</a></li>
-	<li><a href="link-add.php">Add Link</a></li>
-	<li><a href="link-categories.php">Link Categories</a></li>
-	<li class="last"><a href="link-import.php">Import Blogroll</a></li>
+    <li><a href="link-manager.php" class="current"><?php _e('Manage Links') ?></a></li>
+    <li><a href="link-add.php"><?php _e('Add Link') ?></a></li>
+    <li><a href="link-categories.php"><?php _e('Link Categories') ?></a></li>
+    <li class="last"><a href="link-import.php"><?php _e('Import Blogroll') ?></a></li>
 </ul>
 <div class="wrap">
     <form name="cats" method="post" action="">
@@ -623,16 +623,16 @@ function checkAll(form)
         </td>
         <td>
           <select name="order_by">
-            <option value="order_id"     <?php if ($order_by == 'order_id')     echo " selected='selected'";?>>Link ID</option>
-            <option value="order_name"   <?php if ($order_by == 'order_name')   echo " selected='selected'";?>>Name</option>
-            <option value="order_url"    <?php if ($order_by == 'order_url')    echo " selected='selected'";?>>URI</option>
-            <option value="order_desc"   <?php if ($order_by == 'order_desc')   echo " selected='selected'";?>>Description</option>
-            <option value="order_owner"  <?php if ($order_by == 'order_owner')  echo " selected='selected'";?>>Owner</option>
-            <option value="order_rating" <?php if ($order_by == 'order_rating') echo " selected='selected'";?>>Rating</option>
+            <option value="order_id"     <?php if ($order_by == 'order_id')     echo " selected='selected'";?>><?php _e('Link 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_desc"   <?php if ($order_by == 'order_desc')   echo " selected='selected'";?>><?php _e('Description') ?></option>
+            <option value="order_owner"  <?php if ($order_by == 'order_owner')  echo " selected='selected'";?>><?php _e('Owner') ?></option>
+            <option value="order_rating" <?php if ($order_by == 'order_rating') echo " selected='selected'";?>><?php _e('Rating') ?></option>
           </select>
         </td>
         <td>
-          <input type="submit" name="action" value="Show" />
+          <input type="submit" name="action" value="<?php _e('Show') ?>" />
           <?php echo gethelp_link($this_file,'show');?>
         </td>
       </tr>
@@ -650,7 +650,7 @@ function checkAll(form)
     <input type="hidden" name="cat_id" value="<?php echo $cat_id ?>" />
   <table width="100%" cellpadding="3" cellspacing="3">
     <tr>
-      <th width="15%"><?php echo gethelp_link($this_file,'list_o_links');?> Name</th>
+      <th width="15%"><?php echo gethelp_link($this_file,'list_o_links');?> <?php _e('Name') ?></th>
       <th>URI</th>
       <th>Category</th>
       <th>rel</th>