From 3ba9fc235c6b6d6a3f5e5136ffd90acb2c7f832f Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 3 Jun 2010 18:58:41 +0000
Subject: [PATCH] More request_filesystem_credentials() string improvements.

git-svn-id: http://svn.automattic.com/wordpress/trunk@15130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/file.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index a3cee9e7fe..e5a8c2f5ba 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -965,13 +965,20 @@ jQuery(function($){
 <?php screen_icon(); ?>
 <h2><?php _e('Connection Information') ?></h2>
 <p><?php
+	$label_user = __('Username');
+	$label_pass = __('Password');
 	_e('To perform the requested action, WordPress needs to access to your web server.');
 	echo ' ';
 	if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
-		if ( isset( $types['ssh'] ) )
+		if ( isset( $types['ssh'] ) ) {
 			_e('Please enter your FTP or SSH credentials to proceed.');
-		else
+			$label_user = __('FTP/SSH Username');
+			$label_pass = __('FTP/SSH Password');
+		} else {
 			_e('Please enter your FTP credentials to proceed.');
+			$label_user = __('FTP Username');
+			$label_pass = __('FTP Password');
+		}
 		echo ' ';
 	}
 	_e('If you do not remember your credentials, you should contact your web host.');
@@ -983,12 +990,12 @@ jQuery(function($){
 </tr>
 
 <tr valign="top">
-<th scope="row"><label for="username"><?php _e('Username') ?></label></th>
+<th scope="row"><label for="username"><?php echo $label_user; ?></label></th>
 <td><input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled( defined('FTP_USER') ); ?> size="40" /></td>
 </tr>
 
 <tr valign="top">
-<th scope="row"><label for="password"><?php _e('Password') ?></label></th>
+<th scope="row"><label for="password"><?php echo $label_pass; ?></label></th>
 <td><input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> size="40" /></td>
 </tr>