diff options
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/common.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 33 |
4 files changed, 22 insertions, 18 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 05ae2133ef..827c1b56b2 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -83,6 +83,9 @@ $lang = array_merge($lang, array( 'BACK_TO_TOP' => 'Top', 'BACK_TO_PREV' => 'Back to previous page', + 'BAN_TRIGGERED_BY_EMAIL'=> 'This ban has been issued on your email address.', + 'BAN_TRIGGERED_BY_IP' => 'This ban has been issued on your ip address.', + 'BAN_TRIGGERED_BY_USER' => 'This ban has been issued on your username.', 'BBCODE_GUIDE' => 'BBCode guide', 'BCC' => 'BCC', 'BIRTHDAYS' => 'Birthdays', @@ -445,6 +448,7 @@ $lang = array_merge($lang, array( 'SEARCH_FOR' => 'Search for', 'SEARCH_FORUM' => 'Search this forum', 'SEARCH_NEW' => 'View new posts', + 'SEARCH_POSTS_BY' => 'Search posts by', 'SEARCH_SELF' => 'View your posts', 'SEARCH_TOPIC' => 'Search this topic', 'SEARCH_UNANSWERED' => 'View unanswered posts', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index b9b1e98ac7..18af5bdb05 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -264,6 +264,7 @@ $lang = array_merge($lang, array( 'SEARCH_POSTS_BY_USER' => 'Search posts by', 'SELECT_ACTION' => 'Select desired action', + 'SELECT_TOPICS_FROM' => 'Select topics from', 'SELECT_TOPIC' => 'Select topic', 'SELECT_USER' => 'Select user', 'SORT_ACTION' => 'Log action', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 221c82c8f7..e0008603bc 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -196,8 +196,6 @@ $lang = array_merge($lang, array( 'USER_CANNOT_EDIT' => 'You cannot edit posts in this forum', 'USER_CANNOT_REPLY' => 'You cannot reply in this forum', 'USER_CANNOT_FORUM_POST' => 'You are not able to do posting operations on this forum due to the forum type not supporting it.', - 'USERNAME_DISALLOWED' => 'The username you entered has been banned.', - 'USERNAME_TAKEN' => 'The username you entered is already in use, please select an alternative.', 'VIEW_MESSAGE' => '%sView your submitted message%s', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 86989497c0..d64397f742 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -401,36 +401,37 @@ $lang = array_merge($lang, array( 'UCP_JABBER' => 'Jabber address', 'UCP_MAIN' => 'Overview', - 'UCP_MAIN_BOOKMARKS' => 'Bookmarks', - 'UCP_MAIN_DRAFTS' => 'Saved drafts', + 'UCP_MAIN_ATTACHMENTS' => 'Manage attachments', + 'UCP_MAIN_BOOKMARKS' => 'Manage bookmarks', + 'UCP_MAIN_DRAFTS' => 'Manage drafts', 'UCP_MAIN_FRONT' => 'Front page', - 'UCP_MAIN_SUBSCRIBED' => 'Subscribed', + 'UCP_MAIN_SUBSCRIBED' => 'Manage subscriptions', 'UCP_MSNM' => 'MSN Messenger', 'UCP_NO_ATTACHMENTS' => 'You have posted no files', 'UCP_PREFS' => 'Forum preferences', - 'UCP_PREFS_PERSONAL' => 'Personal settings', - 'UCP_PREFS_POST' => 'Posting messages', - 'UCP_PREFS_VIEW' => 'Viewing posts', + 'UCP_PREFS_PERSONAL' => 'Edit global settings', + 'UCP_PREFS_POST' => 'Edit posting defaults', + 'UCP_PREFS_VIEW' => 'Edit display options', 'UCP_PM' => 'Private messages', 'UCP_PM_COMPOSE' => 'Compose message', - 'UCP_PM_DRAFTS' => 'PM drafts', - 'UCP_PM_OPTIONS' => 'Options', + 'UCP_PM_DRAFTS' => 'Manage PM drafts', + 'UCP_PM_OPTIONS' => 'Edit options', 'UCP_PM_POPUP' => 'Private messages', 'UCP_PM_POPUP_TITLE' => 'Private message popup', 'UCP_PM_UNREAD' => 'Unread messages', 'UCP_PM_VIEW' => 'View messages', 'UCP_PROFILE' => 'Profile', - 'UCP_PROFILE_AVATAR' => 'Your avatar', - 'UCP_PROFILE_PROFILE_INFO' => 'Your profile', - 'UCP_PROFILE_REG_DETAILS' => 'Registration details', - 'UCP_PROFILE_SIGNATURE' => 'Your signature', + 'UCP_PROFILE_AVATAR' => 'Edit avatar', + 'UCP_PROFILE_PROFILE_INFO' => 'Edit profile', + 'UCP_PROFILE_REG_DETAILS' => 'Edit account settings', + 'UCP_PROFILE_SIGNATURE' => 'Edit signature', 'UCP_USERGROUPS' => 'Usergroups', - 'UCP_USERGROUPS_MEMBER' => 'Memberships', + 'UCP_USERGROUPS_MEMBER' => 'Edit memberships', 'UCP_USERGROUPS_MANAGE' => 'Manage groups', 'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.', @@ -438,9 +439,9 @@ $lang = array_merge($lang, array( 'UCP_RESEND' => 'Send activation email', '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', + 'UCP_ZEBRA' => 'Friends & Foes', + 'UCP_ZEBRA_FOES' => 'Manage foes', + 'UCP_ZEBRA_FRIENDS' => 'Manage friends', 'UNKNOWN_FOLDER' => 'Unknown folder', 'UNWATCH_MARKED' => 'Unwatch marked', 'UPLOAD_AVATAR_FILE' => 'Upload from your machine', |