From c94918ca9f8a3a666a9282d3613b0c3a7f869888 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 28 Jun 2008 16:27:21 +0000
Subject: [PATCH] i18n fixes from nbachiyski. fixes #7195

git-svn-id: http://svn.automattic.com/wordpress/trunk@8211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-header.php |  4 ++--
 wp-admin/index.php        | 10 +++++-----
 wp-admin/press-this.php   | 17 ++++++++++-------
 wp-settings.php           |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index ff42e3ffc..bfd05339c 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -87,7 +87,7 @@ if ( ($is_gecko || $is_winIE) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']),
 	<a href="http://gears.google.com/" target="_blank" style="font-weight:normal;"><?php _e('More information...'); ?></a></p>
 	<p><?php _e('After you install and enable Gears most of WordPress&#8217; images, scripts, and CSS files will be stored locally on your computer. This speeds up page load time.'); ?></p>
 	<p><strong><?php _e('Don&#8217;t install on a public or shared computer.'); ?></strong></p>	<div class="submit"><button onclick="window.location = 'http://gears.google.com/?action=install&amp;return=<?php echo urlencode( admin_url() ); ?>';" class="button"><?php _e('Install Now'); ?></button>
-	<button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';">Cancel</button></div>
+	<button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Cancel'); ?></button></div>
 	</div>
 
 	<div id="gears-msg2" style="display:none;">
@@ -96,7 +96,7 @@ if ( ($is_gecko || $is_winIE) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']),
 	<p><?php _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser\'s Tools menu, then click the button below.'); ?></p>
 	<p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p>
 	<div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button>
-	<button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';">Cancel</button></div>
+	<button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Cancel'); ?></button></div>
 	</div>
 
 	<div id="gears-msg3" style="display:none;">
diff --git a/wp-admin/index.php b/wp-admin/index.php
index f22853163..2401ef9f9 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -91,10 +91,10 @@ if ( current_user_can( 'manage_categories' ) ) {
 	$tags_text = "<a href='edit-tags.php'>$tags_text</a>";
 }
 
-$total_comments = sprintf( __( '%1$s total' ), number_format_i18n($num_comm['total_comments']) );
-$approved_comments = sprintf( __( '%1$s approved' ), number_format_i18n($num_comm['approved']) );
-$spam_comments = sprintf( __( '%1$s spam' ), number_format_i18n($num_comm['spam']) );
-$moderated_comments = sprintf( __( '%1$s awaiting moderation' ), number_format_i18n($num_comm['awaiting_moderation']) );
+$total_comments = sprintf( __ngettext( '%1$s total', '%1$s total', $num_comm['total_comments'] ), number_format_i18n($num_comm['total_comments']) );
+$approved_comments = sprintf( __ngettext( '%1$s approved', '%1$s approved', $num_comm['approved'] ), number_format_i18n($num_comm['approved']) );
+$spam_comments = sprintf( __ngettext( '%1$s spam', '%1$s spam', $num_comm['spam'] ), number_format_i18n($num_comm['spam']) );
+$moderated_comments = sprintf( __ngettext( '%1$s awaiting moderation', '%1$s awaiting moderation', $num_comm['awaiting_moderation'] ), number_format_i18n($num_comm['awaiting_moderation']) );
 
 if( current_user_can( 'moderate_comments' ) ) {
 	$total_comments = "<a href='edit-comments.php'>{$total_comments}</a>";
@@ -102,7 +102,7 @@ if( current_user_can( 'moderate_comments' ) ) {
 	$moderated_comments = "<a href='edit-comments.php?comment_status=moderated'>{$moderated_comments}</a>";
 }
 
-$comm_text = sprintf( __( 'You have %1$s comments, %2$s, %3$s and %4$s.' ), $total_comments, $approved_comments, $spam_comments, $moderated_comments );
+$comm_text = sprintf( __ngettext( 'You have %1$s comment, %2$s, %3$s and %4$s.', 'You have %1$s comments, %2$s, %3$s and %4$s.', $num_comm['total_comments'] ), $total_comments, $approved_comments, $spam_comments, $moderated_comments );
 
 $post_type_text = implode(', ', $post_type_texts);
 
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index eec40df66..8365cfd9f 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -90,7 +90,7 @@ if ( 'post' == $_REQUEST['action'] ) {
 	</head>
 	<body class="press-this">
 		
-		<div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="post.php?action=edit&amp;post=<?php echo $post_ID; ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit post'); ?></a> | <a href="#" onclick="window.close();">Close Window</a></p></div>
+		<div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="post.php?action=edit&amp;post=<?php echo $post_ID; ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
 		
 		<div id="footer">
 		<p><?php
@@ -137,9 +137,9 @@ if($_REQUEST['ajax'] == 'thickbox') { ?>
 	</div>
 		
 	<p><input type="hidden" name="this_photo" value="<?php echo $image; ?>" id="this_photo" />
-		<a href="#" class="select"><img src="<?php echo $image; ?>" width="475" alt="Click to insert." title="Click to insert." /></a></p>
+		<a href="#" class="select"><img src="<?php echo $image; ?>" width="475" alt="<?php echo attribute_escape(__('Click to insert.')); ?>" title="<?php echo attribute_escape(__('Click to insert.')); ?>" /></a></p>
 	
-	<p id="options"><a href="#" class="select">Insert Image</a> | <a href="#" class="cancel">Cancel</a></p>
+	<p id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?></a></p>
 <?php die; 
 }
 
@@ -164,7 +164,7 @@ if($_REQUEST['ajax'] == 'thickbox_url') { ?>
 		<input id="this_photo_description" name="photo_description" class="text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo attribute_escape($title);?>"/>
 	</div>
 	
-	<p id="options"><a href="#" class="select">Insert Image</a> | <a href="#" class="cancel">Cancel</a></p>
+	<p id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?></a></p>
 <?php die; 
 }
 
@@ -437,7 +437,7 @@ if($_REQUEST['ajax'] == 'photo') { ?>
 					set_editor("<?php echo $selection; ?>");
 				<?php } ?>
 				jQuery('#extra_fields').show();
-				jQuery('#extra_fields').before('<h2 id="waiting"><img src="images/loading.gif" alt="" /> Loading...</h2>');
+				jQuery('#extra_fields').before('<h2 id="waiting"><img src="images/loading.gif" alt="" /><?php echo js_escape( __( 'Loading...' ) ); ?></h2>');
 				jQuery('#extra_fields').load('<?php echo clean_url($_SERVER['PHP_SELF']).'/?ajax=photo&u='.attribute_escape($url); ?>');
 				jQuery.ajax({
 					type: "GET",
@@ -518,7 +518,10 @@ if($_REQUEST['ajax'] == 'photo') { ?>
 			<p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
 			<div id="tagchecklist"></div>
 		</div>
-		<label for="post_status" id="post_status"><input type="radio" name="post_status" value="publish" checked="checked" id="published" /><?php _e('Published'); ?> <input type="radio" name="post_status" value="draft" id="unpublished" /> <?php _e('Unpublished'); ?></label>
+		<div id="post_status">
+			<input type="radio" name="post_status" value="publish" checked="checked" id="published" /> <label for="published"><?php _e('Published'); ?></label>
+			<input type="radio" name="post_status" value="draft" id="unpublished" /> <label for="unpublished"><?php _e('Unpublished'); ?></label>
+		</div>
 		<p class="submit">         
 			<input type="submit" value="<?php _e('Publish') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>
 			<img src="images/loading-publish.gif" alt="" id="photo_saving" style="display:none;"/>
@@ -526,4 +529,4 @@ if($_REQUEST['ajax'] == 'photo') { ?>
 	</div>
 </form>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/wp-settings.php b/wp-settings.php
index 32ac53509..e2680ded1 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -97,7 +97,7 @@ if ( empty($PHP_SELF) )
 	$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace("/(\?.*)?$/",'',$_SERVER["REQUEST_URI"]);
 
 if ( version_compare( '4.3', phpversion(), '>' ) ) {
-	die( /*WP_I18N_OLD_PHP*/'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.3.'/*/WP_I18N_OLD_PHP*/ );
+	die( sprintf( /*WP_I18N_OLD_PHP*/'Your server is running PHP version %s but WordPress requires at least 4.3.'/*/WP_I18N_OLD_PHP*/, php_version() ) );
 }
 
 if ( !defined('WP_CONTENT_DIR') )