mirror of
https://github.com/phpbb/phpbb.git
synced 2025-02-24 12:03:21 +01:00
Merge branch 'ticket/adamreyher/9575' into develop-olympus
* ticket/adamreyher/9575: [ticket/9575] Also change 'administrate' to 'administer' in templates [ticket/9575] Change 'administrate' to 'administer'
This commit is contained in:
commit
f6a48b495e
@ -58,7 +58,7 @@
|
||||
|
||||
/**
|
||||
* Init the wanted display functionality if javascript is enabled.
|
||||
* If javascript is not available, the user is still able to properly administrate.
|
||||
* If javascript is not available, the user is still able to properly administer.
|
||||
*/
|
||||
onload = function()
|
||||
{
|
||||
|
@ -77,7 +77,7 @@
|
||||
|
||||
/**
|
||||
* Init the wanted display functionality if javascript is enabled.
|
||||
* If javascript is not available, the user is still able to properly administrate.
|
||||
* If javascript is not available, the user is still able to properly administer.
|
||||
*/
|
||||
onload = function()
|
||||
{
|
||||
|
@ -255,7 +255,7 @@ $lang = array_merge($lang, array(
|
||||
'MOVE_UP' => 'Move up',
|
||||
|
||||
'NOTIFY' => 'Notification',
|
||||
'NO_ADMIN' => 'You are not authorised to administrate this board.',
|
||||
'NO_ADMIN' => 'You are not authorised to administer this board.',
|
||||
'NO_EMAILS_DEFINED' => 'No valid e-mail addresses found.',
|
||||
'NO_PASSWORD_SUPPLIED' => 'You need to enter your password to access the Administration Control Panel.',
|
||||
|
||||
|
@ -36,7 +36,7 @@ if (empty($lang) || !is_array($lang))
|
||||
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
|
||||
|
||||
$lang = array_merge($lang, array(
|
||||
'ACP_GROUPS_MANAGE_EXPLAIN' => 'From this panel you can administrate all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.',
|
||||
'ACP_GROUPS_MANAGE_EXPLAIN' => 'From this panel you can administer all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.',
|
||||
'ADD_USERS' => 'Add users',
|
||||
'ADD_USERS_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.',
|
||||
|
||||
|
@ -131,7 +131,7 @@ $lang = array_merge($lang, array(
|
||||
'SORT_POST_COUNT' => 'Post count',
|
||||
|
||||
'USERNAME_BEGINS_WITH' => 'Username begins with',
|
||||
'USER_ADMIN' => 'Administrate user',
|
||||
'USER_ADMIN' => 'Administer user',
|
||||
'USER_BAN' => 'Banning',
|
||||
'USER_FORUM' => 'User statistics',
|
||||
'USER_LAST_REMINDED' => array(
|
||||
|
Loading…
x
Reference in New Issue
Block a user