WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i18n fixes from nbachiyski. fixes #3109 

git-svn-id: http://svn.automattic.com/wordpress/trunk@4165 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-09-05 18:52:24 +00:00
parent 261b9c73b0
commit ebbcf250d5
17 changed files with 82 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/edit.php
View File

@ -115,7 +115,7 @@ if ( count($arc_result) ) { ?>
<form name="viewcat" action="" method="get" style="float: left; width: 30em; margin-bottom: 1em;"> <form name="viewcat" action="" method="get" style="float: left; width: 30em; margin-bottom: 1em;">
<fieldset> <fieldset>
<legend><?php _e('Browse Category&hellip;') ?></legend> <legend><?php _e('Browse Category&hellip;') ?></legend>
<?php wp_dropdown_categories('show_option_all=All&hide_empty=0&hierarchical=1&show_count=1&selected='.$cat);?> <?php wp_dropdown_categories('show_option_all='.__('All').'&hide_empty=0&hierarchical=1&show_count=1&selected='.$cat);?>
<input type="submit" name="submit" value="<?php _e('Show Category') ?>" /> <input type="submit" name="submit" value="<?php _e('Show Category') ?>" />
</fieldset> </fieldset>
</form> </form>

10
wp-admin/import/blogger.php
View File

@ -341,7 +341,7 @@ class Blogger_Import {
$form = "<div style='height:0px;width:0px;overflow:hidden;'>"; $form = "<div style='height:0px;width:0px;overflow:hidden;'>";
$form.= $body; $form.= $body;
$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>"; $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>";
$output.= '<p>'.sprintf('<strong>%s</strong> in progress, please wait...', $blog_opt)."</p>\n"; $output.= '<p>'.sprintf(__('<strong>%s</strong> in progress, please wait...'), $blog_opt)."</p>\n";
} else { } else {
$output.= "<p>$blog_opt</p>\n"; $output.= "<p>$blog_opt</p>\n";
} }
@ -420,7 +420,7 @@ class Blogger_Import {
$user_email = $wpdb->escape($post_author_email); $user_email = $wpdb->escape($post_author_email);
$user_password = substr(md5(uniqid(microtime())), 0, 6); $user_password = substr(md5(uniqid(microtime())), 0, 6);
$result = wp_create_user( $user_login, $user_password, $user_email ); $result = wp_create_user( $user_login, $user_password, $user_email );
$status.= sprintf('Registered user <strong>%s</strong>.', $user_login); $status.= sprintf(__('Registered user <strong>%s</strong>.'), $user_login);
$this->import['blogs'][$_GET['blog']]['newusers'][] = $user_login; $this->import['blogs'][$_GET['blog']]['newusers'][] = $user_login;
} }
$userdata = get_userdatabylogin( $post_author_name ); $userdata = get_userdatabylogin( $post_author_name );
@ -509,7 +509,7 @@ class Blogger_Import {
} }
} }
$status = sprintf(__('%s post(s) parsed, %s skipped...'), $postcount, $skippedpostcount).' '. $status = sprintf(__('%s post(s) parsed, %s skipped...'), $postcount, $skippedpostcount).' '.
sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcoun, $skippedcommentcount).' '. sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcount, $skippedcommentcount).' '.
' <strong>'.__('Done').'</strong>'; ' <strong>'.__('Done').'</strong>';
$import = $this->import; $import = $this->import;
$import['blogs'][$_GET['blog']]['archives']["$url"] = $status; $import['blogs'][$_GET['blog']]['archives']["$url"] = $status;
@ -546,7 +546,7 @@ class Blogger_Import {
$response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode={$optary['backup']['publishMode']}", $headers); $response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode={$optary['backup']['publishMode']}", $headers);
sleep(2); sleep(2);
if ( $response['code'] >= 400 ) if ( $response['code'] >= 400 )
wp_die('<h1>Error restoring publishMode.</h1><p>Please tell the devs.</p>' . addslashes(print_r($response, 1)) ); wp_die('<h1>'.__('Error restoring publishMode').'</h1><p>'.__('Please tell the devs.').'</p>' . addslashes(print_r($response, 1)) );
} }
} }
if ( $optary['backup'] != $optary['modify'] ) { if ( $optary['backup'] != $optary['modify'] ) {
@ -662,6 +662,6 @@ class Blogger_Import {
$blogger_import = new Blogger_Import(); $blogger_import = new Blogger_Import();
register_importer('blogger', 'Blogger and Blogspot', __('Import <strong>posts and comments</strong> from your Blogger account'), array ($blogger_import, 'start')); register_importer('blogger', __('Blogger and Blogspot'), __('Import <strong>posts and comments</strong> from your Blogger account'), array ($blogger_import, 'start'));
?> ?>

2
wp-admin/import/blogware.php
View File

@ -188,5 +188,5 @@ class BW_Import {
$blogware_import = new BW_Import(); $blogware_import = new BW_Import();
register_importer('blogware', 'Blogware', __('Import posts from Blogware'), array ($blogware_import, 'dispatch')); register_importer('blogware', __('Blogware'), __('Import posts from Blogware'), array ($blogware_import, 'dispatch'));
?> ?>

8
wp-admin/import/dotclear.php
View File

@ -632,15 +632,15 @@ class Dotclear_Import {
echo '<h3>'.__('Preserving Authors').'</h3>'; echo '<h3>'.__('Preserving Authors').'</h3>';
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>'; 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>';
echo '<h3>'.__('Textile').'</h3>'; echo '<h3>'.__('Textile').'</h3>';
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>'; 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>';
echo '<h3>'.__('WordPress Resources').'</h3>'; echo '<h3>'.__('WordPress Resources').'</h3>';
echo '<p>'.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'</p>'; echo '<p>'.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'</p>';
echo '<ul>'; echo '<ul>';
echo '<li>'.__('<a href="http://www.wordpress.org">The official WordPress site</a>').'</li>'; echo '<li>'.__('<a href="http://www.wordpress.org">The official WordPress site</a>').'</li>';
echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums').'</li>'; echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums</a>').'</li>';
echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>'; echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>';
echo '</ul>'; echo '</ul>';
echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '/wp-login.php').'</p>'; echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '../wp-login.php').'</p>';
} }
function db_form() function db_form()
@ -743,5 +743,5 @@ class Dotclear_Import {
} }
$dc_import = new 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'));
?> ?>

