Changeset 4608

Timestamp:

12/05/2006 07:15:12 AM (18 years ago)

Author:

ryan

Message:

Some string changes. Props MichaelH. fixes #2724

Location:

trunk/wp-admin

Files:

• export.php (modified) (1 diff)
• import.php (modified) (1 diff)
• import/blogger.php (modified) (2 diffs)
• import/dotclear.php (modified) (5 diffs)
• import/greymatter.php (modified) (3 diffs)
• import/livejournal.php (modified) (2 diffs)
• import/mt.php (modified) (3 diffs)
• import/rss.php (modified) (1 diff)
• import/textpattern.php (modified) (2 diffs)
• import/wordpress.php (modified) (2 diffs)

trunk/wp-admin/export.php

@@ -13 +13 @@
 <h2><?php _e('Export'); ?></h2>
 <div class="narrow">
-<p><?php _e('When you click the button below WordPress will create a XML file for you to save to your computer.'); ?></p>
+<p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, comments, custom fields, and categories.'); ?></p>
+<p><?php _e('Once you\'ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p>
 <form action="" method="get">
 <h3><?php _e('Optional options'); ?></h3>

trunk/wp-admin/import.php

@@ -8 +8 @@
 <div class="wrap">
 <h2><?php _e('Import'); ?></h2>
-<p><?php _e('If you have posts or comments in another system WordPress can import them into your current blog. To get started, choose a system to import from below:'); ?></p>
+<p><?php _e('If you have posts or comments in another system, WordPress can import those into this blog. To get started, choose a system to import from below:'); ?></p>
 
 <?php

trunk/wp-admin/import/blogger.php

@@ -8 +8 @@
     // Shows the welcome screen and the magic iframe.
     function greet() {
-        $title = __('Import Blogger');
+        $title = __('Import Blogger or Blogspot');
         $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.');
         $noiframes = __('This feature requires iframe support.');
@@ -663 +663 @@
 $blogger_import = new Blogger_Import();
 
-register_importer('blogger', __('Blogger and Blog*Spot'), __('Import <strong>posts and comments</strong> from your Blogger account'), array ($blogger_import, 'start'));
+register_importer('blogger', __('Blogger or Blog*Spot'), __('Import posts, comments, and users from a Blogger or Blog*Spot blog'), array ($blogger_import, 'start'));
 
 ?>

trunk/wp-admin/import/dotclear.php

@@ -1 +1 @@
 <?php
 /*
- * Dotclear import plugin
+ * DotClear import plugin
  * by Thomas Quinot - http://thomas.quinot.org/
  */
@@ -297 +297 @@
                 $dcid2wpid[$user_id] = $ret_id;
 
-                // Set Dotclear-to-WordPress permissions translation
+                // Set DotClear-to-WordPress permissions translation
 
                 // Update Usermeta Data
@@ -346 +346 @@
                 extract($post);
 
-                // Set Dotclear-to-WordPress status translation
+                // Set DotClear-to-WordPress status translation
                 $stattrans = array(0 => 'draft', 1 => 'publish');
                 $comment_status_map = array (0 => 'closed', 1 => 'open');
@@ -648 +648 @@
     {
         echo '<table class="editform">';
-        printf('<tr><th><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('Dotclear Database User:'));
+        printf('<tr><th><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('DotClear Database User:'));
         printf('<tr><th><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('DotClear Database Password:'));
-        printf('<tr><th><label for="dbname">%s</label></th><td><input type="text" name="dbname" id="dbname" /></td></tr>', __('Dotclear Database Name:'));
+        printf('<tr><th><label for="dbname">%s</label></th><td><input type="text" name="dbname" id="dbname" /></td></tr>', __('DotClear Database Name:'));
         printf('<tr><th><label for="dbhost">%s</label></th><td><input type="text" name="dbhost" nameid="dbhost" value="localhost" /></td></tr>', __('DotClear Database Host:'));
         printf('<tr><th><label for="dbprefix">%s</label></th><td><input type="text" name="dbprefix" id="dbprefix" value="dc_"/></td></tr>', __('DotClear Table prefix:'));
@@ -745 +745 @@
 
 $dc_import = new Dotclear_Import();
-register_importer('dotclear', __('DotClear'), __('Import posts from a DotClear Blog'), array ($dc_import, 'dispatch'));
+register_importer('dotclear', __('DotClear'), __('Import categories, users, posts, comments, and links from a DotClear blog'), array ($dc_import, 'dispatch'));
 ?>

trunk/wp-admin/import/greymatter.php

@@ -7 +7 @@
     function header() {
         echo '<div class="wrap">';
-        echo '<h2>'.__('Import Greymatter').'</h2>';
+        echo '<h2>'.__('Import GreyMatter').'</h2>';
     }
 
@@ -282 +282 @@
 </ul><strong><?php _e('Done') ?></strong></li></ul>
 <p>&nbsp;</p>
-<p><?php _e('Completed Greymatter import!') ?></p>
+<p><?php _e('Completed GreyMatter import!') ?></p>
 <?php
     $this->footer();
@@ -310 +310 @@
 $gm_import = new GM_Import();
 
-register_importer('greymatter', __('Greymatter'), __('Import posts and comments from your Greymatter blog'), array ($gm_import, 'dispatch'));
+register_importer('greymatter', __('GreyMatter'), __('Import users, posts, and comments from a Greymatter blog'), array ($gm_import, 'dispatch'));
 ?>

trunk/wp-admin/import/livejournal.php

@@ -22 +22 @@
     function greet() {
         echo '<div class="narrow">';
-        echo '<p>'.__('Howdy! This importer allows you to extract posts from LiveJournal XML export file into your blog.  Pick a LiveJournal file to upload and click Import.').'</p>';
+        echo '<p>'.__('Howdy! Upload your LiveJournal XML export file and we&#8217;ll import the posts into this blog.').'</p>';
+        echo '<p>'.__('Choose a LiveJournal XML file to upload, then click Upload file and import.').'</p>';
         wp_import_upload_form("admin.php?import=livejournal&amp;step=1");
         echo '</div>';
@@ -167 +168 @@
 $livejournal_import = new LJ_Import();
 
-register_importer('livejournal', __('LiveJournal'), __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch'));
+register_importer('livejournal', __('LiveJournal'), __('Import posts from a LiveJournal XML export file'), array ($livejournal_import, 'dispatch'));
 ?>

trunk/wp-admin/import/mt.php

@@ -12 +12 @@
     function header() {
         echo '<div class="wrap">';
-        echo '<h2>'.__('Import Movable Type and TypePad').'</h2>';
+        echo '<h2>'.__('Import Movable Type or TypePad').'</h2>';
     }
 
@@ -23 +23 @@
 ?>
 <div class="narrow">
-<p><?php _e('Howdy! We&#8217;re about to begin the process to import all of your Movable Type entries into WordPress. To begin, select a file to upload and click Import.'); ?></p>
+<p><?php _e('Howdy! We&#8217;re about to begin importing all of your Movable Type or Typepad entries into WordPress. To begin, choose a file to upload and click Upload file and import.'); ?></p>
 <?php wp_import_upload_form( add_query_arg('step', 1) ); ?>
     <p><?php _e('The importer is smart enough not to import duplicates, so you can run this multiple times without worry if&#8212;for whatever reason&#8212;it doesn\'t finish. If you get an <strong>out of memory</strong> error try splitting up the import file into pieces.'); ?> </p>
@@ -433 +433 @@
 $mt_import = new MT_Import();
 
-register_importer('mt', __('Movable Type and TypePad'), __('Imports <strong>posts and comments</strong> from your Movable Type or TypePad blog'), array ($mt_import, 'dispatch'));
+register_importer('mt', __('Movable Type and TypePad'), __('Import posts and comments from a Movable Type or Typepad blog'), array ($mt_import, 'dispatch'));
 ?>

trunk/wp-admin/import/rss.php

@@ -23 +23 @@
     function greet() {
         echo '<div class="narrow">';
-        echo '<p>'.__('Howdy! This importer allows you to extract posts from any RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>';
+        echo '<p>'.__('Howdy! This importer allows you to extract posts from an RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>';
         wp_import_upload_form("admin.php?import=rss&amp;step=1");
         echo '</div>';

trunk/wp-admin/import/textpattern.php

@@ -53 +53 @@
     function greet() {
         echo '<div class="narrow">';
-        echo '<p>'.__('Howdy! This importer allows you to extract posts from any Textpattern 4.0.2+ into your blog. This has not been tested on previous versions of Textpattern.  Mileage may vary.').'</p>';
+        echo '<p>'.__('Howdy! This imports categories, users, posts, comments, and links from any Textpattern 4.0.2+ into this blog.').'</p>';
+        echo '<p>'.__('This has not been tested on previous versions of Textpattern.  Mileage may vary.').'</p>';
         echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>';
         echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">';
@@ -661 +662 @@
 
 $txp_import = new Textpattern_Import();
-register_importer('textpattern', __('Textpattern'), __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch'));
+register_importer('textpattern', __('Textpattern'), __('Import categories, users, posts, comments, and links from a Textpattern blog'), array ($txp_import, 'dispatch'));
 ?>

trunk/wp-admin/import/wordpress.php

@@ -28 +28 @@
         echo '<div class="narrow">';
         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>';
+        echo '<p>'.__('Choose a WordPress WXR file to upload, then click Upload file and import.').'</p>';
         wp_import_upload_form("admin.php?import=wordpress&amp;step=1");
         echo '</div>';
@@ -341 +342 @@
 $wp_import = new WP_Import();
 
-register_importer('wordpress', 'WordPress', __('Import <strong>posts, comments, custom fields, and categories</strong> from a WordPress export file'), array ($wp_import, 'dispatch'));
+register_importer('wordpress', 'WordPress', __('Import <strong>posts, comments, custom fields, pages, and categories</strong> from a WordPress export file'), array ($wp_import, 'dispatch'));
 
 ?>