aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/ucp.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language/en/ucp.php')
-rw-r--r--phpBB/language/en/ucp.php37
1 files changed, 19 insertions, 18 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index ec3d50d9bb..6c1d41692e 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -383,26 +383,27 @@ $lang = array_merge($lang, array(
'UCP_USERGROUPS_MEMBER' => 'Memberships',
'UCP_USERGROUPS_MANAGE' => 'Manage groups',
- 'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.',
- 'UCP_REMIND' => 'Send password',
- 'UCP_RESEND' => 'Send activation email',
- 'UCP_WATCHED' => 'Watched items',
- 'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',
- 'UCP_YIM' => 'Yahoo Messenger',
- 'UCP_ZEBRA' => 'Friends and Foes',
- 'UCP_ZEBRA_FOES' => 'Foes',
- 'UCP_ZEBRA_FRIENDS' => 'Friends',
- 'UNKNOWN_FOLDER' => 'Unknown Folder',
- 'UNREAD_MESSAGES' => 'Unread Messages',
- 'UNWATCH_MARKED' => 'Unwatch marked',
- 'UPLOAD_AVATAR_FILE' => 'Upload from your machine',
- 'UPLOAD_AVATAR_URL' => 'Upload from a URL',
- 'UPLOAD_AVATAR_URL_EXPLAIN' => 'Enter the URL of the location containing the image, it will be copied to this site.',
+ 'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.',
+ 'UCP_REMIND' => 'Send password',
+ 'UCP_RESEND' => 'Send activation email',
+ 'UCP_WATCHED' => 'Watched items',
+ 'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',
+ 'UCP_YIM' => 'Yahoo Messenger',
+ 'UCP_ZEBRA' => 'Friends and Foes',
+ 'UCP_ZEBRA_FOES' => 'Foes',
+ 'UCP_ZEBRA_FRIENDS' => 'Friends',
+ 'UNKNOWN_FOLDER' => 'Unknown Folder',
+ 'UNREAD_MESSAGES' => 'Unread Messages',
+ 'UNWATCH_MARKED' => 'Unwatch marked',
+ 'UPLOAD_AVATAR_FILE' => 'Upload from your machine',
+ 'UPLOAD_AVATAR_URL' => 'Upload from a URL',
+ 'UPLOAD_AVATAR_URL_EXPLAIN' => 'Enter the URL of the location containing the image, it will be copied to this site.',
'USERNAME_ALPHA_ONLY_EXPLAIN' => 'Username must be between %1$d and %2$d chars long and use only alphanumeric characters',
'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.',
- 'USERNAME_CHARS_ANY_EXPLAIN'=> 'Length must be between %1$d and %2$d characters.',
- 'USERNAME_TAKEN_USERNAME' => 'The username you entered is already in use, please select an alternative.',
- 'USER_NOT_FOUND' => 'The usernames you specified could not be found.',
+ 'USERNAME_CHARS_ANY_EXPLAIN' => 'Length must be between %1$d and %2$d characters.',
+ 'USERNAME_TAKEN_USERNAME' => 'The username you entered is already in use, please select an alternative.',
+ 'USERNAME_USERNAME_DISALLOWED' => 'The username you entered has been banned.',
+ 'USER_NOT_FOUND' => 'The usernames you specified could not be found.',
'VIEW_AVATARS' => 'Display Avatars',
'VIEW_EDIT' => 'View/Edit',