75
wp-admin/import/greymatter.php
View File

@ -16,44 +16,44 @@ class GM_Import {
function greet() { function greet() {
$this->header(); $this->header();
?> ?>
<p>This is a basic GreyMatter to WordPress import script.</p> <p><?php _e('This is a basic GreyMatter to WordPress import script.') ?></p>
<p>What it does:</p> <p><?php _e('What it does:') ?></p>
<ul> <ul>
<li>Parses gm-authors.cgi to import (new) authors. Everyone is imported at level 1.</li> <li><?php _e('Parses gm-authors.cgi to import (new) authors. Everyone is imported at level 1.') ?></li>
<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> <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>
<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> <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>
</ul> </ul>
<p>What it does not:</p> <p><?php _e('What it does not:') ?></p>
<ul> <ul>
<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> <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>
<li>Import gm-templates.</li> <li><?php _e('Import gm-templates.') ?></li>
<li>Doesn't keep entries on top.</li> <li><?php _e("Doesn't keep entries on top.")?></li>
</ul> </ul>
<p>&nbsp;</p> <p>&nbsp;</p>
<form name="stepOne" method="get"> <form name="stepOne" method="get">
<input type="hidden" name="import" value="greymatter" /> <input type="hidden" name="import" value="greymatter" />
<input type="hidden" name="step" value="1" /> <input type="hidden" name="step" value="1" />
<h3>Second step: GreyMatter details:</h3> <h3><?php _e('Second step: GreyMatter details:') ?></h3>
<p><table cellpadding="0"> <p><table cellpadding="0">
<tr> <tr>
<td>Path to GM files:</td> <td><?php _e('Path to GM files:') ?></td>
<td><input type="text" style="width:300px" name="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td> <td><input type="text" style="width:300px" name="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
</tr> </tr>
<tr> <tr>
<td>Path to GM entries:</td> <td><?php _e('Path to GM entries:') ?></td>
<td><input type="text" style="width:300px" name="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td> <td><input type="text" style="width:300px" name="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
</tr> </tr>
<tr> <tr>
<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> <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>
</tr> </tr>
<tr> <tr>
<td>Last entry's number:</td> <td><?php _e("Last entry's number:") ?></td>
<td><input type="text" name="lastentry" value="00000001" /></td> <td><input type="text" name="lastentry" value="00000001" /></td>
</tr> </tr>
</table> </table>
</p> </p>
<p>When you're ready, click OK to start importing: <input type="submit" name="submit" value="OK" class="search" /></p> <p><?php _e("When you're ready, click OK to start importing: ") ?><input type="submit" name="submit" value="<?php _e('OK') ?>" class="search" /></p>
</form> </form>
<p>&nbsp</p> <p>&nbsp</p>
<?php <?php
@ -87,16 +87,16 @@ class GM_Import {
} }
if (!chdir($archivespath)) if (!chdir($archivespath))
wp_die("Wrong path, $archivespath\ndoesn't exist\non the server"); wp_die(sprintf(__("Wrong path, %s\ndoesn't exist\non the server"), $archivespath));
if (!chdir($gmpath)) if (!chdir($gmpath))
wp_die("Wrong path, $gmpath\ndoesn't exist\non the server"); wp_die(sprintf(__("Wrong path, %s\ndoesn't exist\non the server"), $gmpath));
$this->header(); $this->header();
?> ?>
<p>The importer is running...</p> <p><?php _e('The importer is running...') ?></p>
<ul> <ul>
<li>importing users... <ul><?php <li><?php _e('importing users...') ?><ul><?php
chdir($gmpath); chdir($gmpath);
$userbase = file("gm-authors.cgi"); $userbase = file("gm-authors.cgi");
@ -120,7 +120,7 @@ class GM_Import {
$user_id = username_exists($user_login); $user_id = username_exists($user_login);
if ($user_id) { if ($user_id) {
echo "<li>user <i>$user_login</i>... <b>Already exists</b></li>"; printf('<li>'.__('user %s').'<strong>'.__('Already exists').'</strong></li>', "<em>$user_login</em>");
$this->gmnames[$userdata[0]] = $user_id; $this->gmnames[$userdata[0]] = $user_id;
continue; continue;
} }
@ -129,12 +129,11 @@ class GM_Import {
$user_id = wp_insert_user($user_info); $user_id = wp_insert_user($user_info);
$this->gmnames[$userdata[0]] = $user_id; $this->gmnames[$userdata[0]] = $user_id;
echo "<li>user <i>$user_login</i>... <b>Done</b></li>"; printf('<li>'.__('user %s...').' <strong>'.__('Done').'</strong></li>', "<em>$user_login</em>");
} }
?></ul><b>Done</b></li> ?></ul><strong><?php _e('Done') ?></strong></li>
<li>importing posts, comments, and karma...<br /><ul><?php <li><?php _e('importing posts, comments, and karma...') ?><br /><ul><?php
chdir($archivespath); chdir($archivespath);
@ -163,7 +162,6 @@ class GM_Import {
if (is_file($entryfile.".cgi")) { if (is_file($entryfile.".cgi")) {
$entry=file($entryfile.".cgi"); $entry=file($entryfile.".cgi");
echo "<li>entry # $entryfile ";
$postinfo=explode("|",$entry[0]); $postinfo=explode("|",$entry[0]);
$postmaincontent=$this->gm2autobr($entry[2]); $postmaincontent=$this->gm2autobr($entry[2]);
$postmorecontent=$this->gm2autobr($entry[3]); $postmorecontent=$this->gm2autobr($entry[3]);
@ -171,7 +169,7 @@ class GM_Import {
$post_author=trim($wpdb->escape($postinfo[1])); $post_author=trim($wpdb->escape($postinfo[1]));
$post_title=$this->gm2autobr($postinfo[2]); $post_title=$this->gm2autobr($postinfo[2]);
echo " : $post_title : by $postinfo[1]"; printf('<li>'.__('entry # %s : %s : by %s'), $entryfile, $post_title, $postinfo[1]);
$post_title=$wpdb->escape($post_title); $post_title=$wpdb->escape($post_title);
$postyear=$postinfo[6]; $postyear=$postinfo[6];
@ -198,7 +196,8 @@ class GM_Import {
$ping_status = 'closed'; $ping_status = 'closed';
if ($post_ID = post_exists($post_title, '', $post_date)) { if ($post_ID = post_exists($post_title, '', $post_date)) {
echo ' (already exists)'; echo ' ';
_e('(already exists)');
} else { } else {
//just so that if a post already exists, new users are not created by checkauthor //just so that if a post already exists, new users are not created by checkauthor
// we'll check the author is registered, or if it's a deleted author // we'll check the author is registered, or if it's a deleted author
@ -219,7 +218,8 @@ class GM_Import {
$user_id = wp_insert_user($user_info); $user_id = wp_insert_user($user_info);
$this->gmnames[$postinfo[1]] = $user_id; $this->gmnames[$postinfo[1]] = $user_id;
echo ": registered deleted user <i>$user_login</i> at level 0 "; echo ': ';
printf(__('registered deleted user %s at level 0 '), "<em>$user_login</em>");
} }
if (array_key_exists($postinfo[1], $this->gmnames)) { if (array_key_exists($postinfo[1], $this->gmnames)) {
@ -266,21 +266,22 @@ class GM_Import {
$numComments++; $numComments++;
} }
if ($numAddedComments > 0) { if ($numAddedComments > 0) {
echo ": imported $numAddedComments comment"; echo ': ';
if ($numAddedComments != 1) printf(__('imported %d comment(s)'), $numAddedComments);
echo "s";
} }
$preExisting = $numComments - numAddedComments; $preExisting = $numComments - numAddedComments;
if ($preExisting > 0) if ($preExisting > 0) {
echo " (ignored $preExisting pre-existing comments)"; echo ' ';
printf(__('ignored %d pre-existing comments'), $preExisting);
}
} }
echo "... <b>Done</b></li>"; echo '... <strong>'.__('Done').'</strong></li>';
} }
} }
?> ?>
</ul><b>Done</b></li></ul> </ul><strong><?php _e('Done') ?></strong></li></ul>
<p>&nbsp;</p> <p>&nbsp;</p>
<p>Completed Greymatter import !</p> <p><?php _e('Completed Greymatter import!') ?></p>
<?php <?php
$this->footer(); $this->footer();
} }
@ -308,5 +309,5 @@ class GM_Import {
$gm_import = new GM_Import(); $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 posts and comments from your Greymatter blog'), array ($gm_import, 'dispatch'));
?> ?>

2
wp-admin/import/livejournal.php
View File

@ -164,5 +164,5 @@ class LJ_Import {
$livejournal_import = new LJ_Import(); $livejournal_import = new LJ_Import();
register_importer('livejournal', 'LiveJournal', __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch')); register_importer('livejournal', __('LiveJournal'), __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch'));
?> ?>

14
wp-admin/import/mt.php
View File

@ -32,7 +32,7 @@ class MT_Import {
global $wpdb, $testing; global $wpdb, $testing;
$users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID"); $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID");
?><select name="userselect[<?php echo $n; ?>]"> ?><select name="userselect[<?php echo $n; ?>]">
<option value="#NONE#">- Select -</option> <option value="#NONE#"><?php _e('- Select -') ?></option>
<?php <?php
@ -148,12 +148,12 @@ class MT_Import {
$j = -1; $j = -1;
foreach ($authors as $author) { foreach ($authors as $author) {
++ $j; ++ $j;
echo '<li>Current author: <strong>'.$author.'</strong><br />'.'Create user <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br /> or map to existing '; 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 />');
$this->users_form($j); $this->users_form($j);
echo '</li>'; echo '</li>';
} }
echo '<input type="submit" value="Submit">'.'<br/>'; echo '<input type="submit" value="'.__('Submit').'">'.'<br/>';
echo '</form>'; echo '</form>';
echo '</ol></div>'; echo '</ol></div>';
@ -163,7 +163,7 @@ class MT_Import {
$file = wp_import_handle_upload(); $file = wp_import_handle_upload();
if ( isset($file['error']) ) { if ( isset($file['error']) ) {
$this->header(); $this->header();
echo '<p>Sorry, there has been an error.</p>'; echo '<p>'.__('Sorry, there has been an error').'.</p>';
echo '<p><strong>' . $file['error'] . '</strong></p>'; echo '<p><strong>' . $file['error'] . '</strong></p>';
$this->footer(); $this->footer();
return; return;
@ -334,7 +334,7 @@ class MT_Import {
} }
} }
if ( $num_comments ) if ( $num_comments )
printf(__(' (%s comments)'), $num_comments); printf(' '.__('(%s comments)'), $num_comments);
// Finally the pings // Finally the pings
// fix the double newline on the first one // fix the double newline on the first one
@ -382,7 +382,7 @@ class MT_Import {
} }
} }
if ( $num_pings ) if ( $num_pings )
printf(__(' (%s pings)'), $num_pings); printf(' '.__('(%s pings)'), $num_pings);
echo "</li>"; echo "</li>";
} }
@ -430,5 +430,5 @@ class MT_Import {
$mt_import = new MT_Import(); $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'), __('Imports <strong>posts and comments</strong> from your Movable Type or Typepad blog'), array ($mt_import, 'dispatch'));
?> ?>

2
wp-admin/import/rss.php
View File

@ -168,5 +168,5 @@ class RSS_Import {
$rss_import = new RSS_Import(); $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 an RSS feed'), array ($rss_import, 'dispatch'));
?> ?>

6
wp-admin/import/textpattern.php
View File

@ -555,12 +555,12 @@ class Textpattern_Import {
echo '<h3>'.__('Preserving Authors').'</h3>'; echo '<h3>'.__('Preserving Authors').'</h3>';
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>'; 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>';
echo '<h3>'.__('Textile').'</h3>'; echo '<h3>'.__('Textile').'</h3>';
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>'; 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>';
echo '<h3>'.__('WordPress Resources').'</h3>'; echo '<h3>'.__('WordPress Resources').'</h3>';
echo '<p>'.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'</p>'; echo '<p>'.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'</p>';
echo '<ul>'; echo '<ul>';
echo '<li>'.__('<a href="http://www.wordpress.org">The official WordPress site</a>').'</li>'; echo '<li>'.__('<a href="http://www.wordpress.org">The official WordPress site</a>').'</li>';
echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums').'</li>'; echo '<li>'.__('<a href="http://wordpress.org/support/">The WordPress support forums</a>').'</li>';
echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>'; echo '<li>'.__('<a href="http://codex.wordpress.org">The Codex (In other words, the WordPress Bible)</a>').'</li>';
echo '</ul>'; echo '</ul>';
echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '/wp-login.php').'</p>'; echo '<p>'.sprintf(__('That\'s it! What are you waiting for? Go <a href="%1$s">login</a>!'), '/wp-login.php').'</p>';
@ -659,5 +659,5 @@ class Textpattern_Import {
} }
$txp_import = new Textpattern_Import(); $txp_import = new Textpattern_Import();
register_importer('textpattern', 'Textpattern', __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch')); register_importer('textpattern', __('Textpattern'), __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch'));
?> ?>

