Index: inline-uploading.php
===================================================================
--- inline-uploading.php	(revision 3294)
+++ inline-uploading.php	(working copy)
@@ -244,7 +244,7 @@
 </div>
 ";
 			$popups .= "<div id='popup{$ID}' class='popup'>
-	<div class='filetype'>File Type: ".str_replace('/',"/\n",$attachment['post_mime_type'])."</div>
+	<div class='filetype'>".__('File Type:').' '.str_replace('/',"/\n",$attachment['post_mime_type'])."</div>
 	<a id=\"L{$ID}\" onclick=\"toggleOtherLink({$ID});return false;\" href=\"javascript:void()\">$__linked_to_file</a>
 	{$send_delete_cancel}
 </div>
Index: update-links.php
===================================================================
--- update-links.php	(revision 3294)
+++ update-links.php	(working copy)
@@ -3,7 +3,7 @@
 require_once( ABSPATH . 'wp-includes/class-snoopy.php');
 
 if ( !get_option('use_linksupdate') )
-	die('Feature disabled.');
+	die(__('Feature disabled.'));
 
 $link_uris = $wpdb->get_col("SELECT link_url FROM $wpdb->links");
 
@@ -41,4 +41,4 @@
 		$wpdb->query("UPDATE $wpdb->links SET link_updated = '$time' WHERE link_url = '$uri'");
 	endforeach;
 }
-?>
\ No newline at end of file
+?>
Index: users.php
===================================================================
--- users.php	(revision 3294)
+++ users.php	(working copy)
@@ -95,9 +95,9 @@
  	foreach ($userids as $id) {
  		$user = new WP_User($id);
 		if ($id == $current_user->id) {
-			echo "<li>" . sprintf('ID #%1s: %2s <strong>The current user will not be deleted.</strong>', $id, $user->user_login) . "</li>\n";
+			echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
 		} else {
-			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf('ID #%1s: %2s', $id, $user->user_login) . "</li>\n";
+			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1s: %2s'), $id, $user->user_login) . "</li>\n";
 			$go_delete = true;
 		}
  	}
Index: link-import.php
===================================================================
--- link-import.php	(revision 3294)
+++ link-import.php	(working copy)
@@ -108,7 +108,7 @@
                         $query = "INSERT INTO $wpdb->links (link_url, link_name, link_target, link_category, link_description, link_owner, link_rss)
                                 VALUES('{$urls[$i]}', '".$wpdb->escape($names[$i])."', '', $cat_id, '".$wpdb->escape($descriptions[$i])."', $user_ID, '{$feeds[$i]}')\n";
                         $result = $wpdb->query($query);
