diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php
index 5d463c389a..155c136c00 100644
--- a/phpBB/language/en/lang_main.php
+++ b/phpBB/language/en/lang_main.php
@@ -36,36 +36,37 @@ $lang = array_merge($lang, array(
 	'RIGHT'			=> 'right',
 	'DATE_FORMAT'	=> 'd M Y',
 
-	'FORUM' => 'Forum',
-	'SUBFORUM' => 'Subforum',
-	'SUBFORUMS' => 'Subforums',
-	'TOPIC' => 'Topic',
-	'TOPICS' => 'Topics',
-	'REPLIES' => 'Replies',
-	'VIEWS' => 'Views',
-	'POST' => 'Post',
-	'POSTS' => 'Posts',
-	'POSTED' => 'Posted',
-	'RATING' => 'Rating',
-	'USERNAME' => 'Username',
-	'PASSWORD' => 'Password',
-	'EMAIL' => 'Email',
-	'POSTER' => 'Poster',
-	'AUTHOR' => 'Author',
-	'TIME' => 'Time',
-	'HOURS' => 'Hours',
-	'MESSAGE' => 'Message',
-	'POST_TIME' => 'Post time',
+	'FORUM'			=> 'Forum',
+	'SUBFORUM'		=> 'Subforum',
+	'SUBFORUMS'		=> 'Subforums',
+	'TOPIC'			=> 'Topic',
+	'TOPICS'		=> 'Topics',
+	'REPLIES'		=> 'Replies',
+	'VIEWS'			=> 'Views',
+	'POST'			=> 'Post',
+	'POSTS'			=> 'Posts',
+	'ANNOUNCEMENTS'	=> 'Announcements', 
+	'POSTED'		=> 'Posted',
+	'RATING'		=> 'Rating',
+	'USERNAME'		=> 'Username',
+	'PASSWORD'		=> 'Password',
+	'EMAIL'			=> 'Email',
+	'POSTER'		=> 'Poster',
+	'AUTHOR'		=> 'Author',
+	'TIME'			=> 'Time',
+	'HOURS'			=> 'Hours',
+	'MESSAGE'		=> 'Message',
+	'POST_TIME'		=> 'Post time',
 
-	'1_DAY' => '1 Day',
-	'7_DAYS' => '7 Days',
-	'2_WEEKS' => '2 Weeks',
-	'1_MONTH' => '1 Month',
-	'3_MONTHS' => '3 Months',
-	'6_MONTHS' => '6 Months',
-	'1_YEAR' => '1 Year',
+	'1_DAY'		=> '1 Day',
+	'7_DAYS'	=> '7 Days',
+	'2_WEEKS'	=> '2 Weeks',
+	'1_MONTH'	=> '1 Month',
+	'3_MONTHS'	=> '3 Months',
+	'6_MONTHS'	=> '6 Months',
+	'1_YEAR'	=> '1 Year',
 	'ASCENDING' => 'Ascending',
-	'DESCENDING' => 'Descending',
+	'DESCENDING'=> 'Descending',
 
 	'GO' => 'Go',
 	'JUMP_TO' => 'Jump to',
@@ -108,8 +109,7 @@ $lang = array_merge($lang, array(
 	'RETURN_LOGIN'	=> 'Click %sHere%s to try again',
 	'RETURN_MCP'	=> 'Click %sHere%s to return to the Moderator Control Panel',
 	'RETURN_GROUP'	=> 'Click %sHere%s to return to the Group Control Panel',
-
-	'Click_view_message' => 'Click %sHere%s to view your message',
+	'VIEW_MESSAGE'	=> 'Click %sHere%s to view your message',
 
 
 	'BOARD_DISABLE'		=> 'Sorry but this board is currently unavailable',
@@ -189,7 +189,7 @@ $lang = array_merge($lang, array(
 	'NO_NEW_POSTS_LOCKED' => 'No new posts [ Locked ]',
 	'NEW_POSTS_LOCKED' => 'New posts [ Locked ]',
 
-	'POST_STICKY' 	=> 'Sticky',
+	'POST_STICKY' 		=> 'Sticky',
 	'POST_ANNOUNCEMENT' => 'Announcement',
 	'POST_FORUM_LOCKED' => 'Forum is locked',
 	'POST_TOPIC_LOCKED' => 'Topic is locked', 
@@ -202,22 +202,21 @@ $lang = array_merge($lang, array(
 	'LOG_ME_IN' => 'Log me on automatically each visit',
 	'Error_login' => 'You have specified an incorrect or inactive username or an invalid password',
 	'Index' => 'Index',
-	'No_Posts' => 'No Posts',
-	'NO_FORUMS' => 'This board has no forums',
-	'NO_FORUM' => 'The forum you selected does not exist',
+
 	'Private_Message' => 'Private Message',
 	'Private_Messages' => 'Private Messages',
 	'WHO_IS_ONLINE' => 'Who is Online',
 	'MARK_FORUMS_READ' => 'Mark all forums read',
 	'Forums_marked_read' => 'All forums have been marked read',
 	'View_forum' => 'View Forum',
-	'Reached_on_error' => 'You have reached this page in error',
 	'DISPLAY_TOPICS' => 'Display topics from previous',
 	'ALL_TOPICS' => 'All Topics',
-	'Topic_Announcement' => '<b>Announcement:</b>',
-	'Topic_Sticky' => '<b>Sticky:</b>',
-	'Topic_Moved' => '<b>Moved:</b>',
-	'Topic_Poll' => '<b>[ Poll ]</b>',
+
+	'TOPIC_ANNOUNCEMENT' => '<b>Announcement:</b>',
+	'TOPIC_STICKY' => '<b>Sticky:</b>',
+	'TOPIC_MOVED' => '<b>Moved:</b>',
+	'TOPIC_POLL' => '<b>[ Poll ]</b>',
+
 	'MARK_TOPICS_READ' => 'Mark all topics read',
 	'Topics_marked_read' => 'The topics for this forum have now been marked read',
 
@@ -243,11 +242,13 @@ $lang = array_merge($lang, array(
 	'MCP' => '[ %sModerator Control Panel%s ]',
 
 	'NO_MODE'	=> 'No mode specified.', 
-	'NO_TOPICS'	=> 'There are no posts in this forum<br />Click on the <b>Post New Topic</b> link on this page to post one.', 
+	'NO_FORUMS' => 'This board has no forums',
+	'NO_FORUM'	=> 'The forum you selected does not exist',
+	'NO_TOPICS'	=> 'There are no topics or posts in this forum.', 
 	'NO_TOPIC'	=> 'The requested topic does not exist.', 
+	'NO_POSTS'	=> 'No Posts were found.',
 	'NO_POST'	=> 'The requested post does not exist.', 
 
-
 	'Stop_watching_forum' => 'Stop watching this forum',
 	'Start_watching_forum' => 'Watch this forum for new posts',
 	'No_longer_watching_forum' => 'You are no longer watching this forum',