WP Merge - needs testing.

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@797 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 4 insertions, 4 deletions

diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php
index 5c67eec..46f5892 100644
--- a/wp-admin/import/wordpress.php
+++ b/wp-admin/import/wordpress.php
@@ -26,7 +26,7 @@ class WP_Import {
 

 	function greet() {

 		echo '<div class="narrow">';

-		echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts and comments into this blog.').'</p>';

+		echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, comments, custom fields, and categories into this blog.').'</p>';

 		wp_import_upload_form("admin.php?import=wordpress&amp;step=1");

 		echo '</div>';

 	}

@@ -150,8 +150,8 @@ class WP_Import {
 		$j = -1;

 		foreach ($authors as $author) {

 			++ $j;

-			echo '<li>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br />');

-			$this->users_form($j);

+			echo '<li>Current author: <strong>'.$author.'</strong><br />'.'Map to existing: ';

+			$this->users_form($author);

 			echo '</li>';

 		}

 

@@ -308,6 +308,6 @@ class WP_Import {
 

 $wp_import = new WP_Import();

 

-register_importer('wordpress', 'WordPress', __('Import posts from a WordPress export file'), array ($wp_import, 'dispatch'));

+register_importer('wordpress', 'WordPress', __('Import <strong>posts, comments, custom fields, and categories</strong> from a WordPress export file'), array ($wp_import, 'dispatch'));

 

 ?>