aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-10-08 14:38:44 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-10-08 14:38:44 +0000
commite8b2c4128ec285314ce6c58d3989a9c92f8a456c (patch)
treecabeaee81eb0ebff31a48cd9f914e708a32221f3 /phpBB/language/en
parentb3475ac8038240707faff9949e0fec423abbc627 (diff)
downloadforums-e8b2c4128ec285314ce6c58d3989a9c92f8a456c.tar
forums-e8b2c4128ec285314ce6c58d3989a9c92f8a456c.tar.gz
forums-e8b2c4128ec285314ce6c58d3989a9c92f8a456c.tar.bz2
forums-e8b2c4128ec285314ce6c58d3989a9c92f8a456c.tar.xz
forums-e8b2c4128ec285314ce6c58d3989a9c92f8a456c.zip
some tiny bugfixes
git-svn-id: file:///svn/phpbb/trunk@8155 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/acp/permissions.php4
-rw-r--r--phpBB/language/en/acp/users.php4
-rw-r--r--phpBB/language/en/ucp.php1
3 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 8ca4d1cec5..8bddbebbd3 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -262,8 +262,8 @@ $lang = array_merge($lang, array(
'TRACE_TOTAL' => 'Total',
'USERS_NOT_ASSIGNED' => 'No user assigned to this role',
- 'USER_IS_MEMBER_OF_DEFAULT' => 'is a member of the following default groups',
- 'USER_IS_MEMBER_OF_CUSTOM' => 'is a member of the following custom groups',
+ 'USER_IS_MEMBER_OF_DEFAULT' => 'is a member of the following pre-defined groups',
+ 'USER_IS_MEMBER_OF_CUSTOM' => 'is a member of the following user defined groups',
'VIEW_ASSIGNED_ITEMS' => 'View assigned items',
'VIEW_LOCAL_PERMS' => 'Local permissions',
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 01e773d87d..408afc4c5b 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -113,9 +113,9 @@ $lang = array_merge($lang, array(
'USER_CUSTOM_PROFILE_FIELDS' => 'Custom profile fields',
'USER_DELETED' => 'User deleted successfully.',
'USER_GROUP_ADD' => 'Add user to group',
- 'USER_GROUP_NORMAL' => 'Normal groups user is a member of',
+ 'USER_GROUP_NORMAL' => 'User defined groups user is a member of',
'USER_GROUP_PENDING' => 'Groups user is in pending mode',
- 'USER_GROUP_SPECIAL' => 'Special groups user is a member of',
+ 'USER_GROUP_SPECIAL' => 'Pre-defined groups user is a member of',
'USER_NO_ATTACHMENTS' => 'There are no attached files to display.',
'USER_OVERVIEW_UPDATED' => 'User details updated.',
'USER_POSTS_DELETED' => 'Successfully removed all posts made by this user.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index c573480863..0a553b9366 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -68,6 +68,7 @@ $lang = array_merge($lang, array(
'ACCOUNT_INACTIVE' => 'Your account has been created. However, this board requires account activation, an activation key has been sent to the e-mail address you provided. Please check your e-mail for further information.',
'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this board requires account activation by the administrator group. An e-mail has been sent to them and you will be informed when your account has been activated.',
'ACTIVATION_EMAIL_SENT' => 'The activation e-mail has been sent to your e-mail address.',
+ 'ACTIVATION_EMAIL_SENT_ADMIN' => 'The activation e-mail has been sent to the administrators e-mail addresses.',
'ADD' => 'Add',
'ADD_BCC' => 'Add [BCC]',
'ADD_FOES' => 'Add new foes',