8
wp-admin/import/wordpress.php
View File

@ -148,7 +148,7 @@ class WP_Import {
$j = -1; $j = -1;
foreach ($authors as $author) { foreach ($authors as $author) {
++ $j; ++ $j;
echo '<li>Current author: <strong>'.$author.'</strong><br />'.'Create user <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br /> or map to existing '; 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 />');
$this->users_form($j); $this->users_form($j);
echo '</li>'; echo '</li>';
} }
@ -163,7 +163,7 @@ class WP_Import {
$file = wp_import_handle_upload(); $file = wp_import_handle_upload();
if ( isset($file['error']) ) { if ( isset($file['error']) ) {
$this->header(); $this->header();
echo '<p>Sorry, there has been an error.</p>'; echo '<p>'.__('Sorry, there has been an error.').'</p>';
echo '<p><strong>' . $file['error'] . '</strong></p>'; echo '<p><strong>' . $file['error'] . '</strong></p>';
$this->footer(); $this->footer();
return; return;
@ -248,7 +248,7 @@ class WP_Import {
} }
} } } }
if ( $num_comments ) if ( $num_comments )
printf(__(' (%s comments)'), $num_comments); printf(' '.__('(%s comments)'), $num_comments);
// Now for post meta // Now for post meta
preg_match_all('|<wp:postmeta>(.*?)</wp:postmeta>|is', $post, $postmeta); preg_match_all('|<wp:postmeta>(.*?)</wp:postmeta>|is', $post, $postmeta);
@ -266,7 +266,7 @@ class WP_Import {
wp_import_cleanup($this->id); wp_import_cleanup($this->id);
echo '<h3>'.sprintf(__('All done. <a href="%s">Have fun!</a>'), get_option('home')).'</h3>'; echo '<h3>'.sprintf(__('All done.').' <a href="%s">'.__('Have fun!').'</a>', get_option('home')).'</h3>';
} }
function import() { function import() {

4
wp-admin/options-privacy.php
View File

@ -16,10 +16,10 @@ include('./admin-header.php');
<th scope="row"><?php _e('Blog visibility:') ?> </th> <th scope="row"><?php _e('Blog visibility:') ?> </th>
<td> <td>
<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> /> <input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
<label for="blog-public">I would like my blog to be visible to anyone who visits, including search engines and archivers</label> <label for="blog-public"><?php _e('I would like my blog to be visible to anyone who visits, including search engines and archivers') ?></label>
<br /> <br />
<input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> /> <input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
<label for="blog-norobots">I would like to block search engines, but allow normal folks</label> <label for="blog-norobots"><?php _e('I would like to block search engines, but allow normal folks') ?></label>
<?php do_action('blog_privacy_selector'); ?> <?php do_action('blog_privacy_selector'); ?>
</td> </td>
</tr> </tr>

2
wp-admin/page.php
View File

@ -57,7 +57,7 @@ case 'edit':
?> ?>
<div id='preview' class='wrap'> <div id='preview' class='wrap'>
<h2 id="preview-post"><?php _e('Page Preview (updated when page is saved)'); ?> <small class="quickjump"><a href="#write-post"><?php _e('edit &uarr;'); ?></a></small></h2> <h2 id="preview-post"><?php _e('Page Preview (updated when page is saved)'); ?> <small class="quickjump"><a href="#write-post"><?php _e('edit &uarr;'); ?></a></small></h2>
<iframe src="<?php echo add_query_arg('preview', 'true', get_permalink($post->ID)); ?>" width="100%" height="600" ></iframe> <iframe src="<?php echo apply_filters('preview_page_link', add_query_arg('preview', 'true', get_permalink($post->ID))); ?>" width="100%" height="600" ></iframe>
</div> </div>
<?php <?php
break; break;

2
wp-admin/post.php
View File

@ -63,7 +63,7 @@ case 'edit':
?> ?>
<div id='preview' class='wrap'> <div id='preview' class='wrap'>
<h2 id="preview-post"><?php _e('Post Preview (updated when post is saved)'); ?> <small class="quickjump"><a href="#write-post"><?php _e('edit &uarr;'); ?></a></small></h2> <h2 id="preview-post"><?php _e('Post Preview (updated when post is saved)'); ?> <small class="quickjump"><a href="#write-post"><?php _e('edit &uarr;'); ?></a></small></h2>
<iframe src="<?php echo add_query_arg('preview', 'true', get_permalink($post->ID)); ?>" width="100%" height="600" ></iframe> <iframe src="<?php echo apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID))); ?>" width="100%" height="600" ></iframe>
</div> </div>
<?php <?php
break; break;

7
wp-includes/bookmark-template.php
View File

@ -271,8 +271,11 @@ function _walk_bookmarks($bookmarks, $args = '' ) {
$title = $desc; $title = $desc;
if ( $show_updated ) if ( $show_updated )
if ( '00' != substr($bookmark->link_updated_f, 0, 2) ) if ( '00' != substr($bookmark->link_updated_f, 0, 2) ) {
$title .= ' (Last updated ' . date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600)) . ')'; $title .= ' ';
$title .= sprintf(__('Last updated: %s'), date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600)));
$title .= ')';
}
if ( '' != $title ) if ( '' != $title )
$title = ' title="' . $title . '"'; $title = ' title="' . $title . '"';

