Ticket #3109: i18n_fixes.diff

File i18n_fixes.diff, 25.1 KB (added by nbachiyski, 6 years ago)

  • wp-includes/post-template.php

     
    330330                return "<a href=\"{$_post->guid}\" title=\"{$_post->post_title}\" >{$innerHTML}</a>"; 
    331331 
    332332        } else { 
    333                 $p .= __('Missing attachment'); 
     333                $p .= __('Missing Attachment'); 
    334334        } 
    335335        return $p; 
    336336} 

  • wp-includes/classes.php

     
    2525                                $cnt++; 
    2626                        } 
    2727                } 
    28                 echo "<div class='updated'><p>$cnt comment"; 
    29                 if ($cnt != 1 ) echo "s"; 
    30                 echo " moved to the moderation queue.</p></div>\n"; 
     28                echo "<div class='updated'><p> "; 
     29                printf(__('%d comment(s) moved to the moderation queue.'), $cnt); 
     30                echo "</p></div>\n"; 
    3131        }       // End function move_spam 
    3232 
    3333        function find_spam() { 
    … …  
    5656                $numfound = count($counters[found]); 
    5757                $numqueue = $counters[in_queue]; 
    5858 
    59                 $body = '<p>' . sprintf(__('Suspected spam comments: <strong>%s</strong>'), $numfound) . '</p>'; 
     59                $body = '<p>' . sprintf(__('Suspected spam comments: %s'), "<strong>$numfound</strong>") . '</p>'; 
    6060 
    6161                if ( count($counters[found]) > 0 ) { 
    6262                        $id_list = implode( ',', $counters[found] ); 

  • wp-includes/functions.php

     
    947947 
    948948        $ifp = @ fopen($new_file, 'wb'); 
    949949        if ( ! $ifp ) 
    950                 return array('error' => "Could not write file $new_file."); 
     950                return array('error' => sprintf(__('Could not write file %s'), $new_file)); 
    951951 
    952952        $success = @ fwrite($ifp, $bits); 
    953953        fclose($ifp); 
    … …  
    10911091                } 
    10921092        } 
    10931093 
    1094         return __('Are you sure you want to do this'); 
     1094        return __('Are you sure you want to do this?'); 
    10951095} 
    10961096 
    10971097function wp_nonce_ays($action) { 

  • wp-includes/bookmark-template.php

     
    271271                $title = $desc; 
    272272 
    273273                if ( $show_updated ) 
    274                         if ( '00' != substr($bookmark->link_updated_f, 0, 2) ) 
    275                                 $title .= ' (Last updated ' . date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600)) . ')'; 
     274                        if ( '00' != substr($bookmark->link_updated_f, 0, 2) ) { 
     275                                $title .= ' '; 
     276                                $title .= sprintf(__('Last updated: %s'), date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600))); 
     277                                $title .= ')'; 
     278                        } 
    276279 
    277280                if ( '' != $title ) 
    278281                        $title = ' title="' . $title . '"'; 
    … …  
    348351        echo $output; 
    349352} 
    350353 
    351 ?> 
    352  No newline at end of file 
     354?> 

  • wp-admin/options-privacy.php

     
    1616<th scope="row"><?php _e('Blog visibility:') ?> </th>  
    1717<td> 
    1818<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> /> 
    19 <label for="blog-public">I would like my blog to be visible to anyone who visits, including search engines and archivers</label> 
     19        <label for="blog-public"><?php _e('I would like my blog to be visible to anyone who visits, including search engines and archivers') ?></label> 
    2020<br /> 
    2121<input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> /> 
    22 <label for="blog-norobots">I would like to block search engines, but allow normal folks</label> 
     22        <label for="blog-norobots"><?php _e('I would like to block search engines, but allow normal folks') ?></label> 
    2323<?php do_action('blog_privacy_selector'); ?> 
    2424</td>  
    2525</tr> 

  • wp-admin/import/livejournal.php

     
    164164 
    165165$livejournal_import = new LJ_Import(); 
    166166 
    167 register_importer('livejournal', 'LiveJournal', __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch')); 
     167register_importer('livejournal', __('LiveJournal'), __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch')); 
    168168?> 

  • wp-admin/import/dotclear.php

     
    632632                echo '<h3>'.__('Preserving Authors').'</h3>'; 
    633633                echo '<p>'.__('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.').'</p>'; 
    634634                echo '<h3>'.__('Textile').'</h3>'; 
    635                 echo '<p>'.__('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 <a href="http://www.huddledmasses.org/2004/04/19/wordpress-plugin-textile-20/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>'; 
     635                echo '<p>'.__('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 <a href="http://www.huddledmasses.org/category/development/wordpress/textile/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>'; 
    636636                echo '<h3>'.__('WordPress Resources').'</h3>'; 
    637637                echo '<p>'.__('Finally, there are numerous WordPress resources around the internet.  Some of them are:').'</p>'; 
    638638                echo '<ul>'; 
    639639                echo '<li>'.__('<a href="http://www.wordpress.org">The official WordPress site</a>').'</li>'; 
    640                 echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums').'</li>'; 
     640                echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums</a>').'</li>'; 
    641641                echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>'; 
    642642                echo '</ul>'; 
    643                 echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '/wp-login.php').'</p>'; 
     643                echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '../wp-login.php').'</p>'; 
    644644        } 
    645645 
    646646        function db_form() 
    … …  
    743743} 
    744744 
    745745$dc_import = new Dotclear_Import(); 
    746 register_importer('dotclear', 'Dotclear', __('Import posts from a Dotclear Blog'), array ($dc_import, 'dispatch')); 
     746register_importer('dotclear', __('Dotclear'), __('Import posts from a Dotclear Blog'), array ($dc_import, 'dispatch')); 
    747747?> 

  • wp-admin/import/mt.php

     
    3232                global $wpdb, $testing; 
    3333                $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID"); 
    3434?><select name="userselect[<?php echo $n; ?>]"> 
    35         <option value="#NONE#">- Select -</option> 
     35        <option value="#NONE#"><?php _e('- Select -') ?></option> 
    3636        <?php 
    3737 
    3838 
    … …  
    148148                $j = -1; 
    149149                foreach ($authors as $author) { 
    150150                        ++ $j; 
    151                         echo '<li>Current author: <strong>'.$author.'</strong><br />'.'Create user <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br /> or map to existing '; 
     151                        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 />'); 
    152152                        $this->users_form($j); 
    153153                        echo '</li>'; 
    154154                } 
    155155 
    156                 echo '<input type="submit" value="Submit">'.'<br/>'; 
     156                echo '<input type="submit" value="'.__('Submit').'">'.'<br/>'; 
    157157                echo '</form>'; 
    158158                echo '</ol></div>'; 
    159159 
    … …  
    163163                $file = wp_import_handle_upload(); 
    164164                if ( isset($file['error']) ) { 
    165165                        $this->header(); 
    166                         echo '<p>Sorry, there has been an error.</p>'; 
     166                        echo '<p>'.__('Sorry, there has been an error').'.</p>'; 
    167167                        echo '<p><strong>' . $file['error'] . '</strong></p>'; 
    168168                        $this->footer(); 
    169169                        return; 
    … …  
    334334                                        } 
    335335                                } 
    336336                                if ( $num_comments ) 
    337                                         printf(__(' (%s comments)'), $num_comments); 
     337                                        printf(' '.__('(%s comments)'), $num_comments); 
    338338 
    339339                                // Finally the pings 
    340340                                // fix the double newline on the first one 
    … …  
    382382                                        } 
    383383                                } 
    384384                                if ( $num_pings ) 
    385                                         printf(__(' (%s pings)'), $num_pings); 
     385                                        printf(' '.__('(%s pings)'), $num_pings); 
    386386 
    387387                                echo "</li>"; 
    388388                        } 
    … …  
    430430 
    431431$mt_import = new MT_Import(); 
    432432 
    433 register_importer('mt', 'Movable Type and Typepad', __('Imports <strong>posts and comments</strong> from your Movable Type or Typepad blog'), array ($mt_import, 'dispatch')); 
     433register_importer('mt', __('Movable Type and Typepad'), __('Imports <strong>posts and comments</strong> from your Movable Type or Typepad blog'), array ($mt_import, 'dispatch')); 
    434434?> 

  • wp-admin/import/blogger.php

     
    341341                                $form = "<div style='height:0px;width:0px;overflow:hidden;'>"; 
    342342                                $form.= $body; 
    343343                                $form.= "</div><script type='text/javascript'>forms=document.getElementsByTagName('form');for(i=0;i<forms.length;i++){if(forms[i].action.search('{$blog_opt}')){forms[i].submit();break;}}</script>"; 
    344                                 $output.= '<p>'.sprintf('<strong>%s</strong> in progress, please wait...', $blog_opt)."</p>\n"; 
     344                                $output.= '<p>'.sprintf(__('<strong>%s</strong> in progress, please wait...'), $blog_opt)."</p>\n"; 
    345345                        } else { 
    346346                                $output.= "<p>$blog_opt</p>\n"; 
    347347                        } 
    … …  
    420420                                                        $user_email = $wpdb->escape($post_author_email); 
    421421                                                        $user_password = substr(md5(uniqid(microtime())), 0, 6); 
    422422                                                        $result = wp_create_user( $user_login, $user_password, $user_email ); 
    423                                                         $status.= sprintf('Registered user <strong>%s</strong>.', $user_login); 
     423                                                        $status.= sprintf(__('Registered user <strong>%s</strong>.'), $user_login); 
    424424                                                        $this->import['blogs'][$_GET['blog']]['newusers'][] = $user_login; 
    425425                                                } 
    426426                                                $userdata = get_userdatabylogin( $post_author_name ); 
    … …  
    509509                                        } 
    510510                                } 
    511511                                $status = sprintf(__('%s post(s) parsed, %s skipped...'), $postcount,  $skippedpostcount).' '. 
    512                                         sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcoun, $skippedcommentcount).' '. 
     512                                        sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcount, $skippedcommentcount).' '. 
    513513                                        ' <strong>'.__('Done').'</strong>'; 
    514514                                $import = $this->import; 
    515515                                $import['blogs'][$_GET['blog']]['archives']["$url"] = $status; 
    … …  
    546546                                                $response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode={$optary['backup']['publishMode']}", $headers); 
    547547                                                sleep(2); 
    548548                                                if ( $response['code'] >= 400 ) 
    549                                                         wp_die('<h1>Error restoring publishMode.</h1><p>Please tell the devs.</p>' . addslashes(print_r($response, 1)) ); 
     549                                                        wp_die('<h1>'.__('Error restoring publishMode').'</h1><p>'.__('Please tell the devs.').'</p>' . addslashes(print_r($response, 1)) ); 
    550550                                        } 
    551551                                } 
    552552                                if ( $optary['backup'] != $optary['modify'] ) { 
    … …  
    662662 
    663663$blogger_import = new Blogger_Import(); 
    664664 
    665 register_importer('blogger', 'Blogger and Blogspot', __('Import <strong>posts and comments</strong> from your Blogger account'), array ($blogger_import, 'start')); 
     665register_importer('blogger', __('Blogger and Blogspot'), __('Import <strong>posts and comments</strong> from your Blogger account'), array ($blogger_import, 'start')); 
    666666 
    667667?> 

  • wp-admin/import/blogware.php

     
    188188 
    189189$blogware_import = new BW_Import(); 
    190190 
    191 register_importer('blogware', 'Blogware', __('Import posts from Blogware'), array ($blogware_import, 'dispatch')); 
     191register_importer('blogware', __('Blogware'), __('Import posts from Blogware'), array ($blogware_import, 'dispatch')); 
    192192?> 

  • wp-admin/import/textpattern.php

     
    555555                echo '<h3>'.__('Preserving Authors').'</h3>'; 
    556556                echo '<p>'.__('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.').'</p>'; 
    557557                echo '<h3>'.__('Textile').'</h3>'; 
    558                 echo '<p>'.__('Also, since you\'re coming from Textpattern, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/2004/04/19/wordpress-plugin-textile-20/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>'; 
     558                echo '<p>'.__('Also, since you\'re coming from Textpattern, you probably have been using Textile to format your comments and posts.  If this is the case, we recommend downloading and installing <a href="http://www.huddledmasses.org/category/development/wordpress/textile/">Textile for WordPress</a>.  Trust me... You\'ll want it.').'</p>'; 
    559559                echo '<h3>'.__('WordPress Resources').'</h3>'; 
    560560                echo '<p>'.__('Finally, there are numerous WordPress resources around the internet.  Some of them are:').'</p>'; 
    561561                echo '<ul>'; 
    562562                echo '<li>'.__('<a href="http://www.wordpress.org">The official WordPress site</a>').'</li>'; 
    563                 echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums').'</li>'; 
     563                echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums</a>').'</li>'; 
    564564                echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>'; 
    565565                echo '</ul>'; 
    566566                echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '/wp-login.php').'</p>'; 
    … …  
    659659} 
    660660 
    661661$txp_import = new Textpattern_Import(); 
    662 register_importer('textpattern', 'Textpattern', __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch')); 
     662register_importer('textpattern', __('Textpattern'), __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch')); 
    663663?> 

  • wp-admin/import/greymatter.php

     
    1616        function greet() { 
    1717                $this->header(); 
    1818?> 
    19 <p>This is a basic GreyMatter to WordPress import script.</p> 
    20 <p>What it does:</p> 
     19<p><?php _e('This is a basic GreyMatter to WordPress import script.') ?></p> 
     20<p><?php _e('What it does:') ?></p> 
    2121<ul> 
    22 <li>Parses gm-authors.cgi to import (new) authors. Everyone is imported at level 1.</li> 
    23 <li>Parses the entries cgi files to import posts, comments, and karma on posts (although karma is not used on WordPress yet).<br />If authors are found not to be in gm-authors.cgi, imports them at level 0.</li> 
    24 <li>Detects duplicate entries or comments. If you don't import everything the first time, or this import should fail in the middle, duplicate entries will not be made when you try again.</li> 
     22<li><?php _e('Parses gm-authors.cgi to import (new) authors. Everyone is imported at level 1.') ?></li> 
     23<li><?php _e('Parses the entries cgi files to import posts, comments, and karma on posts (although karma is not used on WordPress yet).<br />If authors are found not to be in gm-authors.cgi, imports them at level 0.') ?></li> 
     24<li><?php _e("Detects duplicate entries or comments. If you don't import everything the first time, or this import should fail in the middle, duplicate entries will not be made when you try again.") ?></li> 
    2525</ul> 
    26 <p>What it does not:</p> 
     26<p><?php _e('What it does not:') ?></p> 
    2727<ul> 
    28 <li>Parse gm-counter.cgi, gm-banlist.cgi, gm-cplog.cgi (you can make a CP log hack if you really feel like it, but I question the need of a CP log).</li> 
    29 <li>Import gm-templates.</li> 
    30 <li>Doesn't keep entries on top.</li> 
     28<li><?php _e('Parse gm-counter.cgi, gm-banlist.cgi, gm-cplog.cgi (you can make a CP log hack if you really feel like it, but I question the need of a CP log).') ?></li> 
     29<li><?php _e('Import gm-templates.') ?></li> 
     30<li><?php _e("Doesn't keep entries on top.")?></li> 
    3131</ul> 
    3232<p>&nbsp;</p> 
    3333 
    3434<form name="stepOne" method="get"> 
    3535<input type="hidden" name="import" value="greymatter" /> 
    3636<input type="hidden" name="step" value="1" /> 
    37 <h3>Second step: GreyMatter details:</h3> 
     37<h3><?php _e('Second step: GreyMatter details:') ?></h3> 
    3838<p><table cellpadding="0"> 
    3939<tr> 
    40 <td>Path to GM files:</td> 
     40<td><?php _e('Path to GM files:') ?></td> 
    4141<td><input type="text" style="width:300px" name="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td> 
    4242</tr> 
    4343<tr> 
    44 <td>Path to GM entries:</td> 
     44<td><?php _e('Path to GM entries:') ?></td> 
    4545<td><input type="text" style="width:300px" name="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td> 
    4646</tr> 
    4747<tr> 
    48 <td colspan="2"><br />This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don't know that number, just log into your FTP and look it out<br />in the entries' folder)</td> 
     48<td colspan="2"><br /><?php _e("This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don't know that number, just log into your FTP and look it out<br />in the entries' folder)") ?></td> 
    4949</tr> 
    5050<tr> 
    51 <td>Last entry's number:</td> 
     51<td><?php _e("Last entry's number:") ?></td> 
    5252<td><input type="text" name="lastentry" value="00000001" /></td> 
    5353</tr> 
    5454</table> 
    5555</p> 
    56 <p>When you're ready, click OK to start importing: <input type="submit" name="submit" value="OK" class="search" /></p> 
     56<p><?php _e("When you're ready, click OK to start importing: ") ?><input type="submit" name="submit" value="<?php _e('OK') ?>" class="search" /></p> 
    5757</form> 
    5858<p>&nbsp</p> 
    5959<?php 
    … …  
    8787                } 
    8888 
    8989                if (!chdir($archivespath)) 
    90                         wp_die("Wrong path, $archivespath\ndoesn't exist\non the server"); 
     90                        wp_die(sprintf(__("Wrong path, %s\ndoesn't exist\non the server"), $archivespath)); 
    9191 
    9292                if (!chdir($gmpath)) 
    93                         wp_die("Wrong path, $gmpath\ndoesn't exist\non the server"); 
     93                        wp_die(sprintf(__("Wrong path, %s\ndoesn't exist\non the server"), $gmpath)); 
    9494                         
    9595                $this->header(); 
    9696?> 
    97 <p>The importer is running...</p> 
     97<p><?php _e('The importer is running...') ?></p> 
    9898<ul> 
    99 <li>importing users... <ul><?php 
     99<li><?php _e('importing users...') ?><ul><?php 
    100100 
    101101        chdir($gmpath); 
    102102        $userbase = file("gm-authors.cgi"); 
    … …  
    120120 
    121121                $user_id = username_exists($user_login); 
    122122                if ($user_id) { 
    123                         echo "<li>user <i>$user_login</i>... <b>Already exists</b></li>"; 
     123                        printf('<li>'.__('user %s').'<strong>'.__('Already exists').'</strong></li>', "<em>$user_login</em>"); 
    124124                        $this->gmnames[$userdata[0]] = $user_id; 
    125125                        continue; 
    126126                } 
    … …  
    129129                $user_id = wp_insert_user($user_info); 
    130130                $this->gmnames[$userdata[0]] = $user_id; 
    131131                 
    132                 echo "<li>user <i>$user_login</i>... <b>Done</b></li>"; 
    133  
     132                printf('<li>'.__('user %s...').' <strong>'.__('Done').'</strong></li>', "<em>$user_login</em>"); 
    134133        } 
    135134 
    136 ?></ul><b>Done</b></li> 
    137 <li>importing posts, comments, and karma...<br /><ul><?php 
     135?></ul><strong><?php _e('Done') ?></strong></li> 
     136<li><?php _e('importing posts, comments, and karma...') ?><br /><ul><?php 
    138137 
    139138        chdir($archivespath); 
    140139         
    … …  
    163162                if (is_file($entryfile.".cgi")) { 
    164163 
    165164                        $entry=file($entryfile.".cgi"); 
    166                         echo "<li>entry # $entryfile "; 
    167165                        $postinfo=explode("|",$entry[0]); 
    168166                        $postmaincontent=$this->gm2autobr($entry[2]); 
    169167                        $postmorecontent=$this->gm2autobr($entry[3]); 
    … …  
    171169                        $post_author=trim($wpdb->escape($postinfo[1])); 
    172170 
    173171                        $post_title=$this->gm2autobr($postinfo[2]); 
    174                         echo " : $post_title : by $postinfo[1]"; 
     172                        printf('<li>'.__('entry # %s : %s : by %s'), $entryfile, $post_title, $postinfo[1]); 
    175173                        $post_title=$wpdb->escape($post_title); 
    176174 
    177175                        $postyear=$postinfo[6]; 
    … …  
    198196                        $ping_status = 'closed'; 
    199197                         
    200198                        if ($post_ID = post_exists($post_title, '', $post_date)) { 
    201                                 echo ' (already exists)'; 
     199                                echo ' '; 
     200                                _e('(already exists)'); 
    202201                        } else { 
    203202                                //just so that if a post already exists, new users are not created by checkauthor 
    204203                                // we'll check the author is registered, or if it's a deleted author 
    … …  
    219218                                        $user_id = wp_insert_user($user_info); 
    220219                                        $this->gmnames[$postinfo[1]] = $user_id; 
    221220                                         
    222                                         echo ": registered deleted user <i>$user_login</i> at level 0 "; 
     221                                        echo ': '; 
     222                                        printf(__('registered deleted user %s at level 0 '), "<em>$user_login</em>"); 
    223223                                } 
    224224                         
    225225                                if (array_key_exists($postinfo[1], $this->gmnames)) { 
    … …  
    266266                                        $numComments++; 
    267267                                } 
    268268                                if ($numAddedComments > 0) { 
    269                                         echo ": imported $numAddedComments comment"; 
    270                                         if ($numAddedComments != 1) 
    271                                                 echo "s"; 
     269                                        echo ': '; 
     270                                        printf(__('imported %d comment(s)'), $numAddedComments); 
    272271                                } 
    273272                                $preExisting = $numComments - numAddedComments; 
    274                                 if ($preExisting > 0) 
    275                                         echo " (ignored $preExisting pre-existing comments)"; 
     273                                if ($preExisting > 0) { 
     274                                        echo ' '; 
     275                                        printf(__('ignored %d pre-existing comments'), $preExisting); 
     276                                } 
    276277                        } 
    277                         echo "... <b>Done</b></li>"; 
     278                        echo '... <strong>'.__('Done').'</strong></li>'; 
    278279                } 
    279280        } 
    280281        ?> 
    281 </ul><b>Done</b></li></ul> 
     282</ul><strong><?php _e('Done') ?></strong></li></ul> 
    282283<p>&nbsp;</p> 
    283 <p>Completed Greymatter import !</p> 
     284<p><?php _e('Completed Greymatter import!') ?></p> 
    284285<?php 
    285286        $this->footer(); 
    286287        } 
    … …  
    308309 
    309310$gm_import = new GM_Import(); 
    310311 
    311 register_importer('greymatter', 'Greymatter', __('Import posts and comments from your Greymatter blog'), array ($gm_import, 'dispatch')); 
     312register_importer('greymatter', __('Greymatter'), __('Import posts and comments from your Greymatter blog'), array ($gm_import, 'dispatch')); 
    312313?> 

  • wp-admin/import/rss.php

     
    168168 
    169169$rss_import = new RSS_Import(); 
    170170 
    171 register_importer('rss', 'RSS', __('Import posts from an RSS feed'), array ($rss_import, 'dispatch')); 
     171register_importer('rss', __('RSS'), __('Import posts from an RSS feed'), array ($rss_import, 'dispatch')); 
    172172?> 

  • wp-admin/import/wordpress.php

     
    148148                $j = -1; 
    149149                foreach ($authors as $author) { 
    150150                        ++ $j; 
    151                         echo '<li>Current author: <strong>'.$author.'</strong><br />'.'Create user <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br /> or map to existing '; 
     151                        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 />'); 
    152152                        $this->users_form($j); 
    153153                        echo '</li>'; 
    154154                } 
    … …  
    163163                $file = wp_import_handle_upload(); 
    164164                if ( isset($file['error']) ) { 
    165165                        $this->header(); 
    166                         echo '<p>Sorry, there has been an error.</p>'; 
     166                        echo '<p>'.__('Sorry, there has been an error.').'</p>'; 
    167167                        echo '<p><strong>' . $file['error'] . '</strong></p>'; 
    168168                        $this->footer(); 
    169169                        return; 
    … …  
    248248                                        } 
    249249                                } } 
    250250                                if ( $num_comments ) 
    251                                         printf(__(' (%s comments)'), $num_comments); 
     251                                        printf(' '.__('(%s comments)'), $num_comments); 
    252252 
    253253                                // Now for post meta 
    254254                                preg_match_all('|<wp:postmeta>(.*?)</wp:postmeta>|is', $post, $postmeta); 
    … …  
    266266 
    267267                wp_import_cleanup($this->id); 
    268268 
    269                 echo '<h3>'.sprintf(__('All done. <a href="%s">Have fun!</a>'), get_option('home')).'</h3>'; 
     269                echo '<h3>'.sprintf(__('All done.').' <a href="%s">'.__('Have fun!').'</a>', get_option('home')).'</h3>'; 
    270270        } 
    271271 
    272272        function import() { 

  • wp-admin/edit.php

     
    115115<form name="viewcat" action="" method="get" style="float: left; width: 30em; margin-bottom: 1em;"> 
    116116        <fieldset> 
    117117        <legend><?php _e('Browse Category&hellip;') ?></legend> 
    118         <?php wp_dropdown_categories('show_option_all=All&hide_empty=0&hierarchical=1&show_count=1&selected='.$cat);?> 
     118        <?php wp_dropdown_categories('show_option_all='.__('All').'&hide_empty=0&hierarchical=1&show_count=1&selected='.$cat);?> 
    119119        <input type="submit" name="submit" value="<?php _e('Show Category') ?>"  />  
    120120        </fieldset> 
    121121</form>