Index: E:/PHP/WordPress/SVN/wp-content/plugins/akismet/akismet.php
===================================================================
--- E:/PHP/WordPress/SVN/wp-content/plugins/akismet/akismet.php	(revision 5076)
+++ E:/PHP/WordPress/SVN/wp-content/plugins/akismet/akismet.php	(working copy)
@@ -8,12 +8,14 @@
 Author URI: http://photomatt.net/
 */
 
+load_plugin_textdomain('akismet', 'wp-content/plugins/akismet');
+
 add_action('admin_menu', 'ksd_config_page');
 
 function ksd_config_page() {
 	global $wpdb;
 	if ( function_exists('add_submenu_page') )
-		add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 1, __FILE__, 'akismet_conf');
+		add_submenu_page('plugins.php', __('Akismet Configuration', 'akismet'), __('Akismet Configuration', 'akismet'), 1, __FILE__, 'akismet_conf');
 }
 
 function akismet_conf() {
@@ -30,16 +32,16 @@
 ?>
 
 <div class="wrap">
-<h2><?php _e('Akismet Configuration'); ?></h2>
-	<p><?php printf(__('For many people, <a href="%1$s">Akismet</a> will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have a WordPress.com account yet, you can get one at <a href="%2$s">WordPress.com</a>.'), 'http://akismet.com/', 'http://wordpress.com/api-keys/'); ?></p>
+<h2><?php _e('Akismet Configuration', 'akismet'); ?></h2>
+	<p><?php printf(__('For many people, <a href="%1$s">Akismet</a> will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have a WordPress.com account yet, you can get one at <a href="%2$s">WordPress.com</a>.', 'akismet'), 'http://akismet.com/', 'http://wordpress.com/api-keys/'); ?></p>
 
 <form action="" method="post" id="akismet-conf" style="margin: auto; width: 25em; ">
-<h3><label for="key"><?php _e('WordPress.com API Key'); ?></label></h3>
+<h3><label for="key"><?php _e('WordPress.com API Key', 'akismet'); ?></label></h3>
 <?php if ( $invalid_key ) { ?>
-	<p style="padding: .5em; background-color: #f33; color: #fff; font-weight: bold;"><?php _e('Your key appears invalid. Double-check it.'); ?></p>
+	<p style="padding: .5em; background-color: #f33; color: #fff; font-weight: bold;"><?php _e('Your key appears invalid. Double-check it.', 'akismet'); ?></p>
 <?php } ?>
-<p><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo get_option('wordpress_api_key'); ?>" style="font-family: 'Courier New', Courier, mono; font-size: 1.5em;" /> (<?php _e('<a href="http://faq.wordpress.com/2005/10/19/api-key/">What is this?</a>'); ?>)</p>
-	<p class="submit"><input type="submit" name="submit" value="<?php _e('Update API Key &raquo;'); ?>" /></p>
+<p><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo get_option('wordpress_api_key'); ?>" style="font-family: 'Courier New', Courier, mono; font-size: 1.5em;" /> (<?php _e('<a href="http://faq.wordpress.com/2005/10/19/api-key/">What is this?</a>', 'akismet'); ?>)</p>
+	<p class="submit"><input type="submit" name="submit" value="<?php _e('Update API Key &raquo;', 'akismet'); ?>" /></p>
 </form>
 </div>
 <?php
@@ -59,7 +61,7 @@
 	function akismet_warning() {
 	$path = plugin_basename(__FILE__);
 		echo "
-		<div id='akismet-warning' class='updated fade-ff0000'><p><strong>".__('Akismet is not active.')."</strong> ".sprintf(__('You must <a href="%1$s">enter your WordPress.com API key</a> for it to work.'), "plugins.php?page=$path")."</p></div>
+		<div id='akismet-warning' class='updated fade-ff0000'><p><strong>".__('Akismet is not active.', 'akismet')."</strong> ".sprintf(__('You must <a href="%1$s">enter your WordPress.com API key</a> for it to work.', 'akismet'), "plugins.php?page=$path")."</p></div>
 		<style type='text/css'>
 		#adminmenu { margin-bottom: 5em; }
 		#akismet-warning { position: absolute; top: 7em; }
@@ -183,9 +185,9 @@
 
 function ksd_manage_page() {
 	global $wpdb;
-	$count = sprintf(__('Akismet Spam (%s)'), ksd_spam_count());
+	$count = sprintf(__('Akismet Spam (%s)', 'akismet'), ksd_spam_count());
 	if ( function_exists('add_management_page') )
-		add_management_page(__('Akismet Spam'), $count, 1, __FILE__, 'ksd_caught');
+		add_management_page(__('Akismet Spam', 'akismet'), $count, 1, __FILE__, 'ksd_caught');
 }
 
 function ksd_caught() {
@@ -201,7 +203,7 @@
 			ksd_submit_nonspam_comment($comment);
 			++$i;
 		endforeach;
-		echo '<div class="updated"><p>' . sprintf(__('%1$s comments recovered.'), $i) . "</p></div>";
+		echo '<div class="updated"><p>' . sprintf(__('%1$s comments recovered.', 'akismet'), $i) . "</p></div>";
 	}
 	if ('delete' == $_POST['action']) {
 		$delete_time = addslashes( $_POST['display_time'] );
@@ -209,37 +211,37 @@
 		if (isset($nuked)) {
 			echo '<div class="updated"><p>';
 			if ($nuked) {
-				_e('All spam deleted.');
+				_e('All spam deleted.', 'akismet');
 			}
 			echo "</p></div>";
 		}
 	}
 ?>
 <div class="wrap">
-<h2><?php _e('Caught Spam') ?></h2>
+<h2><?php _e('Caught Spam', 'akismet') ?></h2>
 <?php
 $count = get_option('akismet_spam_count');
 if ( $count ) {
 ?>
-<p><?php printf(__('Akismet has caught <strong>%1$s</strong> spam for you since you installed it.'), number_format($count) ); ?></p>
+<p><?php printf(__('Akismet has caught <strong>%1$s</strong> spam for you since you installed it.', 'akismet'), number_format($count) ); ?></p>
 <?php
 }
 $spam_count = ksd_spam_count();
 if (0 == $spam_count) {
-	echo '<p>'.__('You have no spam currently in the queue. Must be your lucky day. :)').'</p>';
+	echo '<p>'.__('You have no spam currently in the queue. Must be your lucky day. :)', 'akismet').'</p>';
 	echo '</div>';
 } else {
-	echo '<p>'.__('You can delete all of the spam from your database with a single click. This operation cannot be undone, so you may wish to check to ensure that no legitimate comments got through first. Spam is automatically deleted after 15 days, so don&#8217;t sweat it.').'</p>';
+	echo '<p>'.__('You can delete all of the spam from your database with a single click. This operation cannot be undone, so you may wish to check to ensure that no legitimate comments got through first. Spam is automatically deleted after 15 days, so don&#8217;t sweat it.', 'akismet').'</p>';
 ?>
 <form method="post" action="">
 <input type="hidden" name="action" value="delete" />
-<?php printf(__('There are currently %1$s comments identified as spam.'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" name="Submit" value="<?php _e('Delete all'); ?>" />
+<?php printf(__('There are currently %1$s comments identified as spam.', 'akismet'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" name="Submit" value="<?php _e('Delete all', 'akismet'); ?>" />
 <input type="hidden" name="display_time" value="<?php echo current_time('mysql', 1); ?>" />
 </form>
 </div>
 <div class="wrap">
-<h2><?php _e('Last 15 days'); ?></h2>
-<?php echo '<p>'.__('These are the latest comments identified as spam by Akismet. If you see any mistakes, simply mark the comment as "not spam" and Akismet will learn from the submission. If you wish to recover a comment from spam, simply select the comment, and click Not Spam. After 15 days we clean out the junk for you.').'</p>'; ?>
+<h2><?php _e('Last 15 days', 'akismet'); ?></h2>
+<?php echo '<p>'.__('These are the latest comments identified as spam by Akismet. If you see any mistakes, simply mark the comment as "not spam" and Akismet will learn from the submission. If you wish to recover a comment from spam, simply select the comment, and click Not Spam. After 15 days we clean out the junk for you.', 'akismet').'</p>'; ?>
 <?php
 $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' ORDER BY comment_date DESC LIMIT 150");
 
@@ -263,14 +265,14 @@
 <?php comment_text() ?>
 <label for="spam-<?php echo $comment->comment_ID; ?>">
 <input type="checkbox" id="spam-<?php echo $comment->comment_ID; ?>" name="not_spam[]" value="<?php echo $comment->comment_ID; ?>" />
-<?php _e('Not Spam') ?></label>
+<?php _e('Not Spam', 'akismet') ?></label>
 <?php
 }
 }
 ?>
 </ol>
 <p class="submit"> 
-<input type="submit" name="submit" value="<?php _e('Not Spam &raquo;'); ?>" />
+<input type="submit" name="submit" value="<?php _e('Not Spam &raquo;', 'akismet'); ?>" />
 </p>
 </form>
 </div>
@@ -285,8 +287,8 @@
 	if ( !$count )
 		return;
 	$path = plugin_basename(__FILE__);
-	echo '<h3>'.__('Spam').'</h3>';
-	echo '<p>'.sprintf(__('<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.'), 'http://akismet.com/', "edit.php?page=$path", number_format($count) ).'</p>';
+	echo '<h3>'.__('Spam', 'akismet').'</h3>';
+	echo '<p>'.sprintf(__('<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.', 'akismet'), 'http://akismet.com/', "edit.php?page=$path", number_format($count) ).'</p>';
 }
 
 add_action('activity_box_end', 'akismet_stats');