8
wp-includes/classes.php
View File

@ -25,9 +25,9 @@ class retrospam_mgr {
$cnt++; $cnt++;
} }
} }
echo "<div class='updated'><p>$cnt comment"; echo "<div class='updated'><p> ";
if ($cnt != 1 ) echo "s"; printf(__('%d comment(s) moved to the moderation queue.'), $cnt);
echo " moved to the moderation queue.</p></div>\n"; echo "</p></div>\n";
} // End function move_spam } // End function move_spam
function find_spam() { function find_spam() {
@ -56,7 +56,7 @@ class retrospam_mgr {
$numfound = count($counters[found]); $numfound = count($counters[found]);
$numqueue = $counters[in_queue]; $numqueue = $counters[in_queue];
$body = '<p>' . sprintf(__('Suspected spam comments: <strong>%s</strong>'), $numfound) . '</p>'; $body = '<p>' . sprintf(__('Suspected spam comments: %s'), "<strong>$numfound</strong>") . '</p>';
if ( count($counters[found]) > 0 ) { if ( count($counters[found]) > 0 ) {
$id_list = implode( ',', $counters[found] ); $id_list = implode( ',', $counters[found] );

4
wp-includes/functions.php
View File

@ -947,7 +947,7 @@ function wp_upload_bits($name, $type, $bits) {
$ifp = @ fopen($new_file, 'wb'); $ifp = @ fopen($new_file, 'wb');
if ( ! $ifp ) if ( ! $ifp )
return array('error' => "Could not write file $new_file."); return array('error' => sprintf(__('Could not write file %s'), $new_file));
$success = @ fwrite($ifp, $bits); $success = @ fwrite($ifp, $bits);
fclose($ifp); fclose($ifp);
@ -1091,7 +1091,7 @@ function wp_explain_nonce($action) {
} }
} }
return __('Are you sure you want to do this'); return __('Are you sure you want to do this?');
} }
function wp_nonce_ays($action) { function wp_nonce_ays($action) {

2
wp-includes/post-template.php
View File

@ -330,7 +330,7 @@ function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false)
return "<a href=\"{$_post->guid}\" title=\"{$_post->post_title}\" >{$innerHTML}</a>"; return "<a href=\"{$_post->guid}\" title=\"{$_post->post_title}\" >{$innerHTML}</a>";
} else { } else {
$p .= __('Missing attachment'); $p .= __('Missing Attachment');
} }
return $p; return $p;
} }