From 6830e3395a1bf5960d2c670cf70c4308324a5e58 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 23 Jul 2008 18:53:43 +0000
Subject: [PATCH] Use conditional for whole sentence. Fixes #7385 for 2.7

git-svn-id: http://svn.automattic.com/wordpress/trunk@8419 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-header.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 6fd6c49c12..54fdea4892 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -75,7 +75,6 @@ unset($hook_suffixes, $hook_suffix);
 
 <?php
 if ( ! $is_opera ) { 
-	$gears_menu = $is_safari ? __('the Safari menu') : __('your browser Tools menu');
 ?>
 	<div id="gears-info-box" class="info-box" style="display:none;">
 	<img src="images/gear.png" title="Gear" alt="" class="gears-img" />
@@ -91,7 +90,14 @@ if ( ! $is_opera ) {
 	<div id="gears-msg2" style="display:none;">
 	<h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
 	<p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p> 
-	<p><?php printf( __('To enable it, make sure this web site is not on the denied list in Gears Settings under %s, then click the button below.'), $gears_menu ); ?></p>
+	<p><?php 
+	
+	if ( $is_safari )
+		_e('To enable it, make sure this web site is not on the denied list in Gears Settings under the Safari menu, then click the button below.');
+	else
+		_e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser 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';"><?php _e('Cancel'); ?></button></div>
@@ -99,7 +105,14 @@ if ( ! $is_opera ) {
 
 	<div id="gears-msg3" style="display:none;">
 	<h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
-	<p><?php printf( __('Gears is installed and enabled on this computer. You can disable it from %s.'), $gears_menu ); ?></p></p>
+	<p><?php
+	
+	if ( $is_safari )
+		_e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.');
+	else
+		_e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); 
+	
+	?></p>
 	<p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p>
 	<p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p>
 	<div class="submit"><button class="button" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Close'); ?></button></div>