diff --git a/index.php b/index.php
index 495394785c..8c63f5ef7c 100644
--- a/index.php
+++ b/index.php
@@ -100,7 +100,7 @@ require('./wp-blog-header.php');
 		<li><a href="<?php bloginfo('rss2_url'); ?>" title="<?php _e('Syndicate this site using RSS'); ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> 2.0'); ?></a></li>
 		<li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php _e('The latest comments to all posts in RSS'); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr> 2.0'); ?></a></li>
 		<li><a href="http://validator.w3.org/check/referer" title="<?php _e('This page validates as XHTML 1.0 Transitional'); ?>"><?php _e('Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'); ?></a></li>
-		<li><a href="http://wordpress.org/" title="<?php _e('Powered by WordPress; state-of-the-art semantic personal publishing platform.'); ?>">WP</a></li>
+		<li><a href="http://wordpress.org/" title="<?php _e('Powered by WordPress, state-of-the-art semantic personal publishing platform.'); ?>">WP</a></li>
 	</ul>
  </li>
 
@@ -110,6 +110,6 @@ require('./wp-blog-header.php');
 
 </div>
 
-<p class="credit"><!--<?php echo $wpdb->num_queries; ?> queries. <?php timer_stop(1); ?> seconds. --> <cite><?php echo sprintf(__("Powered by <a href='http://wordpress.org' title='%s'><strong>WordPress</strong></a>"), __("Powered by WordPress, state-of-the-art semantic personal publishing platform")); ?></cite></p>
+<p class="credit"><!--<?php echo $wpdb->num_queries; ?> queries. <?php timer_stop(1); ?> seconds. --> <cite><?php echo sprintf(__("Powered by <a href='http://wordpress.org' title='%s'><strong>WordPress</strong></a>"), __("Powered by WordPress, state-of-the-art semantic personal publishing platform.")); ?></cite></p>
 </body>
 </html>
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 5d7b3f5a17..3719bb4cf4 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -34,7 +34,7 @@ function checkAll(form)
   <input type="text" name="s" value="<?php if (isset($s)) echo $s; ?>" size="17" /> 
   <input type="submit" name="submit" value="<?php _e('Search') ?>"  />  
   <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
-  <?php _e('(Searches within comment text, email, URI, and IP address.)') ?>
+  <?php _e('(Searches within comment text, e-mail, URI, and IP address.)') ?>
   </fieldset> 
 </form>
 <p><a href="?mode=view"><?php _e('View Mode') ?></a> | <a href="?mode=edit"><?php _e('Mass Edit Mode') ?></a></p>
@@ -79,7 +79,7 @@ if ('view' == $mode) {
 				echo '<li style="border-bottom: 1px solid #ccc;">';
 			}
 		?>		
