diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-12-05 14:10:49 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-12-05 14:10:49 +0100 |
| commit | f6a48b495e6c65c1ca2535a7d9ed7b42332ea464 (patch) | |
| tree | 870db2d593268fb59fcac57d9ef1c262acc451cb | |
| parent | 5a4938c27001cd4f0aad4efcc72175e7a7bd30a6 (diff) | |
| parent | 0491bfbc2d5e7d98a7a15b5d0096c2647b821709 (diff) | |
| download | forums-f6a48b495e6c65c1ca2535a7d9ed7b42332ea464.tar forums-f6a48b495e6c65c1ca2535a7d9ed7b42332ea464.tar.gz forums-f6a48b495e6c65c1ca2535a7d9ed7b42332ea464.tar.bz2 forums-f6a48b495e6c65c1ca2535a7d9ed7b42332ea464.tar.xz forums-f6a48b495e6c65c1ca2535a7d9ed7b42332ea464.zip | |
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'
| -rw-r--r-- | phpBB/adm/style/acp_forums.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_styles.html | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/groups.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/memberlist.php | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 9f9216a068..d27cea28f7 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -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() { diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 5bde4008ad..cb4361dd6f 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -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() { diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 2c549f8130..8c71e936b3 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -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.', diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index e8c1a3c494..3444b98303 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -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.', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index e7a9c6b88d..213f766610 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -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( |