From ce65b14ceded4c30567dac1780ec2596b39854bb Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 7 Jun 2011 06:29:32 -0400
Subject: [PATCH] Change redundant message

---
 js/messages.php         |  3 +--
 js/server_privileges.js |  6 +++---
 server_privileges.php   | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/js/messages.php b/js/messages.php
index 03c92fec24..b2209cfb57 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -51,8 +51,7 @@ $js_messages['strHostEmpty'] = __('The host name is empty!');
 $js_messages['strUserEmpty'] = __('The user name is empty!');
 $js_messages['strPasswordEmpty'] = __('The password is empty!');
 $js_messages['strPasswordNotSame'] = __('The passwords aren\'t the same!');
-$js_messages['strAddNewUser'] = __('Add a New User');
-$js_messages['strCreateUser'] = __('Create User');
+$js_messages['strAddUser'] = __('Add user');
 $js_messages['strReloadingPrivileges'] = __('Reloading Privileges');
 $js_messages['strRemovingSelectedUsers'] = __('Removing Selected Users');
 $js_messages['strClose'] = __('Close');
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 0706405012..10c379717b 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -126,7 +126,7 @@ function appendNewUser(new_user_string, new_user_initial, new_user_initial_strin
  * AJAX scripts for server_privileges page.
  *
  * Actions ajaxified here:
- * Add a new user
+ * Add user
  * Revoke a user
  * Edit privileges
  * Export privileges
@@ -169,7 +169,7 @@ $(document).ready(function() {
          * @var button_options  Object containing options for jQueryUI dialog buttons
          */
         var button_options = {};
-        button_options[PMA_messages['strCreateUser']] = function() {
+        button_options[PMA_messages['strAddUser']] = function() {
 
             /**
              * @var $form    stores reference to current form
@@ -252,7 +252,7 @@ $(document).ready(function() {
             .find("form[name=usersForm]").append('<input type="hidden" name="ajax_request" value="true" />')
             .end()
             .dialog({
-                title: PMA_messages['strAddNewUser'],
+                title: PMA_messages['strAddUser'],
                 width: 800,
                 // height is a workaround for this Chrome problem:
                 // http://bugs.jqueryui.com/ticket/4671
diff --git a/server_privileges.php b/server_privileges.php
index 0842432670..29ef94eac5 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1676,7 +1676,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                 echo '    <fieldset id="fieldset_add_user">' . "\n"
                    . '        <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1" class="' . $conditional_class . '">' . "\n"
                    . PMA_getIcon('b_usradd.png')
-                   . '            ' . __('Add a new User') . '</a>' . "\n"
+                   . '            ' . __('Add user') . '</a>' . "\n"
                    . '    </fieldset>' . "\n"
                    . '    <fieldset id="fieldset_delete_user">'
                    . '        <legend>' . "\n"
@@ -1700,7 +1700,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                 echo '    <fieldset id="fieldset_add_user">' . "\n"
                    . '        <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1">' . "\n"
                    . PMA_getIcon('b_usradd.png')
-                   . '            ' . __('Add a new User') . '</a>' . "\n"
+                   . '            ' . __('Add user') . '</a>' . "\n"
                    . '    </fieldset>' . "\n";
             } // end if (display overview)
 
@@ -2102,10 +2102,10 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
     }
 } elseif (isset($_REQUEST['adduser'])) {
 
-    // Add a new user
+    // Add user
     $GLOBALS['url_query'] .= '&amp;adduser=1';
     echo '<h2>' . "\n"
-       . PMA_getIcon('b_usradd.png') . __('Add a new User') . "\n"
+       . PMA_getIcon('b_usradd.png') . __('Add user') . "\n"
        . '</h2>' . "\n"
        . '<form name="usersForm" id="addUsersForm_' . $random_n . '" action="server_privileges.php" method="post">' . "\n"
        . PMA_generate_common_hidden_inputs('', '');
@@ -2299,7 +2299,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         $user_form .= '<fieldset id="fieldset_add_user">' . "\n"
            . '    <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1&amp;dbname=' . htmlspecialchars($checkprivs) .'" val="'.'checkprivs='.htmlspecialchars($checkprivs). '&'.$GLOBALS['url_query'] . '" class="'.$conditional_class.'" name="db_specific">' . "\n"
            . PMA_getIcon('b_usradd.png')
-           . '        ' . __('Add a new User') . '</a>' . "\n"
+           . '        ' . __('Add user') . '</a>' . "\n"
            . '</fieldset>' . "\n";
         echo $user_form ;
     }