golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i18n fixes from nbachiyski. #2006 

git-svn-id: http://svn.automattic.com/wordpress/trunk@3262 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2005-12-02 22:37:02 +00:00
parent 3f1e55afc3
commit 843a9afbfc
9 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/import.php
View File

@ -27,7 +27,7 @@ if ($imports_dir) {
$importers = get_importers(); $importers = get_importers();
if (empty ($importers)) { if (empty ($importers)) {
_e("<p>No importers are available.</p>"); // TODO: make more helpful echo '<p>'.__('No importers are available.').'</p>'; // TODO: make more helpful
} else { } else {
?> ?>
<table width="100%" cellpadding="3" cellspacing="3"> <table width="100%" cellpadding="3" cellspacing="3">

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

@ -21,9 +21,9 @@ class MT_Import {
function greet() { function greet() {
$this->header(); $this->header();
?> ?>
<p>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> <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>
<?php wp_import_upload_form( add_query_arg('step', 1) ); ?> <?php wp_import_upload_form( add_query_arg('step', 1) ); ?>
<p>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> <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>
<?php <?php
$this->footer(); $this->footer();
} }
@ -178,7 +178,7 @@ class MT_Import {
if ('' != trim($post)) { if ('' != trim($post)) {
++ $i; ++ $i;
unset ($post_categories); unset ($post_categories);
echo "<li>Processing post... "; echo '<li>'.__('Processing post...');
// Take the pings out first // Take the pings out first
preg_match("|(-----\n\nPING:.*)|s", $post, $pings); preg_match("|(-----\n\nPING:.*)|s", $post, $pings);
@ -270,7 +270,7 @@ class MT_Import {
// Let's check to see if it's in already // Let's check to see if it's in already
if ($post_id = posts_exists($post_title, '', $post_date)) { if ($post_id = posts_exists($post_title, '', $post_date)) {
echo "Post already imported."; _e('Post already imported.');
} else { } else {
$post_author = checkauthor($post_author); //just so that if a post already exists, new users are not created by checkauthor $post_author = checkauthor($post_author); //just so that if a post already exists, new users are not created by checkauthor
@ -280,7 +280,7 @@ class MT_Import {
if (0 != count($post_categories)) { if (0 != count($post_categories)) {
wp_create_categories($post_categories); wp_create_categories($post_categories);
} }
echo " Post imported successfully..."; _e(' Post imported successfully...');
} }
$comment_post_ID = $post_id; $comment_post_ID = $post_id;
@ -362,7 +362,7 @@ class MT_Import {
$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email', 'comment_author_IP', 'comment_date', 'comment_content', 'comment_type'); $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email', 'comment_author_IP', 'comment_date', 'comment_content', 'comment_type');
$commentdata = wp_filter_comment($commentdata); $commentdata = wp_filter_comment($commentdata);
wp_insert_comment($commentdata); wp_insert_comment($commentdata);
echo "Comment added."; _e('Comment added.');
} }
} }
} }
@ -413,4 +413,4 @@ class MT_Import {
$mt_import = new MT_Import(); $mt_import = new MT_Import();
//register_importer('mt', 'Movable Type', 'Import posts and comments from your Movable Type blog', array ($mt_import, 'dispatch')); //register_importer('mt', 'Movable Type', 'Import posts and comments from your Movable Type blog', array ($mt_import, 'dispatch'));
?> ?>

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

@ -25,7 +25,7 @@ class RSS_Import {
} }
function greet() { function greet() {
_e("<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>"); 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>';
wp_import_upload_form("admin.php?import=rss&amp;step=1"); wp_import_upload_form("admin.php?import=rss&amp;step=1");
} }
@ -108,17 +108,17 @@ class RSS_Import {
extract($post); extract($post);
if ($post_id = post_exists($post_title, $post_content, $post_date)) { if ($post_id = post_exists($post_title, $post_content, $post_date)) {
echo __('Post already imported'); _e('Post already imported');
} else { } else {
$post_id = wp_insert_post($post); $post_id = wp_insert_post($post);
if (!$post_id) { if (!$post_id) {
echo(__("Couldn't get post ID")); _e("Couldn't get post ID");
return; return;
} }
if (0 != count($categories)) if (0 != count($categories))
wp_create_categories($categories, $post_id); wp_create_categories($categories, $post_id);
echo __('Done !'); _e('Done !');
} }
echo '</li>'; echo '</li>';
} }
@ -138,8 +138,10 @@ class RSS_Import {
$this->get_posts(); $this->get_posts();
$this->import_posts(); $this->import_posts();
wp_import_cleanup($file['id']); wp_import_cleanup($file['id']);
echo '<h3>All done. <a href="' . get_option('home') . '">Have fun!</a></h3>'; echo '<h3>';
printf(__('All done. <a href="%s">Have fun!</a>'), get_option('home'));
echo '</h3>';
} }
function dispatch() { function dispatch() {
@ -170,4 +172,4 @@ 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'));
?> ?>

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

@ -162,7 +162,7 @@ class Textpattern_Import {
// Do the Magic // Do the Magic
if(is_array($categories)) if(is_array($categories))
{ {
echo __('<p>Importing Categories...<br /><br /></p>'); echo '<p>'.__('Importing Categories...').'<br /><br /></p>';
foreach ($categories as $category) foreach ($categories as $category)
{ {
$count++; $count++;
@ -186,7 +186,7 @@ class Textpattern_Import {
// Store category translation for future use // Store category translation for future use
add_option('txpcat2wpcat',$txpcat2wpcat); add_option('txpcat2wpcat',$txpcat2wpcat);
echo __('<p>Done! <strong>'.$count.'</strong> categories imported.<br /><br /></p>'); echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> categories imported.'), $count).'<br /><br /></p>';
return true; return true;
} }
echo __('No Categories to Import!'); echo __('No Categories to Import!');
@ -203,7 +203,7 @@ class Textpattern_Import {
// Midnight Mojo // Midnight Mojo
if(is_array($users)) if(is_array($users))
{ {
echo __('<p>Importing Users...<br /><br /></p>'); echo '<p>'.__('Importing Users...').'<br /><br /></p>';
foreach($users as $user) foreach($users as $user)
{ {
$count++; $count++;
@ -258,7 +258,7 @@ class Textpattern_Import {
add_option('txpid2wpid',$txpid2wpid); add_option('txpid2wpid',$txpid2wpid);
echo __('<p>Done! <strong>'.$count.'</strong> users imported.<br /><br /></p>'); echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> users imported.'), $count).'<br /><br /></p>';
return true; return true;
}// End if(is_array($users) }// End if(is_array($users)
@ -278,7 +278,7 @@ class Textpattern_Import {
// Do the Magic // Do the Magic
if(is_array($posts)) if(is_array($posts))
{ {
echo __('<p>Importing Posts...<br /><br /></p>'); echo '<p>'.__('Importing Posts...').'<br /><br /></p>';
foreach($posts as $post) foreach($posts as $post)
{ {
$count++; $count++;
@ -344,7 +344,7 @@ class Textpattern_Import {
// Store ID translation for later use // Store ID translation for later use
add_option('txpposts2wpposts',$txpposts2wpposts); add_option('txpposts2wpposts',$txpposts2wpposts);
echo __('<p>Done! <strong>'.$count.'</strong> posts imported.<br /><br /></p>'); echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> posts imported.'), $count).'<br /><br /></p>';
return true; return true;
} }
@ -359,7 +359,7 @@ class Textpattern_Import {
// Magic Mojo // Magic Mojo
if(is_array($comments)) if(is_array($comments))
{ {
echo __('<p>Importing Comments...<br /><br /></p>'); echo '<p>'.__('Importing Comments...').'<br /><br /></p>';
foreach($comments as $comment) foreach($comments as $comment)
{ {
$count++; $count++;
@ -411,7 +411,7 @@ class Textpattern_Import {
get_comment_count($ret_id); get_comment_count($ret_id);
echo __('<p>Done! <strong>'.$count.'</strong> comments imported.<br /><br /></p>'); echo '<p>'.sprintf(__('Done! <strong>%1$s</strong> comments imported.'), $count).'<br /><br /></p>';
return true; return true;
} }
echo __('No Comments to Import!'); echo __('No Comments to Import!');
@ -551,7 +551,7 @@ class Textpattern_Import {
{ {
echo '<p>'.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from Textpattern, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'</p>'; echo '<p>'.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from Textpattern, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'</p>';
echo '<h3>'.__('Users').'</h3>'; echo '<h3>'.__('Users').'</h3>';
echo '<p>'.__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn\'t have that login in Textpattern, 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 Textpattern 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. <strong>Every user has the same username, but their passwords are reset to password123.</strong> So <a href="/wp-login.php">Login</a> and change it.').'</p>'; echo '<p>'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn\'t have that login in Textpattern, 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 Textpattern 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. <strong>Every user has the same username, but their passwords are reset to password123.</strong> So <a href="%1$s">Login</a> and change it.'), '/wp-login.php').'</p>';
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>';
@ -563,7 +563,7 @@ class Textpattern_Import {
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').'</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>'.__('That\'s it! What are you waiting for? Go <a href="/wp-login.php">login</a>!').'</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()

10
wp-admin/inline-uploading.php
View File

@ -38,7 +38,7 @@ switch($action) {
case 'delete': case 'delete':
if ( !current_user_can('edit_post', (int) $attachment) ) if ( !current_user_can('edit_post', (int) $attachment) )
die(printf(__('You are not allowed to delete this attachment. %sGo back</a>'), '<a href="'.basename(__FILE__)."?post=$post&amp;all=$all&amp;action=upload\">") ); die(__('You are not allowed to delete this attachment.').' <a href="'.basename(__FILE__)."?post=$post&amp;all=$all&amp;action=upload\">".__('Go back').'</a>');
wp_delete_attachment($attachment); wp_delete_attachment($attachment);
@ -52,7 +52,7 @@ $overrides = array('action'=>'save');
$file = wp_handle_upload($_FILES['image'], $overrides); $file = wp_handle_upload($_FILES['image'], $overrides);
if ( isset($file['error']) ) if ( isset($file['error']) )
die($file['error'] . '<a href="' . basename(__FILE__) . '?action=upload&post="' . $post . '">Back to Image Uploading</a>'); die($file['error'] . '<a href="' . basename(__FILE__) . '?action=upload&post="' . $post . '">'.__('Back to Image Uploading').'</a>');
$url = $file['url']; $url = $file['url'];
$file = $file['file']; $file = $file['file'];
@ -94,7 +94,7 @@ if ( preg_match('!^image/!', $attachment['post_mime_type']) ) {
} }
header("Location: ".basename(__FILE__)."?post=$post&all=$all&action=view&last=true"); header("Location: ".basename(__FILE__)."?post=$post&all=$all&action=view&last=true");
die; die();
case 'upload': case 'upload':
@ -161,7 +161,7 @@ if ( count($attachments) > 0 ) {
$__linked_to_file = __('Linked to File'); $__linked_to_file = __('Linked to File');
$__using_thumbnail = __('Using Thumbnail'); $__using_thumbnail = __('Using Thumbnail');
$__using_original = __('Using Original'); $__using_original = __('Using Original');
$__no_thumbnail = __('<del>No Thumbnail</del>'); $__no_thumbnail = '<del>'.__('No Thumbnail').'</del>';
$__close = __('Close Options'); $__close = __('Close Options');
$__confirmdelete = __('Delete this file from the server?'); $__confirmdelete = __('Delete this file from the server?');
$__nothumb = __('There is no thumbnail associated with this photo.'); $__nothumb = __('There is no thumbnail associated with this photo.');
@ -247,7 +247,7 @@ $images_width = $uwidth_sum + ( count($images) * 6 ) + 35;
break; break;
default: default:
die('This script was not meant to be called directly.'); die(__('This script was not meant to be called directly.'));
} }
?> ?>

2
wp-admin/install.php
View File

@ -79,7 +79,7 @@ header( 'Content-Type: text/html; charset=utf-8' );
// Let's check to make sure WP isn't already installed. // Let's check to make sure WP isn't already installed.
$wpdb->hide_errors(); $wpdb->hide_errors();
$installed = $wpdb->get_results("SELECT * FROM $wpdb->users"); $installed = $wpdb->get_results("SELECT * FROM $wpdb->users");
if ($installed) die(__('<h1>Already Installed</h1><p>You appear to have already installed WordPress. To reinstall please clear your old database tables first.</p>') . '</body></html>'); if ($installed) die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
$wpdb->show_errors(); $wpdb->show_errors();
switch($step) { switch($step) {

4
wp-admin/post.php
View File

@ -345,8 +345,8 @@ default:
include('edit-form-advanced.php'); include('edit-form-advanced.php');
?> ?>
<div class="wrap"> <div class="wrap">
<?php _e('<h3>WordPress bookmarklet</h3> <?php echo '<h3>'.__('WordPress bookmarklet').'</h3>
<p>Right click on the following link and choose "Add to favorites" to create a posting shortcut.</p>') ?> <p>'.__('Right click on the following link and choose "Add to favorites" to create a posting shortcut.').'</p>'; ?>
<p> <p>
<?php <?php

6
wp-admin/users.php
View File

@ -117,7 +117,7 @@ case 'delete':
<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" /> <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" />
<?php _e('Delete all posts and links.'); ?></label></li> <?php _e('Delete all posts and links.'); ?></label></li>
<li><input type="radio" id="delete_option1" name="delete_option" value="reassign" /> <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
<?php echo sprintf(__('<label for="delete_option1">Attribute all posts and links to:</label> %s'), $user_dropdown); ?></li> <?php echo '<label for="delete_option1">'.__('Attribute all posts and links to:')."</label> $user_dropdown"; ?></li>
</ul> </ul>
<input type="hidden" name="action" value="dodelete" /> <input type="hidden" name="action" value="dodelete" />
<p class="submit"><input type="submit" name="submit" value="<?php _e('Confirm Deletion'); ?>" /></p> <p class="submit"><input type="submit" name="submit" value="<?php _e('Confirm Deletion'); ?>" /></p>
@ -270,7 +270,7 @@ $role_select .= '</select>';
?> ?>
<ul style="list-style:none;"> <ul style="list-style:none;">
<li><input type="radio" name="action" id="action0" value="delete" /> <label for="action0"><?php _e('Delete checked users.'); ?></label></li> <li><input type="radio" name="action" id="action0" value="delete" /> <label for="action0"><?php _e('Delete checked users.'); ?></label></li>
<li><input type="radio" name="action" id="action1" value="promote" /> <?php echo sprintf(__('<label for="action1">Set the Role of checked users to:</label> %s'), $role_select); ?></li> <li><input type="radio" name="action" id="action1" value="promote" /> <?php echo '<label for="action1">'.__('Set the Role of checked users to:')."</label> $role_select"; ?></li>
</ul> </ul>
<p class="submit"><input type="submit" value="<?php _e('Update &raquo;'); ?>" /></p> <p class="submit"><input type="submit" value="<?php _e('Update &raquo;'); ?>" /></p>
</div> </div>
@ -278,7 +278,7 @@ $role_select .= '</select>';
<div class="wrap"> <div class="wrap">
<h2><?php _e('Add New User') ?></h2> <h2><?php _e('Add New User') ?></h2>
<?php printf(__('<p>Users can <a href="%s/wp-register.php">register themselves</a> or you can manually create users here.</p>'), get_settings('siteurl')); ?> <?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_settings('siteurl').'/wp-register.php').'</p>'; ?>
<form action="" method="post" name="adduser" id="adduser"> <form action="" method="post" name="adduser" id="adduser">
<table class="editform" width="100%" cellspacing="2" cellpadding="5"> <table class="editform" width="100%" cellspacing="2" cellpadding="5">
<tr> <tr>

2
wp-includes/pluggable-functions.php
View File

@ -257,7 +257,7 @@ function wp_notify_postauthor($comment_id, $comment_type='') {
$notify_message = sprintf( __('New pingback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n"; $notify_message = sprintf( __('New pingback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
$notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
$notify_message .= sprintf( __('URI : %s'), $comment->comment_author_url ) . "\r\n"; $notify_message .= sprintf( __('URI : %s'), $comment->comment_author_url ) . "\r\n";
$notify_message .= __('Excerpt: ') . "\r\n" . sprintf( __('[...] %s [...]'), $comment->comment_content ) . "\r\n\r\n"; $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[...] %s [...]', $comment->comment_content ) . "\r\n\r\n";
$notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n"; $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n";
$subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title ); $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title );
} }