aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language/en/acp')
-rw-r--r--phpBB/language/en/acp/common.php1
-rw-r--r--phpBB/language/en/acp/groups.php10
-rw-r--r--phpBB/language/en/acp/language.php1
-rw-r--r--phpBB/language/en/acp/users.php9
4 files changed, 11 insertions, 10 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index d58c83a7ea..a35e239a81 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -202,7 +202,6 @@ $lang = array_merge($lang, array(
'COLOUR_SWATCH' => 'Web-safe colour swatch',
'CONFIG_UPDATED' => 'Configuration updated successfully.',
- 'CONFIRM_OPERATION' => 'Are you sure you wish to carry out this operation?',
'DEACTIVATE' => 'Deactivate',
'DIMENSIONS' => 'Dimensions',
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index ec40ddbdf4..dbe22e2154 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -41,7 +41,7 @@ $lang = array_merge($lang, array(
'GROUPS_NO_MEMBERS' => 'This group has no members',
'GROUPS_NO_MODS' => 'No group leaders defined',
- 'GROUP_APPROVE' => 'Approve',
+ 'GROUP_APPROVE' => 'Approve member',
'GROUP_APPROVED' => 'Approved members',
'GROUP_AVATAR' => 'Group avatar',
'GROUP_AVATAR_EXPLAIN' => 'This image will be displayed in the Group Control Panel.',
@@ -49,11 +49,11 @@ $lang = array_merge($lang, array(
'GROUP_COLOR' => 'Group colour',
'GROUP_COLOR_EXPLAIN' => 'Defines the colour members usernames will appear in, leave blank for user default.',
'GROUP_CREATED' => 'Group has been created successfully.',
- 'GROUP_DEFAULT' => 'Default',
+ 'GROUP_DEFAULT' => 'Make group default for member',
'GROUP_DEFS_UPDATED' => 'Default group set for all selected members.',
- 'GROUP_DELETE' => 'Delete',
+ 'GROUP_DELETE' => 'Remove member from group',
'GROUP_DELETED' => 'Group deleted and user default groups set successfully.',
- 'GROUP_DEMOTE' => 'Demote',
+ 'GROUP_DEMOTE' => 'Demote group leader',
'GROUP_DESC' => 'Group description',
'GROUP_DETAILS' => 'Group details',
'GROUP_DST' => 'Group daylight savings',
@@ -78,7 +78,7 @@ $lang = array_merge($lang, array(
'GROUP_NAME' => 'Group name',
'GROUP_OPEN' => 'Open',
'GROUP_PENDING' => 'Pending members',
- 'GROUP_PROMOTE' => 'Promote',
+ 'GROUP_PROMOTE' => 'Promote to group leader',
'GROUP_RANK' => 'Group rank',
'GROUP_RECEIVE_PM' => 'Group able to receive private messages',
'GROUP_REQUEST' => 'Request',
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index eaad88a9f7..4c60fdc116 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -87,6 +87,7 @@ $lang = array_merge($lang, array(
'UNABLE_TO_WRITE_FILE' => 'The file could not be written to %s.',
'UPLOAD_COMPLETED' => 'The upload was completed successfully.',
+ 'UPLOAD_FAILED' => 'The upload failed for unkown reasons. You may need to replace the relevant file manually.',
'UPLOAD_METHOD' => 'Upload method',
'UPLOAD_SETTINGS' => 'Upload settings',
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 2424a88e2b..41deacbcaf 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -58,10 +58,11 @@ $lang = array_merge($lang, array(
'FOUNDER' => 'Founder',
'FOUNDER_EXPLAIN' => 'Founders have all admin permissions and can never be banned, deleted or altered by non-founder members',
- 'GROUP_DEFAULT' => 'Default',
- 'GROUP_DELETE' => 'Delete',
- 'GROUP_DEMOTE' => 'Demote',
- 'GROUP_PROMOTE' => 'Promote',
+ 'GROUP_APPROVE' => 'Approve member',
+ 'GROUP_DEFAULT' => 'Make group default for member',
+ 'GROUP_DELETE' => 'Remove member from group',
+ 'GROUP_DEMOTE' => 'Demote group leader',
+ 'GROUP_PROMOTE' => 'Promote to group leader',
'IP_WHOIS_FOR' => 'IP whois for %s',