-                        echo sprintf(__("<p>Inserted <strong>%s</strong></p>"), $names[$i]);
+						echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
                     }
 ?>
      <p><?php printf(__('Inserted %1$d links into category %2$s. All done! Go <a href="%3$s">manage those links</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
Index: admin-header.php
===================================================================
--- admin-header.php	(revision 3294)
+++ admin-header.php	(working copy)
@@ -133,7 +133,7 @@
 	newcatSub.type = 'button';
 	newcatSub.name = 'Button';
 	newcatSub.id = 'catadd';
-	newcatSub.value = '<?php _e('Add'); ?>';
+	newcatSub.value = '<?php echo addslashes(__('Add')); ?>';
 	newcatSub.onclick = ajaxNewCat;
 
 	ajaxcat.appendChild(newcat);
@@ -141,7 +141,7 @@
 	document.getElementById('jaxcat').appendChild(ajaxcat);
 
 	howto = document.createElement('span');
-	howto.innerHTML = '<?php _e('Separate multiple categories with commas.'); ?>';
+	howto.innerHTML = '<?php echo addslashes(__('Separate multiple categories with commas.')); ?>';
 	howto.id = 'howto';
 	ajaxcat.appendChild(howto);
 }
@@ -160,17 +160,17 @@
 
 function newCatLoading() {
 	var p = getResponseElement();
-	p.innerHTML = 'Sending Data...';
+	p.innerHTML = '<?php echo addslashes(__('Sending Data...')); ?>';
 }
 
 function newCatLoaded() {
 	var p = getResponseElement();
-	p.innerHTML = 'Data Sent...';
+	p.innerHTML = '<?php echo addslashes(__('Data Sent...')); ?>';
 }
 
 function newCatInteractive() {
 	var p = getResponseElement();
-	p.innerHTML = 'Processing Request...';
+	p.innerHTML = '<?php echo addslashes(__('Processing Request...')); ?>';
 }
 
 function newCatCompletion() {
@@ -186,11 +186,11 @@
 		id = ids[i];
 //		alert(id);
 		if ( id == '-1' ) {
-			p.innerHTML = "You don't have permission to do that.";
+			p.innerHTML = "<?php echo addslashes(__("You don't have permission to do that.")); ?>";
 			return;
 		}
 		if ( id == '0' ) {
-			p.innerHTML = "That category name is invalid.  Try something else.";
+			p.innerHTML = "<?php echo addslashes(__('That category name is invalid.  Try something else.')); ?>";
 			return;
 		}
 		
Index: link-categories.php
===================================================================
--- link-categories.php	(revision 3294)
+++ link-categories.php	(working copy)
@@ -444,7 +444,7 @@
 </div>
 <div class="wrap">
     <h3><?php _e('Note:') ?></h3>
-    <?php printf(__('<p>Deleting a link category does not delete links from that category.<br />It will just set them back to the default category <b>%s</b>.'), get_linkcatname(1)) ?></p>
+	<p><?php printf(__('Deleting a link category does not delete links from that category.<br />It will just set them back to the default category <strong>%s</strong>.'), get_linkcatname(1)) ?></p>
 </div>
 <?php
     break;
Index: plugins.php
===================================================================
--- plugins.php	(revision 3294)
+++ plugins.php	(working copy)
@@ -72,7 +72,9 @@
 $plugins = get_plugins();
 
 if (empty($plugins)) {
-	_e("<p>Couldn't open plugins directory or there are no plugins available.</p>"); // TODO: make more helpful
+	echo '<p>';
+	_e("Couldn't open plugins directory or there are no plugins available."); // TODO: make more helpful
+	echo '</p>';
 } else {
 ?>
 <table width="100%" cellpadding="3" cellspacing="3">
@@ -100,7 +102,7 @@
 	<tr $style>
 		<td class='name'>{$plugin_data['Title']}</td>
 		<td class='vers'>{$plugin_data['Version']}</td>
-		<td class='desc'>{$plugin_data['Description']} <cite>By {$plugin_data['Author']}.</cite></td>
+		<td class='desc'>{$plugin_data['Description']} <cite>".sprintf(__('By %s'), $plugin_data['Author']).".</cite></td>
 		<td class='togl'>$action</td>
 	</tr>";
 	}
Index: theme-editor.php
===================================================================
--- theme-editor.php	(revision 3294)
+++ theme-editor.php	(working copy)
@@ -48,7 +48,7 @@
 case 'update':
 
 	if ( !current_user_can('edit_themes') )
-		die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
+	die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
 
 	$newcontent = stripslashes($_POST['newcontent']);
 	$theme = urlencode($theme);
@@ -69,7 +69,7 @@
 	
 	require_once('admin-header.php');
 	if ( !current_user_can('edit_themes') )
-		die(__('<p>You have do not have sufficient permissions to edit themes for this blog.</p>'));
+	die('<p>'.__('You have do not have sufficient permissions to edit themes for this blog.').'</p>');
 
 	update_recently_edited($file);
 	
Index: admin-functions.php
===================================================================
--- admin-functions.php	(revision 3294)
+++ admin-functions.php	(working copy)
@@ -1754,7 +1754,7 @@
 	// Move the file to the uploads dir
 	$new_file = $uploads['path'] . "/$filename";
 	if ( false === move_uploaded_file($file['tmp_name'], $new_file) )
-		die('The uploaded file could not be moved to $file.');
+		die(__('The uploaded file could not be moved to $file.'));
 
 	// Set correct file permissions
 	$stat = stat(dirname($new_file));
Index: templates.php
===================================================================
--- templates.php	(revision 3294)
+++ templates.php	(working copy)
@@ -37,7 +37,7 @@
 case 'update':
 
 	if ( ! current_user_can('edit_files') )
-		die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
+	die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
 
 	$newcontent = stripslashes($_POST['newcontent']);
 	if (is_writeable($real_file)) {
@@ -58,10 +58,10 @@
 	require_once('./admin-header.php');
 	
 	if ( ! current_user_can('edit_files') )
-		die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
+	die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
 
 	if ( strstr( $file, 'wp-config.php' ) )
-		die( __('<p>The config file cannot be edited or viewed through the web interface. Sorry!</p>') );
+	die('<p>'.__('The config file cannot be edited or viewed through the web interface. Sorry!').'</p>');
 
 	update_recently_edited($file);
 
@@ -152,4 +152,4 @@
 }
 
 include("admin-footer.php");
-?>
\ No newline at end of file
+?>
Index: moderation.php
===================================================================
--- moderation.php	(revision 3294)
+++ moderation.php	(working copy)
@@ -32,7 +32,7 @@
 case 'update':
 
 	if ( ! current_user_can('moderate_comments') )
-		die(__('<p>Your level is not high enough to moderate comments.</p>'));
+	die('<p>'.__('Your level is not high enough to moderate comments.').'</p>');
 
 	$item_ignored = 0;
 	$item_deleted = 0;
@@ -84,30 +84,30 @@
 	$spam     = (int) $_GET['spam'];
 	if ($approved) {
 		if ('1' == $approved) {
-		 echo __("1 comment approved <br />") . "\n";
+			echo __("1 comment approved") . " <br/>\n";
 		} else {
 		 echo sprintf(__("%s comments approved <br />"), $approved) . "\n";
 		}
 	}
 	if ($deleted) {
 		if ('1' == $deleted) {
-		echo __("1 comment deleted <br />") . "\n";
+			echo __("1 comment deleted") . " <br/>\n";
 		} else {
-		echo sprintf(__("%s comments deleted <br />"), $deleted) . "\n";
+			echo sprintf(__("%s comments deleted"), $deleted) . " <br/>\n";
 		}
 	}
  	if ($spam) {
  		if ('1' == $spam) {
- 		echo __("1 comment marked as spam <br />") . "\n";
+			echo __("1 comment marked as spam") . " <br/>\n";
  		} else {
- 		echo sprintf(__("%s comments marked as spam <br />"), $spam) . "\n";
+ 			echo sprintf(__("%s comments marked as spam"), $spam) . " <br/>\n";
  		}
  	}
 	if ($ignored) {
 		if ('1' == $ignored) {
-		echo __("1 comment unchanged <br />") . "\n";
+			echo __("1 comment unchanged") . " <br/>\n";
 		} else {
-		echo sprintf(__("%s comments unchanged <br />"), $ignored) . "\n";
+			echo sprintf(__("%s comments unchanged"), $ignored) . " <br/>\n";
 		}
 	}
 	echo "</p></div>\n";
@@ -206,7 +206,7 @@
 <?php
 } else {
     // nothing to approve
-    echo __("<p>Currently there are no comments for you to moderate.</p>") . "\n";
+	echo '<p>'.__("Currently there are no comments for you to moderate.") . "</p>\n";
 }
 ?>
 
Index: link-manager.php
===================================================================
--- link-manager.php	(revision 3294)
+++ link-manager.php	(working copy)
@@ -291,7 +291,7 @@
         echo " selected='selected'";
         echo ">".$row->cat_id.": ".wp_specialchars($row->cat_name);
         if ($row->auto_toggle == 'Y')
-            echo ' (auto toggle)';
+            echo ' '.__('(auto toggle)');
         echo "</option>\n";
     }
     echo "        </select>\n";
