diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index f6595ebb3..31ac32c0c 100644 --- a/wp-admin/import/blogger.php +++ b/wp-admin/import/blogger.php @@ -662,6 +662,6 @@ class Blogger_Import { $blogger_import = new Blogger_Import(); -register_importer('blogger', __('Blogger and Blogspot'), __('Import posts and comments from your Blogger account'), array ($blogger_import, 'start')); +register_importer('blogger', __('Blogger and Blog*Spot'), __('Import posts and comments from your Blogger account'), array ($blogger_import, 'start')); ?> diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php index 411495bdf..e29e111b3 100644 --- a/wp-admin/import/dotclear.php +++ b/wp-admin/import/dotclear.php @@ -132,7 +132,7 @@ class Dotclear_Import { 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 @@ class Dotclear_Import { 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 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 '
'; $this->db_form(); echo '

'; @@ -626,13 +626,13 @@ class Dotclear_Import { 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 '
    '; @@ -647,10 +647,10 @@ class Dotclear_Import { { echo ''; printf('', __('Dotclear Database User:')); - printf('', __('Dotclear Database Password:')); + printf('', __('DotClear Database Password:')); printf('', __('Dotclear Database Name:')); - printf('', __('Dotclear Database Host:')); - printf('', __('Dotclear Table prefix:')); + printf('', __('DotClear Database Host:')); + printf('', __('DotClear Table prefix:')); printf('', __('Originating character set:')); echo '
    '; } @@ -743,5 +743,5 @@ class Dotclear_Import { } $dc_import = new Dotclear_Import(); -register_importer('dotclear', __('Dotclear'), __('Import posts from a Dotclear Blog'), array ($dc_import, 'dispatch')); +register_importer('dotclear', __('DotClear'), __('Import posts from a DotClear Blog'), array ($dc_import, 'dispatch')); ?> diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php index 440ffbece..7013c6ccd 100644 --- a/wp-admin/import/mt.php +++ b/wp-admin/import/mt.php @@ -11,7 +11,7 @@ class MT_Import { function header() { echo '
    '; - echo '

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

    '; + echo '

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

    '; } function footer() { @@ -432,5 +432,5 @@ class MT_Import { $mt_import = new MT_Import(); -register_importer('mt', __('Movable Type and Typepad'), __('Imports posts and comments from your Movable Type or Typepad blog'), array ($mt_import, 'dispatch')); -?> +register_importer('mt', __('Movable Type and Typepad'), __('Imports posts and comments from your Movable Type or TypePad blog'), array ($mt_import, 'dispatch')); +?> \ No newline at end of file