--- cvbuilder.module	2005-11-07 08:19:14.000000000 -0500
+++ cvbuilder_patched.module	2005-12-27 08:17:24.000000000 -0500
@@ -661,8 +661,8 @@
         $destination = 'cv/view/' . $user->uid;
         drupal_goto($destination);
       } else {
-        $content = "<p>To create a CV on this site you must <a href='user'>login with your username and password</a>.</p>";
-        $content .= "<p>If you don't already have a username and password <a href='user/register'>you can register here</a>.</p>";
+        $content = t("<p>To create a CV on this site you must %login.</p>", array('%login' => l('login with your username and password', 'user')));
+        $content .= t("<p>If you don't already have a username and password %register.</p>", array('%register' => l('you can register here', 'user/register')));
         print theme('page', $content);
       }
       break;
@@ -673,7 +673,7 @@
 function cvbuilder_cv_page($uid) {
   $current = user_load(array((is_numeric($uid) ? 'uid' : 'name') => $uid, 'status' => 1));
   $content = '';
-  $content .= t("<p><a href='cv/print/%uid'>Click here for the print version of this CV</a></p>", array('%uid' => $current->uid));; 
+  $content .= t("<p>%url</p>", array('%url' => l('Click here for the print version of this CV', "cv/print/$current->uid"))); 
   $content .= cvbuilder_renderaddress($uid);
   $content .= cvbuilder_renderskills($uid);
   $content .= cvbuilder_renderschoolcollege($uid);
@@ -718,7 +718,7 @@
         while ($loop = db_fetch_array($addresses)) {
           $loopline = node_load(array('nid' => $loop['nid']));
           if ((user_access('edit own CV') && ($user->uid == $node->uid)) || user_access('administer nodes')) {
-            $address .= t('<h2 class="cveditor">Personal Details [ <a href="node/%nid/edit">Edit this</a> | <a href="node/%nid/delete">Remove this</a> ]</h2>', array('%nid' => $loopline->nid));
+            $address .= t('<h2 class="cveditor">Personal Details [%edit | %delete ]</h2>', array('%name' => $loopline->title, '%edit' => l('Edit this', "node/$loopline->nid/edit"), '%delete' => l('Remove this', "node/$loopline->nid/delete")));
           } else {
             $address .= t('<h2 class="cveditor">Personal Details</h2>');
           }
@@ -738,7 +738,7 @@
       } else {
         if ($owner == $viewer) {
           $address .= t('<h2 class="cveditor">Personal Details</h2>');
-          $address .= t('<p>You haven\'t entered any details yet. <a href="node/add/cvbuilder_address">Click here to add your personal details.</a></p>');
+          $address .= t('<p>You haven\'t entered any details yet. %url</p>', array('%url' => l('Click here to add your personal details.', "node/add/cvbuilder_address")));
         }
       }
     $address .= '</div>';
@@ -768,15 +768,15 @@
       if (db_num_rows($skillses) > 0) {
         $skills .= t('<h2 class="cveditor">Skills</h2>');
         if ((user_access('edit own CV') && ($user->uid == $node->uid)) || user_access('administer nodes')) {
-          $skills .= t('<a href="node/add/cvbuilder_skills">Click here to add a new entry.</a></p>');
+          $skills .= '<p>' l(t('Click here to add a new entry.'), "node/add/cvbuilder_skills") . '</p>';
         }
         while ($loop = db_fetch_array($skillses)) {
           $loopline = node_load(array('nid' => $loop['nid']));
           $skills .= '<div class="cvbuilder-skills">';
           if ((user_access('edit own CV') && ($user->uid == $node->uid)) || user_access('administer nodes')) {
-            $skills .= t('<p><strong>%name</strong> [ <a href="node/%nid/edit">Edit this entry</a> | <a href="node/%nid/delete">Remove this entry</a> ]</p>', array('%name' => $loopline->title, '%nid' => $loopline->nid));
+            $skills .= t('<p><strong>%name</strong> [ %edit | %delete ]</p>', array('%name' => $loopline->title, '%edit' => l('Edit this entry', "node/$loopline->nid/edit"), '%delete' => l('Remove this entry', "node/$loopline->nid/delete")));
           } else {
-            $skills .= t("<p><strong>%name :</strong></p>", array('%name' => $loopline->title));
+            $skills .= t("<p><strong>%name</strong></p>", array('%name' => $loopline->title));
           }
           $skills .= t("<p>%description</p>",array('%description' => str_replace("\n","<br />",$loopline->description)));
           $skills .= '</div>';
@@ -785,7 +785,7 @@
         if ($owner == $viewer) {
           $skills .= t('<h2 class="cveditor">Skills</h2>');
           $skills .= '<div class="cvbuilder-skills">';
-          $skills .= t('<p>You haven\'t entered any job skills yet. <a href="node/add/cvbuilder_skills">Click here to add a new entry.</a></p>');
+          $skills .= t('<p>You haven\'t entered any job skills yet. %url</p>', array('%url' => l('Click here to add a new entry.', "node/add/cvbuilder_skills")));
           $skills .= '</div>';
         }
       }
@@ -817,13 +817,13 @@
       if (db_num_rows($schools) > 0) {
         $school .= t('<h2 class="cveditor">Education</h2>');
         if ((user_access('edit own CV') && ($user->uid == $node->uid)) || user_access('administer nodes')) {
-          $school .= t('<a href="node/add/cvbuilder_experience">Click here to add a new entry.</a></p>');
+          $school .= t('<p>%url</p>', array('%url' => l('Click here to add a new entry.', "node/add/cvbuilder_experience")));
         }
         while ($loop = db_fetch_array($schools)) {
           $school .= '<div class="cvbuilder-schoolcollege">';
           $loopline = node_load(array('nid' => $loop['nid']));
           if ((user_access('edit own CV') && ($user->uid == $node->uid)) || user_access('administer nodes')) {
-            $school .= t('<p><strong>%name</strong> [ <a href="node/%nid/edit">Edit this entry</a> | <a href="node/%nid/delete">Remove this entry</a> ]</p>', array('%name' => $loopline->title, '%nid' => $loopline->nid));
+            $school .= t('<p><strong>%name</strong> [ %edit | %delete ]</p>', array('%name' => $loopline->title, '%edit' => l('Edit this entry', "node/$loopline->nid/edit"), '%delete' => l('Remove this entry', "node/$loopline->nid/delete")));
           } else {
             $school .= t("<p><strong>%name</strong></p>", array('%name' => $loopline->title));
           }
@@ -840,7 +840,7 @@
         if ($owner == $viewer) {
           $school .= t('<h2 class="cveditor">Education</h2>');
           $school .= '<div class="cvbuilder-schoolcollege">';
-          $school .= t('<p>You haven\'t entered any places of education yet. <a href="node/add/cvbuilder_schoolcollege">Click here to add a new school or college.</a></p>');
+          $school .= t('<p>You haven\'t entered any places of education yet. %url</p>', array('%url' => l('Click here to add a new school or college.', "node/add/cvbuilder_schoolcollege")));
           $school .= '</div>';
         }
       }
@@ -873,13 +873,13 @@
       if (db_num_rows($jobses) > 0) {
         $jobs .= t('<h2 class="cveditor">Experience</h2>');
         if ((user_access('edit own CV') && ($user->uid == $node->uid)) || user_access('administer nodes')) {
-          $jobs .= t('<a href="node/add/cvbuilder_experience">Click here to add a new entry.</a></p>');
+          $jobs .= t('<p>%url</p>', array('%url', l('Click here to add a new entry.', "node/add/cvbuilder_experience")));
         }
         while ($loop = db_fetch_array($jobses)) {
           $jobs .= '<div class="cvbuilder-experience">';
           $loopline = node_load(array('nid' => $loop['nid']));
           if ((user_access('edit own CV') && ($user->uid == $node->uid)) || user_access('administer nodes')) {
-            $jobs .= t('<h3>%name [ <a href="node/%nid/edit">Edit this entry</a> | <a href="node/%nid/delete">Remove this entry</a> ]</h3>', array('%name' => $loopline->title, '%nid' => $loopline->nid));
+            $jobs .= t('<p><strong>%name</strong> [ %edit | %delete ]</p>', array('%name' => $loopline->title, '%edit' => l('Edit this entry', "node/$loopline->nid/edit"), '%delete' => l('Remove this entry', "node/$loopline->nid/delete")));
           } else {
             $jobs .= t("<p><strong>%name</strong></p>", array('%name' => $loopline->title));
           }
@@ -899,7 +899,7 @@
         if ($owner == $viewer) {
           $jobs .= t('<h2 class="cveditor">Experience</h2>');
           $jobs .= '<div class="cvbuilder-experience">';
-          $jobs .= t('<p>You haven\'t entered any work experience yet. <a href="node/add/cvbuilder_experience">Click here to add a new entry.</a></p>');
+          $jobs .= t('<p>You haven\'t entered any work experience yet.  %url</p>', array('%url' => l('Click here to add a new entry.', "node/add/cvbuilder_experience")));
           $jobs .= '</div>';
         }
       }
@@ -931,13 +931,13 @@
       if (db_num_rows($referees) > 0) {
         $refs .= t('<h2 class="cveditor">References</h2>');
         if ((user_access('edit own CV') && ($user->uid == $node->uid)) || user_access('administer nodes')) {
-          $refs .= t('<a href="node/add/cvbuilder_referee">Click here to add a new entry.</a></p>');
+          $refs .= t('<p>%url</p>', array('%url', l('Click here to add a new entry.', "node/add/cvbuilder_referee")));
         }
         while ($loop = db_fetch_array($referees)) {
           $loopline = node_load(array('nid' => $loop['nid']));
           $refs .= '<div class="cvbuilder-referee">';
           if ((user_access('edit own CV') && ($user->uid == $node->uid)) || user_access('administer nodes')) {
-            $refs .= t('<h3>%name [ <a href="node/%nid/edit">Edit this entry</a> | <a href="node/%nid/delete">Remove this entry</a> ]</h3>', array('%name' => $loopline->title, '%nid' => $loopline->nid));
+            $refs .=  t('<p><strong>%name</strong> [ %edit | %delete ]</p>', array('%name' => $loopline->title, '%edit' => l('Edit this entry', "node/$loopline->nid/edit"), '%delete' => l('Remove this entry', "node/$loopline->nid/delete")));
           } else {
             $refs .= t("<h3>%name</h3>", array('%name' => $loopline->title));
           }
@@ -963,7 +963,7 @@
         if ($owner == $viewer) {
           $refs .= t('<h2 class="cveditor">References</h2>');
           $refs .= '<div class="cvbuilder-referee">';
-          $refs .= t('<p>You haven\'t entered any work experience yet. <a href="node/add/cvbuilder_experience">Click here to add a new entry.</a></p>');
+          $refs .= t('<p>You haven\'t entered any work experience yet.  %url</p>', array('%url' => l('Click here to add a new entry.', "node/add/cvbuilder_experience")));
           $refs .= '</div>';
         }
       }