diff options
| -rw-r--r-- | libraries/Menu.class.php | 2 | ||||
| -rw-r--r-- | libraries/server_privileges.lib.php | 18 | ||||
| -rw-r--r-- | libraries/server_users.lib.php | 4 | ||||
| -rw-r--r-- | test/libraries/PMA_server_privileges_test.php | 10 | ||||
| -rw-r--r-- | test/libraries/PMA_server_users_test.php | 4 |
5 files changed, 19 insertions, 19 deletions
diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index e33f0ee348..ef8820d2df 100644 --- a/libraries/Menu.class.php +++ b/libraries/Menu.class.php @@ -564,7 +564,7 @@ class PMA_Menu if (($is_superuser || $isCreateOrGrantUser) && ! PMA_DRIZZLE) { $tabs['rights']['icon'] = 's_rights.png'; $tabs['rights']['link'] = 'server_privileges.php'; - $tabs['rights']['text'] = __('Users'); + $tabs['rights']['text'] = __('User accounts'); $tabs['rights']['active'] = in_array( basename($GLOBALS['PMA_PHP_SELF']), array('server_privileges.php', 'server_user_groups.php') diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index e5004d10ff..ce7a6e5e65 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -1930,7 +1930,7 @@ function PMA_getWithClauseForAddUserAndUpdatePrivs() function PMA_getHtmlForAddUser($dbname) { $html_output = '<h2>' . "\n" - . PMA_Util::getIcon('b_usradd.png') . __('Add user') . "\n" + . PMA_Util::getIcon('b_usradd.png') . __('Add user account') . "\n" . '</h2>' . "\n" . '<form name="usersForm" id="addUsersForm"' . ' onsubmit="return checkAddUser(this);"' @@ -1939,7 +1939,7 @@ function PMA_getHtmlForAddUser($dbname) . PMA_getHtmlForLoginInformationFields('new'); $html_output .= '<fieldset id="fieldset_add_user_database">' . "\n" - . '<legend>' . __('Database for user') . '</legend>' . "\n"; + . '<legend>' . __('Database for user account') . '</legend>' . "\n"; $html_output .= PMA_Util::getCheckbox( 'createdb-1', @@ -2725,13 +2725,13 @@ function PMA_getChangeLoginInformationHtmlForm($username, $hostname) . 'value="' . htmlspecialchars($hostname) . '" />' . "\n" . '<fieldset id="fieldset_change_copy_user">' . "\n" . '<legend data-submenu-label="' . __('Login Information') . '">' . "\n" - . __('Change Login Information / Copy User') + . __('Change login information / Copy user account') . '</legend>' . "\n" . PMA_getHtmlForLoginInformationFields('change'); $html_output .= '<fieldset id="fieldset_mode">' . "\n" . ' <legend>' - . __('Create a new user with the same privileges and …') + . __('Create a new user account with the same privileges and …') . '</legend>' . "\n"; $html_output .= PMA_Util::getRadioFields( 'mode', $choices, '4', true @@ -3367,7 +3367,7 @@ function PMA_getFieldsetForAddDeleteUser() $html_output .= '<fieldset id="fieldset_delete_user">' . '<legend>' . "\n" . PMA_Util::getIcon('b_usrdrop.png') - . ' ' . __('Remove selected users') . '' . "\n" + . ' ' . __('Remove selected user accounts') . '' . "\n" . '</legend>' . "\n"; $html_output .= '<input type="hidden" name="mode" value="2" />' . "\n" @@ -4060,7 +4060,7 @@ function PMA_getAddUserHtmlFieldset($db = '', $table = '') : '') . '>' . "\n" . PMA_Util::getIcon('b_usradd.png') - . ' ' . __('Add user') . '</a>' . "\n" + . ' ' . __('Add user account') . '</a>' . "\n" . '</fieldset>' . "\n"; } @@ -4081,8 +4081,8 @@ function PMA_getHtmlHeaderForUserProperties( ) { $html_output = '<h2>' . "\n" . PMA_Util::getIcon('b_usredit.png') - . __('Edit Privileges:') . ' ' - . __('User'); + . __('Edit privileges:') . ' ' + . __('User account'); if (! empty($dbname)) { $html_output .= ' <i><a class="edit_user_anchor"' @@ -4161,7 +4161,7 @@ function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir) { $html_output = '<h2>' . "\n" . PMA_Util::getIcon('b_usrlist.png') - . __('Users overview') . "\n" + . __('User accounts overview') . "\n" . '</h2>' . "\n"; $password_column = 'Password'; diff --git a/libraries/server_users.lib.php b/libraries/server_users.lib.php index 807eaa19b8..f8cb5c56ad 100644 --- a/libraries/server_users.lib.php +++ b/libraries/server_users.lib.php @@ -22,7 +22,7 @@ function PMA_getHtmlForSubMenusOnUsersPage($selfUrl) $url_params = PMA_URL_getCommon(); $items = array( array( - 'name' => __('Users overview'), + 'name' => __('User accounts overview'), 'url' => 'server_privileges.php', 'specific_params' => '&viewing_mode=server' ) @@ -55,4 +55,4 @@ function PMA_getHtmlForSubMenusOnUsersPage($selfUrl) return $retval; } -?>
\ No newline at end of file +?> diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php index ed50e446d3..bd23b2d1d2 100644 --- a/test/libraries/PMA_server_privileges_test.php +++ b/test/libraries/PMA_server_privileges_test.php @@ -1647,7 +1647,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase //Create a new user with the same privileges $this->assertContains( - "Create a new user with the same privileges", + "Create a new user account with the same privileges", $html ); @@ -1835,11 +1835,11 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase //labels $this->assertContains( - __('Add user'), + __('Add user account'), $html ); $this->assertContains( - __('Remove selected users'), + __('Remove selected user accounts'), $html ); $this->assertContains( @@ -1934,11 +1934,11 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase //title $this->assertContains( - __('Edit Privileges:'), + __('Edit privileges:'), $html ); $this->assertContains( - __('User'), + __('User account'), $html ); diff --git a/test/libraries/PMA_server_users_test.php b/test/libraries/PMA_server_users_test.php index 2d9de4fee9..079f641191 100644 --- a/test/libraries/PMA_server_users_test.php +++ b/test/libraries/PMA_server_users_test.php @@ -44,7 +44,7 @@ class PMA_ServerUsers_Test extends PHPUnit_Framework_TestCase $html ); $this->assertContains( - __('Users overview'), + __('User accounts overview'), $html ); @@ -59,4 +59,4 @@ class PMA_ServerUsers_Test extends PHPUnit_Framework_TestCase ); } } -?>
\ No newline at end of file +?> |