-        <p><strong><?php _e('Name:') ?></strong> <?php comment_author() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('Email:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_email) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
+        <p><strong><?php _e('Name:') ?></strong> <?php comment_author() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('E-mail:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_email) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
 		
 		<?php comment_text() ?>
 
@@ -113,7 +113,7 @@ if ('view' == $mode) {
   <tr>
     <th scope="col">*</th>
     <th scope="col">' .  __('Name') . '</th>
-    <th scope="col">' .  __('Email') . '</th>
+    <th scope="col">' .  __('E-mail') . '</th>
     <th scope="col">' . __('IP') . '</th>
     <th scope="col">' . __('Comment Excerpt') . '</th>
 	<th scope="col" colspan="3">' .  __('Actions') . '</th>
diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php
index 19fd912941..f3e6103457 100644
--- a/wp-admin/moderation.php
+++ b/wp-admin/moderation.php
@@ -151,7 +151,7 @@ if ($comments) {
 	
 	echo "\n\t<li id='comment-$comment->comment_ID'>"; 
 	?>
-			<p><strong><?php _e('Name:') ?></strong> <?php comment_author() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('Email:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_email) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
+			<p><strong><?php _e('Name:') ?></strong> <?php comment_author() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('E-mail:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_email) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
 <?php comment_text() ?>
 <p><?php
 echo "<a href=\"post.php?action=editcomment&amp;comment=".$comment->comment_ID."\">" . __('Edit') . "</a>";
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 11806c1d43..35d50d1e9f 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -1,7 +1,7 @@
 <?php
 require_once('../wp-includes/wp-l10n.php');
 
-$title = 'Discussion Options';
+$title = __('Discussion Options');
 $parent_file = 'options-general.php';
 
 function add_magic_quotes($array) {
@@ -68,7 +68,7 @@ include('options-head.php');
 		</ul> 
 </fieldset>
 <fieldset class="options">
-        <legend><?php _e('Email me whenever:') ?></legend> 
+        <legend><?php _e('E-mail me whenever:') ?></legend> 
 		<ul> 
 			<li> 
 				<label for="comments_notify"> 
@@ -93,7 +93,7 @@ include('options-head.php');
 			<li> 
 				<label for="require_name_email"> 
 				<input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_settings('require_name_email')); ?> /> 
-				<?php _e('User must fill out name and email') ?> </label> 
+				<?php _e('User must fill out name and e-mail') ?> </label> 
 			</li> 
 		</ul> 
 </fieldset>
@@ -101,7 +101,7 @@ include('options-head.php');
     <legend><?php _e('Comment Moderation') ?></legend>
     <p><?php printf(__('Hold a comment in the queue if it contains more than %s links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_settings('comment_max_links'). '" />' ) ?></p>
 
-    <p><?php _e('When a comment contains any of these words in its content, name, URI,  email, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://wiki.wordpress.org/index.php/SpamWords">Common spam words</a>.') ?></p>
+    <p><?php _e('When a comment contains any of these words in its content, name, URI, e-mail, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://wiki.wordpress.org/index.php/SpamWords">Common spam words</a>.') ?></p>
 		<p> 
 			<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php echo get_settings('moderation_keys'); ?></textarea> 
 		</p> 
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index 78f4bb70d5..d79c824a73 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -1,7 +1,7 @@
 <?php
 require_once('../wp-includes/wp-l10n.php');
 
-$title = 'Miscellaneous Options';
+$title = __('Miscellaneous Options');
 $parent_file = 'options-general.php';
 
 function add_magic_quotes($array) {
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 752415b421..0bfb9bc4ee 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -89,7 +89,7 @@ if (isset($_POST['submit'])) {
   <p><code>/archives/2003/05/23/my-cheese-sandwich/</code></p>
   <p> In general for this you must use mod_rewrite, however if you put a filename at the beginning WordPress will attempt to use that to pass the arguments, for example:</p>
   <p><code>/index.php/archives/%year%/%monthnum%/%day%/%postname%/</code> </p>
-  <p>If you use this option you can ignore the mod_rewrite rules. </p>') ?>
+  <p>If you use this option you can ignore the mod_rewrite rules.</p>') ?>
   <form name="form" action="options-permalink.php" method="post"> 
     <p><?php _e('Use the template tags above to create a virtual site structure:') ?></p>
     <p> 
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 6a2ae4d246..1c81b3b65e 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -1,7 +1,7 @@
 <?php
 require_once('../wp-includes/wp-l10n.php');
 
-$title = 'Reading Options';
+$title = __('Reading Options');
 $parent_file = 'options-general.php';
 
 function add_magic_quotes($array) {
@@ -68,16 +68,16 @@ include('options-head.php');
 			<tr valign="top"> 
                 <th width="33%" scope="row"><?php _e('Show the most recent:') ?></th> 
 				<td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php echo get_settings('posts_per_rss'); ?>" size="3" /> 
-					posts </td> 
+					<?php _('posts') ?></td> 
 			</tr>
 			<tr valign="top">
                 <th scope="row"><?php _e('For each article, show:') ?> </th>
 				<td><label>
 					<input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_settings('rss_use_excerpt')); ?>  />
-					full text</label>					<br />
+					<?php _e('full text') ?></label>					<br>
 					<label>
 					<input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_settings('rss_use_excerpt')); ?> />
-					summary</label> </td>
+					<?php _('summary') ?></label> </td>
 			</tr> 
 		</table> 
 		</fieldset> 
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index fdb3a711f7..814542a69b 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -62,9 +62,9 @@ include('options-head.php');
           <label for="advanced_edit"></label></td>
       </tr>
       <tr valign="top"> 
-        <th width="33%" scope="row"> Size of the writing box:</th> 
+        <th width="33%" scope="row"> <?php _e('Size of the writing box:') ?></th> 
         <td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php echo get_settings('default_post_edit_rows'); ?>" size="2" style="width: 1.5em; " /> 
-          lines </td> 
+         <?php _e('lines') ?></td> 
       </tr> 
       <tr valign="top">
         <th scope="row"><?php _e('Formatting:') ?></th>
@@ -95,8 +95,8 @@ endforeach;
 	<textarea name="ping_sites" id="ping_sites" style="width: 98%;"><?php echo get_settings('ping_sites'); ?></textarea>
 	</fieldset>
     <fieldset class="options">
-	<legend><?php _e('Writing by Email') ?></legend>
-	<p><?php printf(__('To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <code>%s</code>, <code>%s</code>, <code>%s</code>.'), substr(md5(uniqid(microtime())),0,5), substr(md5(uniqid(microtime())),0,5), substr(md5(uniqid(microtime())),0,5)) ?></p>
+	<legend><?php _e('Writing by e-mail') ?></legend>
+	<p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <code>%s</code>, <code>%s</code>, <code>%s</code>.'), substr(md5(uniqid(microtime())),0,5), substr(md5(uniqid(microtime())),0,5), substr(md5(uniqid(microtime())),0,5)) ?></p>
 	
 		<table width="100%" cellspacing="2" cellpadding="5" class="editform">
         	<tr valign="top">
diff --git a/wp-admin/options.php b/wp-admin/options.php
index dcd686ad8c..72d9b1973e 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -1,5 +1,7 @@
 <?php
-$title = 'Options';
+require_once('../wp-includes/wp-l10n.php');
+
+$title = __('Options');
 $this_file = 'options.php';
 $parent_file = 'options-general.php';
 
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 718f59d684..6bfdf335d1 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -511,7 +511,7 @@ echo "<div class=\"wrap\">\n";
 echo "<p><?php __('<strong>Caution:</strong> You are about to delete the following comment:'); ?></p>\n";
 echo "<table border=\"0\">\n";
 echo "<tr><td>" . __('Author:') . "</td><td>" . $commentdata["comment_author"] . "</td></tr>\n";
-echo "<tr><td>" . __('E-Mail:') . "</td><td>" . $commentdata["comment_author_email"] . "</td></tr>\n";
+echo "<tr><td>" . __('E-mail:') . "</td><td>" . $commentdata["comment_author_email"] . "</td></tr>\n";
 echo "<tr><td>". __('URL:') . "</td><td>" . $commentdata["comment_author_url"] . "</td></tr>\n";
 echo "<tr><td>". __('Comment:') . "</td><td>" . stripslashes($commentdata["comment_content"]) . "</td></tr>\n";
 echo "</table>\n";
@@ -790,9 +790,10 @@ window.open ("profile.php?action=IErightclick", "oneclickbookmarklet", "width=50
 
 ?>
 <div class="wrap">
-	  <?php printf(__('<p>Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to raise your level to 1, in order to be authorized to post blog items.<br />
-You can also <a href="mailto:%s?subject=Blog posting permission">e-mail the admin</a> to ask for a promotion.<br />
-When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)</p>'), get_settings('admin_email')); ?>
+		<p><?php printf(__('Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to raise your level to 1, in order to be authorized to post.<br />
+You can also <a href="mailto:%s?subject=Promotion?">e-mail the admin</a> to ask for a promotion.<br />
+When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)'), get_settings('admin_email')); ?>
+		</p>
 </div>
 <?php
 
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index 3ba902462d..492a46e272 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -64,7 +64,7 @@ case 'update':
 		die (__("<strong>ERROR</strong>: please type your e-mail address"));
 		return false;
 	} else if (!is_email($_POST["newuser_email"])) {
-		die (__("<strong>ERROR</strong>: the email address isn't correct"));
+		die (__("<strong>ERROR</strong>: the e-mail address isn't correct"));
 		return false;
 	}
 
@@ -157,7 +157,7 @@ case 'viewprofile':
   
 <p> <strong><?php _e('Nickname:') ?></strong> <?php echo $profiledata->user_nickname ?> </p>
   
-<p> <strong><?php _e('Email:') ?></strong> <?php echo make_clickable($profiledata->user_email) ?> 
+<p> <strong><?php _e('E-mail:') ?></strong> <?php echo make_clickable($profiledata->user_email) ?> 
 </p>
   
 <p> <strong><?php _e('Website:') ?></strong> <?php echo $profiledata->user_url ?> </p>
@@ -275,7 +275,7 @@ default:
       <td><input type="text" name="newuser_nickname" id="newuser_nickname2" value="<?php echo $profiledata->user_nickname ?>" /></td>
     </tr>
     <tr>
-      <th scope="row"><?php _e('Email:') ?></th>
+      <th scope="row"><?php _e('E-mail:') ?></th>
       <td><input type="text" name="newuser_email" id="newuser_email2" value="<?php echo $profiledata->user_email ?>" /></td>
     </tr>
     <tr>
diff --git a/wp-comments-popup.php b/wp-comments-popup.php
index c6e50deca3..821b4716c1 100644
--- a/wp-comments-popup.php
+++ b/wp-comments-popup.php
@@ -100,7 +100,7 @@ if (!empty($commentstatus->post_password) && $_COOKIE['wp-postpass_'.$cookiehash
 
 <!-- // this is just the end of the motor - don't touch that line either :) -->
 <?php //} ?> 
-<p class="credit"><?php timer_stop(1); ?> <?php echo sprintf(__("<cite>Powered by <a href=\"http://wordpress.org\" title=\"%s\"><strong>Wordpress</strong></a></cite>"),__("Powered by WordPress; state-of-the-art semantic personal publishing platform.")); ?></p>
+<p class="credit"><?php timer_stop(1); ?> <?php echo sprintf(__("<cite>Powered by <a href=\"http://wordpress.org\" title=\"%s\"><strong>Wordpress</strong></a></cite>"),__("Powered by WordPress, state-of-the-art semantic personal publishing platform.")); ?></p>
 <?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?>
 <script type="text/javascript">
 <!--
diff --git a/wp-comments.php b/wp-comments.php
index 6dcfb140b1..b1f1edd40a 100644
--- a/wp-comments.php
+++ b/wp-comments.php
@@ -45,7 +45,7 @@ endif;
 <?php if ( comments_open() ) : ?>
 <h2 id="postcomment"><?php _e('Leave a comment'); ?></h2>
 
-<p><?php _e('Line and paragraph breaks automatic. E-mail address never displayed. <abbr title="HyperText Markup Language">HTML</abbr> allowed:'); ?> <code><?php echo allowed_tags(); ?></code></p>
+<p><?php _e("Line and paragraph breaks automatic, e-mail address never displayed, <acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed:"); ?> <code><?php echo allowed_tags(); ?></code></p>
 
 <form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 	<p>
diff --git a/wp-login.php b/wp-login.php
index 6f107f084f..5e706bc51c 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -182,7 +182,7 @@ if ($error) echo "<div align=\"right\" style=\"padding:4px;\"><font color=\"#FF0
 <form name="" action="wp-login.php" method="post" id="lostpass">
 <input type="hidden" name="action" value="retrievepassword" />
 <label><?php _e('Login:') ?> <input type="text" name="user_login" id="user_login" value="" size="12" /></label><br />
-<label><?php _e('Email:') ?> <input type="text" name="email" id="email" value="" size="12" /></label><br />
+<label><?php _e('E-mail:') ?> <input type="text" name="email" id="email" value="" size="12" /></label><br />
 <input type="submit" name="Submit2" value="OK" class="search">
 
 </form>
@@ -203,7 +203,7 @@ case 'retrievepassword':
 	$user_login = $user_data->user_login;
 	$user_email = $user_data->user_email;
 
-	if (!$user_email || $user_email != $_POST['email']) die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or email address? <a href="%s">Try again</a>.'), 'wp-login.php?action=lostpassword'));
+	if (!$user_email || $user_email != $_POST['email']) die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or e-mail address? <a href="%s">Try again</a>.'), 'wp-login.php?action=lostpassword'));
  	// Generate something random for a password... md5'ing current time with a rand salt
     $user_pass = substr((MD5("time" . rand(1,16000))), 0, 6);
  	// now insert the new pass md5'd into the db
@@ -215,12 +215,13 @@ case 'retrievepassword':
 	$m = mail($user_email, '[' . get_settings('blogname') . "] Your weblog's login/password", $message);
 
 	if ($m == false) {
-		echo "<p>The email could not be sent.<br />\n";
-		echo "Possible reason: your host may have disabled the mail() function...</p>";
+		echo "<p><?php _e('The e-mail could not be sent.') ?><br />\n";
+		echo "<?php _e('Possible reason: your host may have disabled the mail() function...') ?></p>";
 		die();
 	} else {
-		echo "<p>The email was sent successfully to $user_login's email address.<br />
-		<a href='wp-login.php' title='Check your email first, of course'>Click here to login!</a></p>";
+		echo "<p><?php _e('The e-mail was sent successfully to $user_login's e-mail address.') ?><br />
+		<?php _e('<a href='wp-login.php' title=\'Check your e-mail first, of course\'>Click here to login!</a>
+') ?></p>";
 		// send a copy of password change notification to the admin
 		mail(get_settings('admin_email'), '[' . get_settings('blogname') . "] Password Lost/Change", "Password Lost and Changed for user: $user_login");
 		die();