From 63c5ee4199244f018eefe242bea04ae225e612ba Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 13 Nov 2008 20:59:32 +0000
Subject: [PATCH] i18n plurals fixes from nbachiyski. fixes #8142

git-svn-id: http://svn.automattic.com/wordpress/trunk@9668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/css/colors-classic-rtl.css  | 2 +-
 wp-admin/css/colors-classic.css      | 4 +++-
 wp-admin/css/colors-fresh-rtl.css    | 2 +-
 wp-admin/css/colors-fresh.css        | 4 +++-
 wp-admin/includes/plugin-install.php | 2 +-
 wp-admin/link-manager.php            | 3 +--
 wp-admin/rtl.css                     | 5 +++--
 wp-admin/upload.php                  | 3 +--
 wp-admin/wp-admin.css                | 5 +++--
 9 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/wp-admin/css/colors-classic-rtl.css b/wp-admin/css/colors-classic-rtl.css
index b249d62546..77f9da495b 100644
--- a/wp-admin/css/colors-classic-rtl.css
+++ b/wp-admin/css/colors-classic-rtl.css
@@ -9,7 +9,7 @@
 .post-com-count {
 	background-image: url(../images/bubble_bg-rtl.gif);
 }
-#adminmenu li a #awaiting-mod {
+#adminmenu li a #awaiting-mod, #adminmenu li a #update-plugins {
 	background-image: url(../images/comment-stalk-rtl.gif);
 }
 #upload-menu li.current {
diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index 0a9cacf9d6..236e57883f 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -448,11 +448,12 @@ body.press-this .ui-tabs-selected a:hover {
 	color: #d54e21;
 }
 
-#adminmenu li a #awaiting-mod {
+#adminmenu li a #awaiting-mod, #adminmenu li a #update-plugins {
 	background-image: url(../images/comment-stalk-fresh.gif);
 }
 
 #adminmenu li a #awaiting-mod span,
+#adminmenu li a #update-plugins span,
 #sidemenu li a #update-plugins span,
 #rightnow .reallynow,
 #plugin-information .action-button {
@@ -461,6 +462,7 @@ body.press-this .ui-tabs-selected a:hover {
 }
 
 #adminmenu li a:hover #awaiting-mod span,
+#adminmenu li a:hover #update-plugins span,
 #sidemenu li a:hover #update-plugins span {
 	background-color: #264761;
 }
diff --git a/wp-admin/css/colors-fresh-rtl.css b/wp-admin/css/colors-fresh-rtl.css
index 5946965ea0..a5d6cbd474 100644
--- a/wp-admin/css/colors-fresh-rtl.css
+++ b/wp-admin/css/colors-fresh-rtl.css
@@ -12,7 +12,7 @@
 	background-image: url(../images/bubble_bg-rtl.gif);
 }
 
-#adminmenu li a #awaiting-mod {
+#adminmenu li a #awaiting-mod, #adminmenu li a #update-plugins {
 	background-image: url(../images/comment-stalk-rtl.gif);
 }
 
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index afd6154f7c..3e025478da 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -461,11 +461,12 @@ body.press-this .ui-tabs-selected a:hover {
 	color: #d54e21;
 }
 
-#adminmenu li a #awaiting-mod {
+#adminmenu li a #awaiting-mod, #adminmenu li a #update-plugins {
 	background-image: url(../images/comment-stalk-fresh.gif);
 }
 
 #adminmenu li a #awaiting-mod span,
+#adminmenu li a #update-plugins span,
 #sidemenu li a #update-plugins span,
 #rightnow .reallynow,
 #plugin-information .action-button {
@@ -474,6 +475,7 @@ body.press-this .ui-tabs-selected a:hover {
 }
 
 #adminmenu li a:hover #awaiting-mod span,
+#adminmenu li a:hover #update-plugins span,
 #sidemenu li a:hover #update-plugins span {
 	background-color: #264761;
 }
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index ec27b471a7..2246f17a1d 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -463,7 +463,7 @@ function install_plugin_information() {
 <?php endif; if ( ! empty($api->tested) ) : ?>
 			<li><strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?></li>
 <?php endif; if ( ! empty($api->downloaded) ) : ?>
-			<li><strong><?php _e('Downloaded:') ?></strong> <?php printf('%s times', number_format_i18n($api->downloaded)) ?></li>
+			<li><strong><?php _e('Downloaded:') ?></strong> <?php printf(__ngettext('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li>
 <?php endif; if ( ! empty($api->slug) ) : ?>
 			<li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
 <?php endif; if ( ! empty($api->homepage) ) : ?>
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 9a5aea9e52..f4e6284637 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -272,8 +272,7 @@ if ( $links ) {
 	$(document).ready(function(){
 		$('#doaction, #doaction2').click(function(){
 			if ( $('select[name^="action"]').val() == 'delete' ) {
-				var n = $('table.widefat input[type="checkbox"]:checked').length;
-				var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected links.\n  'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected link.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+				var m = '<?php echo js_escape(__("You are about to delete the selected links.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
 				return showNotice.warn(m);
 			}
 		});
diff --git a/wp-admin/rtl.css b/wp-admin/rtl.css
index 56193d4864..14821cf680 100644
--- a/wp-admin/rtl.css
+++ b/wp-admin/rtl.css
@@ -171,13 +171,14 @@ ul#adminmenu li.write-new-button a {
 /* 1000 - 1300
 =================================== */
 #adminmenu a #awaiting-mod,
+#adminmenu a #update-plugins,
 #sidemenu li a #update-plugins {
 	background-position: -240px top;
 }
-#adminmenu li a:hover #awaiting-mod, #sidemenu li a:hover #update-plugins {
+#adminmenu li a:hover #awaiting-mod, #adminmenu li a:hover #update-plugins, #sidemenu li a:hover #update-plugins {
 	background-position: -160px top;
 }
-#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span {
+#adminmenu li a #awaiting-mod span, #adminmenu li a #update-plugins span, #sidemenu li a #update-plugins span {
 	right:auto;
 	left:0;
 }
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 38a357fe86..2190c138d4 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -451,8 +451,7 @@ endif; // posts;
 	$(document).ready(function(){
 		$('#doaction, #doaction2').click(function(e){
 			if ( $('select[name^="action"]').val() == 'delete' ) {
-				var n = $('#the-list input[type="checkbox"]:checked').length;
-				var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected attachments.\n  'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected attachment.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
+				var m = '<?php echo js_escape(__("You are about to delete the selected attachments.\n  'Cancel' to stop, 'OK' to delete.")); ?>';
 				return showNotice.warn(m);
 			} else if ( $('select[name^="action"]').val() == 'attach' ) {
 				e.preventDefault();
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index e62d794dfa..58c1e01f3d 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1117,6 +1117,7 @@ ul#adminmenu li.write-new-button a {
 
 /* 2.6 */
 #adminmenu a #awaiting-mod,
+#adminmenu a #update-plugins,
 #sidemenu li a #update-plugins {
 	position: absolute;
 	margin-top: 0.2em;
@@ -1168,11 +1169,11 @@ strong .post-com-count {
 	background-position: center -3px;
 }
 
-#adminmenu li a:hover #awaiting-mod, #sidemenu li a:hover #update-plugins {
+#adminmenu li a:hover #awaiting-mod, #adminmenu li a:hover #update-plugins, #sidemenu li a:hover #update-plugins {
 	background-position: -80px bottom;
 }
 
-#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span {
+#adminmenu li a #awaiting-mod span, #adminmenu li a #update-plugins span, #sidemenu li a #update-plugins span {
 	top: -0.8em;
 	right: 0;
 	position: absolute;