diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index fe753c50ac..183f465a98 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -93,7 +93,6 @@ $lang = array_merge($lang, array( 'BROWSING_FORUM_GUEST' => 'Users browsing this forum: %1$s and %2$d guest', 'BROWSING_FORUM_GUESTS' => 'Users browsing this forum: %1$s and %2$d guests', 'BYTES' => 'Bytes', - 'BY' => 'by', 'CANCEL' => 'Cancel', 'CHANGE' => 'Change', @@ -336,7 +335,6 @@ $lang = array_merge($lang, array( 'OCCUPATION' => 'Occupation', 'OFFLINE' => 'Offline', - 'ON' => 'On', 'ONLINE' => 'Online', 'ONLINE_BUDDIES' => 'Online Buddies', 'ONLINE_USERS_TOTAL' => 'In total there are %d users online :: ', @@ -352,8 +350,11 @@ $lang = array_merge($lang, array( 'POST_ANNOUNCEMENT' => 'Announce', 'POST_STICKY' => 'Sticky', 'POSTED' => 'Posted', + 'POSTED_IN_FORUM' => 'in', + 'POSTED_ON_DATE' => 'on', 'POSTS' => 'Posts', 'POSTS_UNAPPROVED' => 'At least one post in this topic has not been approved', + 'POST_BY_AUTHOR' => 'by', 'POST_BY_FOE' => 'This post was made by %1$s who is currently on your ignore list. %2$sDisplay this post%3$s.', 'POST_DAY' => '%.2f posts per day', 'POST_DETAILS' => 'Post details', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 294864c3d1..635c2e2a9c 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -233,6 +233,8 @@ $lang = array_merge($lang, array( 'READ_WARNINGS' => 'User warnings', 'REPORTER' => 'Reporter', 'REPORTED' => 'Reported', + 'REPORTED_BY' => 'Reported by', + 'REPORTED_ON_DATE' => 'on', 'REPORTS_CLOSED_SUCCESS' => 'The selected reports have been closed successfully.', 'REPORTS_DELETED_SUCCESS' => 'The selected reports have been deleted successfully.', 'REPORTS_TOTAL' => 'In total there are %d reports to review', @@ -257,6 +259,7 @@ $lang = array_merge($lang, array( 'RETURN_QUEUE' => '%sReturn to the queue%s', 'RETURN_REPORTS' => '%sReturn to the reports%s', + 'SEARCH_POSTS_BY_USER' => 'Search posts by', 'SELECT_ACTION' => 'Select desired action', 'SELECT_TOPIC' => 'Select topic', 'SELECT_USER' => 'Select user', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index cbfea1bc6f..230fde09c7 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -237,11 +237,14 @@ $lang = array_merge($lang, array( 'MARK_IMPORTANT' => 'Mark as important', 'MARKED_MESSAGE' => 'Marked message', 'MAX_FOLDER_REACHED' => 'Maximum number of allowed user defined folder reached', + 'MESSAGE_BY_AUTHOR' => 'by', 'MESSAGE_COLOURS' => 'Message colours', 'MESSAGE_DELETED' => 'Message successfully deleted', 'MESSAGE_HISTORY' => 'Message history', 'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message has been removed by it\'s author before it was delivered', + 'MESSAGE_SENT_ON' => 'on', 'MESSAGE_STORED' => 'Your message has been sent successfully', + 'MESSAGE_TO' => 'To', 'MESSAGES_DELETED' => 'Messages successfully deleted', 'MOVE_DELETED_MESSAGES_TO' => 'Move messages from removed folder to', 'MOVE_DOWN' => 'Move down', @@ -344,7 +347,6 @@ $lang = array_merge($lang, array( 'REMOVE_FOLDER_CONFIRM' => 'Are you sure you want to remove this folder?', 'RENAME' => 'Rename', 'RENAME_FOLDER' => 'Rename folder', - 'REPLIED_MESSAGE' => 'Replied to message', 'RETURN_FOLDER' => '%1$sReturn to previous folder%2$s', 'RETURN_UCP' => '%sReturn to the User Control Panel%s', 'RULE_ADDED' => 'Rule successfully added', @@ -511,11 +513,6 @@ $lang = array_merge($lang, array( 'NO_MEMBER' => 'No group memberships', 'NO_PENDING' => 'No pending memberships', 'NO_NONMEMBER' => 'No non-member groups', - - 'QUIT_ALL' => 'Quit all', - 'QUIT_MARKED' => 'Quit marked', - 'JOIN_ALL' => 'Join all', - 'JOIN_MARKED' => 'Join marked', )); ?> \ No newline at end of file