Changeset 4608

Show
Ignore:
Timestamp:
12/05/06 07:15:12 (2 years ago)
Author:
ryan
Message:

Some string changes. Props MichaelH. fixes #2724

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/export.php

    r4563 r4608  
    1313<h2><?php _e('Export'); ?></h2> 
    1414<div class="narrow"> 
    15 <p><?php _e('When you click the button below WordPress will create a XML file for you to save to your computer.'); ?></p> 
     15<p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p> 
    1616<p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, comments, custom fields, and categories.'); ?></p> 
     17<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> 
    1718<form action="" method="get"> 
    1819<h3><?php _e('Optional options'); ?></h3> 

  • trunk/wp-admin/import.php

    r4480 r4608  
    88<div class="wrap"> 
    99<h2><?php _e('Import'); ?></h2> 
    10 <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> 
     10<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> 
    1111 
    1212<?php 

  • trunk/wp-admin/import/blogger.php

    r4535 r4608  
    88    // Shows the welcome screen and the magic iframe. 
    99    function greet() { 
    10         $title = __('Import Blogger'); 
     10        $title = __('Import Blogger or Blogspot'); 
    1111        $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.'); 
    1212        $noiframes = __('This feature requires iframe support.'); 
    …… 
    663663$blogger_import = new Blogger_Import(); 
    664664 
    665 register_importer('blogger', __('Blogger and Blog*Spot'), __('Import <strong>posts and comments</strong> from your Blogger account'), array ($blogger_import, 'start')); 
     665register_importer('blogger', __('Blogger or Blog*Spot'), __('Import posts, comments, and users from a Blogger or Blog*Spot blog'), array ($blogger_import, 'start')); 
    666666 
    667667?> 

  • trunk/wp-admin/import/dotclear.php

    r4495 r4608  
    11<?php 
    22/* 
    3  * Dotclear import plugin 
     3 * DotClear import plugin 
    44 * by Thomas Quinot - http://thomas.quinot.org/ 
    55 */ 
    …… 
    297297                $dcid2wpid[$user_id] = $ret_id; 
    298298 
    299                 // Set Dotclear-to-WordPress permissions translation 
     299                // Set DotClear-to-WordPress permissions translation 
    300300 
    301301                // Update Usermeta Data 
    …… 
    346346                extract($post); 
    347347 
    348                 // Set Dotclear-to-WordPress status translation 
     348                // Set DotClear-to-WordPress status translation 
    349349                $stattrans = array(0 => 'draft', 1 => 'publish'); 
    350350                $comment_status_map = array (0 => 'closed', 1 => 'open'); 
    …… 
    648648    { 
    649649        echo '<table class="editform">'; 
    650         printf('<tr><th><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('Dotclear Database User:')); 
     650        printf('<tr><th><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('DotClear Database User:')); 
    651651        printf('<tr><th><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('DotClear Database Password:')); 
    652         printf('<tr><th><label for="dbname">%s</label></th><td><input type="text" name="dbname" id="dbname" /></td></tr>', __('Dotclear Database Name:')); 
     652        printf('<tr><th><label for="dbname">%s</label></th><td><input type="text" name="dbname" id="dbname" /></td></tr>', __('DotClear Database Name:')); 
    653653        printf('<tr><th><label for="dbhost">%s</label></th><td><input type="text" name="dbhost" nameid="dbhost" value="localhost" /></td></tr>', __('DotClear Database Host:')); 
    654654        printf('<tr><th><label for="dbprefix">%s</label></th><td><input type="text" name="dbprefix" id="dbprefix" value="dc_"/></td></tr>', __('DotClear Table prefix:')); 
    …… 
    745745 
    746746$dc_import = new Dotclear_Import(); 
    747 register_importer('dotclear', __('DotClear'), __('Import posts from a DotClear Blog'), array ($dc_import, 'dispatch')); 
     747register_importer('dotclear', __('DotClear'), __('Import categories, users, posts, comments, and links from a DotClear blog'), array ($dc_import, 'dispatch')); 
    748748?> 

  • trunk/wp-admin/import/greymatter.php

    r4495 r4608  
    77    function header() { 
    88        echo '<div class="wrap">'; 
    9         echo '<h2>'.__('Import Greymatter').'</h2>'; 
     9        echo '<h2>'.__('Import GreyMatter').'</h2>'; 
    1010    } 
    1111 
    …… 
    282282</ul><strong><?php _e('Done') ?></strong></li></ul> 
    283283<p>&nbsp;</p> 
    284 <p><?php _e('Completed Greymatter import!') ?></p> 
     284<p><?php _e('Completed GreyMatter import!') ?></p> 
    285285<?php 
    286286    $this->footer(); 
    …… 
    310310$gm_import = new GM_Import(); 
    311311 
    312 register_importer('greymatter', __('Greymatter'), __('Import posts and comments from your Greymatter blog'), array ($gm_import, 'dispatch')); 
     312register_importer('greymatter', __('GreyMatter'), __('Import users, posts, and comments from a Greymatter blog'), array ($gm_import, 'dispatch')); 
    313313?> 

  • trunk/wp-admin/import/livejournal.php

    r4349 r4608  
    2222    function greet() { 
    2323        echo '<div class="narrow">'; 
    24         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>'; 
     24        echo '<p>'.__('Howdy! Upload your LiveJournal XML export file and we&#8217;ll import the posts into this blog.').'</p>'; 
     25        echo '<p>'.__('Choose a LiveJournal XML file to upload, then click Upload file and import.').'</p>'; 
    2526        wp_import_upload_form("admin.php?import=livejournal&amp;step=1"); 
    2627        echo '</div>'; 
    …… 
    167168$livejournal_import = new LJ_Import(); 
    168169 
    169 register_importer('livejournal', __('LiveJournal'), __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch')); 
     170register_importer('livejournal', __('LiveJournal'), __('Import posts from a LiveJournal XML export file'), array ($livejournal_import, 'dispatch')); 
    170171?> 

  • trunk/wp-admin/import/mt.php

    r4495 r4608  
    1212    function header() { 
    1313        echo '<div class="wrap">'; 
    14         echo '<h2>'.__('Import Movable Type and TypePad').'</h2>'; 
     14        echo '<h2>'.__('Import Movable Type or TypePad').'</h2>'; 
    1515    } 
    1616 
    …… 
    2323?> 
    2424<div class="narrow"> 
    25 <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> 
     25<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> 
    2626<?php wp_import_upload_form( add_query_arg('step', 1) ); ?> 
    2727    <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> 
    …… 
    433433$mt_import = new MT_Import(); 
    434434 
    435 register_importer('mt', __('Movable Type and TypePad'), __('Imports <strong>posts and comments</strong> from your Movable Type or TypePad blog'), array ($mt_import, 'dispatch')); 
     435register_importer('mt', __('Movable Type and TypePad'), __('Import posts and comments from a Movable Type or Typepad blog'), array ($mt_import, 'dispatch')); 
    436436?> 

  • trunk/wp-admin/import/rss.php

    r4349 r4608  
    2323    function greet() { 
    2424        echo '<div class="narrow">'; 
    25         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>'; 
     25        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>'; 
    2626        wp_import_upload_form("admin.php?import=rss&amp;step=1"); 
    2727        echo '</div>'; 

  • trunk/wp-admin/import/textpattern.php

    r4495 r4608  
    5353    function greet() { 
    5454        echo '<div class="narrow">'; 
    55         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>'; 
     55        echo '<p>'.__('Howdy! This imports categories, users, posts, comments, and links from any Textpattern 4.0.2+ into this blog.').'</p>'; 
     56        echo '<p>'.__('This has not been tested on previous versions of Textpattern.  Mileage may vary.').'</p>'; 
    5657        echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>'; 
    5758        echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">'; 
    …… 
    661662 
    662663$txp_import = new Textpattern_Import(); 
    663 register_importer('textpattern', __('Textpattern'), __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch')); 
     664register_importer('textpattern', __('Textpattern'), __('Import categories, users, posts, comments, and links from a Textpattern blog'), array ($txp_import, 'dispatch')); 
    664665?> 

  • trunk/wp-admin/import/wordpress.php

    r4558 r4608  
    2828        echo '<div class="narrow">'; 
    2929        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>'; 
     30        echo '<p>'.__('Choose a WordPress WXR file to upload, then click Upload file and import.').'</p>'; 
    3031        wp_import_upload_form("admin.php?import=wordpress&amp;step=1"); 
    3132        echo '</div>'; 
    …… 
    341342$wp_import = new WP_Import(); 
    342343 
    343 register_importer('wordpress', 'WordPress', __('Import <strong>posts, comments, custom fields, and categories</strong> from a WordPress export file'), array ($wp_import, 'dispatch')); 
     344register_importer('wordpress', 'WordPress', __('Import <strong>posts, comments, custom fields, pages, and categories</strong> from a WordPress export file'), array ($wp_import, 'dispatch')); 
    344345 
    345346?>