Index: wp-admin/export.php =================================================================== --- wp-admin/export.php (revision 3773) +++ wp-admin/export.php (working copy) @@ -11,8 +11,8 @@

-

-

We need some more text here. Maybe talking about the export file or how to save it.

+

+

Once you've saved the download file, you can use the Import function on another WordPress blog to import this blog.

Index: wp-admin/import.php =================================================================== --- wp-admin/import.php (revision 3773) +++ wp-admin/import.php (working copy) @@ -7,7 +7,7 @@

-

+

posts and comments from your Blogger account'), array ($blogger_import, 'start')); +register_importer('blogger', 'Blogger or Blogspot', __('Import posts, comments, and users from a Blogger or Blogspot blog'), array ($blogger_import, 'start')); ?> Index: wp-admin/import/dotclear.php =================================================================== --- wp-admin/import/dotclear.php (revision 3773) +++ wp-admin/import/dotclear.php (working copy) @@ -132,7 +132,7 @@ function header() { echo '
'; - echo '

'.__('Import Dotclear').'

'; + echo '

'.__('Import DotClear').'

'; echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; } @@ -143,8 +143,8 @@ function greet() { - echo '

'.__('Howdy! This importer allows you to extract posts from a Dotclear database into your blog. Mileage may vary.').'

'; - echo '

'.__('Your Dotclear Configuration settings are as follows:').'

'; + echo '

'.__('Howdy! This will import categories, users, posts, comments, and links from a DotClear database into this blog. Mileage may vary.').'

'; + echo '

'.__('Your DotClear Configuration settings are as follows:').'

'; echo ''; $this->db_form(); echo ''; @@ -626,13 +626,13 @@ function tips() { - echo '

'.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from Dotclear, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'

'; + echo '

'.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from DotClear, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'

'; echo '

'.__('Users').'

'; - echo '

'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn\'t have that login in Dotclear, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and Dotclear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. Every user has the same username, but their passwords are reset to password123. So Login and change it.'), '/wp-login.php').'

'; + echo '

'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn\'t have that login in DotClear, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and DotClear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. Every user has the same username, but their passwords are reset to password123. So Login and change it.'), '/wp-login.php').'

'; echo '

'.__('Preserving Authors').'

'; echo '

'.__('Secondly, we have attempted to preserve post authors. If you are the only author or contributor to your blog, then you are safe. In most cases, we are successful in this preservation endeavor. However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'

'; echo '

'.__('Textile').'

'; - echo '

'.__('Also, since you\'re coming from Dotclear, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

'; + echo '

'.__('Also, since you\'re coming from DotClear, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

'; echo '

'.__('WordPress Resources').'

'; echo '

'.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'

