diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 9d1146c13b..2262f5e4be 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -52,6 +52,7 @@ $lang = array_merge($lang, array(
'ADMINISTRATOR' => 'Administrator',
'ADMINISTRATORS' => 'Administrators',
'AGE' => 'Age',
+ 'AIM' => 'AIM',
'ALLOWED' => 'Allowed',
'ALL_FILES' => 'All files',
'ALL_FORUMS' => 'All forums',
@@ -141,6 +142,7 @@ $lang = array_merge($lang, array(
'ERR_CONNECTING_SERVER' => 'Error connecting to the server',
'ERR_UNABLE_TO_LOGIN' => 'Error on login. Supplied username or password wrong.',
'ERR_WRONG_PATH_TO_PHPBB' => 'The phpBB path entered seems to be not valid.',
+ 'EXPAND_VIEW' => 'Expand view',
'EXTENSION' => 'Extension',
'EXTENSION_DISABLED_AFTER_POSTING' => 'The extension %s has been deactivated and can no longer be displayed',
@@ -226,7 +228,8 @@ $lang = array_merge($lang, array(
'HOURS' => 'Hours',
'HOME' => 'Home',
- 'ICQ_STATUS' => 'ICQ status',
+ 'ICQ' => 'ICQ',
+ 'ICQ_STATUS' => 'ICQ status',
'IF' => 'if',
'IMAGE' => 'Image',
'IN' => 'in',
@@ -237,6 +240,7 @@ $lang = array_merge($lang, array(
'INVALID_EMAIL_LOG' => '%s possibly an invalid email address?',
'IP' => 'IP',
+ 'JABBER' => 'Jabber',
'JOINED' => 'Joined',
'JUMP_PAGE' => 'Enter the page number you wish to go to',
'JUMP_TO' => 'Jump to',
@@ -251,7 +255,7 @@ $lang = array_merge($lang, array(
'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server',
'LEGEND' => 'Legend',
'LOCATION' => 'Location',
- 'LOCK_POST' => 'Lock Post',
+ 'LOCK_POST' => 'Lock post',
'LOCK_POST_EXPLAIN' => 'Prevent editing',
'LOCK_TOPIC' => 'Lock topic',
'LOGIN' => 'Login',
@@ -432,8 +436,10 @@ $lang = array_merge($lang, array(
'SEARCHING_FORUMS' => 'Searching forums',
'SEARCH_ACTIVE_TOPICS' => 'View active topics',
'SEARCH_FOR' => 'Search for',
+ 'SEARCH_FORUM' => 'Search this forum',
'SEARCH_NEW' => 'View new posts',
'SEARCH_SELF' => 'View your posts',
+ 'SEARCH_TOPIC' => 'Search this topic',
'SEARCH_UNANSWERED' => 'View unanswered posts',
'SECONDS' => 'Seconds',
'SELECT' => 'Select',
@@ -589,6 +595,7 @@ $lang = array_merge($lang, array(
'YEAR' => 'Year',
'YES' => 'Yes',
+ 'YIM' => 'YIM',
'YOU_LAST_VISIT' => 'Last visit was: %s',
'YOU_NEW_PM' => 'A new private message is waiting for you in your Inbox',
'YOU_NEW_PMS' => 'New private messages are waiting for you in your Inbox',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 37f937edda..f5ff5f75a1 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -34,8 +34,7 @@ $lang = array_merge($lang, array(
'ACTIVE_IN_TOPIC' => 'Most active topic',
'ADD_FOE' => 'Add foe',
'ADD_FRIEND' => 'Add friend',
- 'AFTER' => 'After',
- 'AIM' => 'AIM',
+ 'AFTER' => 'After',
'BEFORE' => 'Before',
@@ -62,7 +61,6 @@ $lang = array_merge($lang, array(
'HIDE_MEMBER_SEARCH' => 'Hide member search',
- 'ICQ' => 'ICQ',
'IM_ADD_CONTACT' => 'Add Contact',
'IM_AIM' => 'Please note that you need AOL Instant Messenger installed to use this.',
'IM_AIM_EXPRESS' => 'AIM Express',
@@ -80,8 +78,6 @@ $lang = array_merge($lang, array(
'IM_SENT_JABBER' => 'Your message to %1$s has been sent successfully.',
'IM_USER' => 'Send an instant message',
- 'JABBER' => 'Jabber',
-
'LAST_ACTIVE' => 'Last active',
'LESS_THAN' => 'Less than',
'LIST_USER' => '1 user',
@@ -124,8 +120,6 @@ $lang = array_merge($lang, array(
'VISITED' => 'Last visited',
'WWW' => 'Website',
-
- 'YIM' => 'YIM',
));
?>
\ No newline at end of file
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 518b3ec672..f041460da6 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -29,7 +29,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(
- 'ADD_ATTACHMENT' => 'Attachment uploading',
+ 'ADD_ATTACHMENT' => 'Upload attachment',
'ADD_ATTACHMENT_EXPLAIN' => 'If you wish to attach one or more files enter the details below',
'ADD_FILE' => 'Add the file',
'ADD_POLL' => 'Poll creation',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index c82ea44678..c4ab86796a 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -70,6 +70,7 @@ $lang = array_merge($lang, array(
'NO_OLDER_TOPICS' => 'There are no older topics in this forum',
'NO_UNREAD_POSTS' => 'There are no new unread posts for this topic.',
'NO_VOTE_OPTION' => 'You must specify an option when voting.',
+ 'NO_VOTES' => 'No votes',
'POLL_ENDED_AT' => 'Poll ended at %s',
'POLL_RUN_TILL' => 'Poll runs till %s',