Index: index.php
===================================================================
--- index.php	(revision 3294)
+++ index.php	(working copy)
@@ -129,7 +129,7 @@
 $rss = @fetch_rss('http://wordpress.org/development/feed/');
 if ( isset($rss->items) && 0 != count($rss->items) ) {
 ?>
-<h3>WordPress Development Blog</h3>
+<h3><?php _e('WordPress Development Blog'); ?></h3>
 <?php
 $rss->items = array_slice($rss->items, 0, 3);
 foreach ($rss->items as $item ) {
@@ -169,4 +169,4 @@
 
 <?php
 require('./admin-footer.php');
-?>
\ No newline at end of file
+?>
Index: link-parse-opml.php
===================================================================
--- link-parse-opml.php	(revision 3294)
+++ link-parse-opml.php	(working copy)
@@ -55,11 +55,11 @@
 xml_set_element_handler($xml_parser, "startElement", "endElement");
 
 if (!xml_parse($xml_parser, $opml, true)) {
-    echo(sprintf("XML error: %s at line %d",
+    echo(sprintf(__('XML error: %1$s at line %2$s'),
                    xml_error_string(xml_get_error_code($xml_parser)),
                    xml_get_current_line_number($xml_parser)));
 }
 
 // Free up memory used by the XML parser
 xml_parser_free($xml_parser);
-?>
\ No newline at end of file
+?>
Index: execute-pings.php
===================================================================
--- execute-pings.php	(revision 3294)
+++ execute-pings.php	(working copy)
@@ -2,7 +2,7 @@
 require_once('admin.php');
 
 if ( ! current_user_can('edit_posts') )
-	die ("Cheatin' uh?");
+	die (__("Cheatin' uh?"));
 
 echo '/* No Styles Here */';
 register_shutdown_function('execute_all_pings');
Index: plugin-editor.php
===================================================================
--- plugin-editor.php	(revision 3294)
+++ plugin-editor.php	(working copy)
@@ -35,7 +35,7 @@
 case 'update':
 
 	if ( !current_user_can('edit_plugins') )
-		die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
+	die('<p>'.__('You have do not have sufficient permissions to edit templates for this blog.').'</p>');
 
 	$newcontent = stripslashes($_POST['newcontent']);
 	if (is_writeable($real_file)) {
@@ -55,7 +55,7 @@
 	
 	require_once('admin-header.php');
 	if ( !current_user_can('edit_plugins') )
-		die(__('<p>You have do not have sufficient permissions to edit plugins for this blog.</p>'));
+	die('<p>'.__('You have do not have sufficient permissions to edit plugins for this blog.').'</p>');
 
 	update_recently_edited("wp-content/plugins/$file");