'; echo '
    '; @@ -646,11 +646,11 @@ function db_form() { echo '
      '; - printf('
      • ', __('Dotclear Database User:')); - printf('
      • ', __('Dotclear Database Password:')); - printf('
      • ', __('Dotclear Database Name:')); - printf('
      • ', __('Dotclear Database Host:')); - printf('
      • ', __('Dotclear Table prefix:')); + printf('
      • ', __('DotClear Database User:')); + printf('
      • ', __('DotClear Database Password:')); + printf('
      • ', __('DotClear Database Name:')); + printf('
      • ', __('DotClear Database Host:')); + printf('
      • ', __('DotClear Table prefix:')); printf('
      • ', __('Originating character set:')); echo '
    '; } @@ -743,5 +743,5 @@ } $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')); ?> Index: wp-admin/import/greymatter.php =================================================================== --- wp-admin/import/greymatter.php (revision 3773) +++ wp-admin/import/greymatter.php (working copy) @@ -16,7 +16,7 @@ function greet() { $this->header(); ?> -

    This is a basic GreyMatter to WordPress import script.

    +

    This is a basic Greymatter to WordPress import script.

    What it does:

    • Parses gm-authors.cgi to import (new) authors. Everyone is imported at level 1.
      • @@ -34,18 +34,18 @@ -

      Second step: GreyMatter details:

      +

      Second step: Greymatter details:

      - + - + - + @@ -308,5 +308,5 @@ $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')); ?> Index: wp-admin/import/livejournal.php =================================================================== --- wp-admin/import/livejournal.php (revision 3773) +++ wp-admin/import/livejournal.php (working copy) @@ -20,7 +20,8 @@ } function greet() { - echo '

      '.__('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.').'

      '; + echo '

      '.__('Howdy! Upload your LiveJournal XML export file and we’ll import the posts into this blog.').'

      '; + echo '

      '.__('Choose a LiveJournal XML file to upload, then click Upload file and import.').'

      '; wp_import_upload_form("admin.php?import=livejournal&step=1"); } @@ -164,5 +165,5 @@ $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')); ?> Index: wp-admin/import/mt.php =================================================================== --- wp-admin/import/mt.php (revision 3773) +++ wp-admin/import/mt.php (working copy) @@ -11,7 +11,7 @@ function header() { echo '
      '; - echo '

      '.__('Import Movable Type and Typepad').'

      '; + echo '

      '.__('Import Movable Type or Typepad').'

      '; } function footer() { @@ -21,7 +21,7 @@ function greet() { $this->header(); ?> -

      +

      out of memory error try splitting up the import file into pieces.'); ?>

      posts and comments from your Movable Type or Typepad blog'), array ($mt_import, 'dispatch')); +register_importer('mt', 'Movable Type or Typepad', __('Import posts and comments from a Movable Type or Typepad blog'), array ($mt_import, 'dispatch')); ?> Index: wp-admin/import/rss.php =================================================================== --- wp-admin/import/rss.php (revision 3773) +++ wp-admin/import/rss.php (working copy) @@ -21,7 +21,7 @@ } function greet() { - echo '

      '.__('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.').'

      '; + echo '

      '.__('Howdy! This importer allows you to extract posts from a 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 a RSS file to upload and click Import.').'

      '; wp_import_upload_form("admin.php?import=rss&step=1"); } @@ -167,5 +167,5 @@ $rss_import = new RSS_Import(); -register_importer('rss', 'RSS', __('Import posts from an RSS feed'), array ($rss_import, 'dispatch')); +register_importer('rss', 'RSS', __('Import posts from a RSS feed'), array ($rss_import, 'dispatch')); ?> Index: wp-admin/import/textpattern.php =================================================================== --- wp-admin/import/textpattern.php (revision 3773) +++ wp-admin/import/textpattern.php (working copy) @@ -52,7 +52,8 @@ function greet() { - echo '

      '.__('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.').'

      '; + echo '

      '.__('Howdy! This imports categories, users, posts, comments, and links from any Textpattern 4.0.2+ into this blog.').'

      '; + echo '

      '.__('This has not been tested on previous versions of Textpattern. Mileage may vary.').'

      '; echo '

      '.__('Your Textpattern Configuration settings are as follows:').'

      '; echo ''; $this->db_form(); @@ -659,5 +660,5 @@ } $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')); ?> Index: wp-admin/import/wordpress.php =================================================================== --- wp-admin/import/wordpress.php (revision 3773) +++ wp-admin/import/wordpress.php (working copy) @@ -25,7 +25,8 @@ } function greet() { - echo '

      '.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we’ll import the posts and comments into this blog.').'

      '; + echo '

      '.__('Howdy! Upload your WordPress XML export file and we’ll import the posts, comments, and pages into this blog.').'

      '; + echo '

      '.__('Choose a WordPress XML file to upload, then click Upload file and import.').'

      '; wp_import_upload_form("admin.php?import=wordpress&step=1"); } @@ -306,6 +307,6 @@ $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 posts, comments, and pages from a WordPress XML export file'), array ($wp_import, 'dispatch')); ?> \ No newline at end of file
      Path to GM files:Path to Greymatter files:
      Path to GM entries:Path to Greymatter entries:

      This importer will search for files 00000001.cgi to 000-whatever.cgi,
      so you need to enter the number of the last GM post here.
      (if you don't know that number, just log into your FTP and look it out
      in the entries' folder)
      This importer will search for files 00000001.cgi to 000-whatever.cgi,
      so you need to enter the number of the last Greymatter post here.
      (if you don't know that number, just log into your FTP and look it out
      in the entries' folder)
      Last entry's number: