diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php
index 4a8a5265f9..762b22a5eb 100644
--- a/phpBB/language/en/lang_main.php
+++ b/phpBB/language/en/lang_main.php
@@ -26,18 +26,18 @@ $lang = array_merge($lang, array(
 	'RIGHT' => 'right',
 	'DATE_FORMAT' => 'd M Y',
 
-	'Forum' => 'Forum',
+	'FORUM' => 'Forum',
 	'Subforum' => 'Subforum',
 	'Subforums' => 'Subforums',
 	'Category' => 'Category',
-	'Topic' => 'Topic',
-	'Topics' => 'Topics',
-	'Replies' => 'Replies',
-	'Views' => 'Views',
-	'Post' => 'Post',
-	'Posts' => 'Posts',
+	'TOPIC' => 'Topic',
+	'TOPICS' => 'Topics',
+	'REPLIES' => 'Replies',
+	'VIEWS' => 'Views',
+	'POST' => 'Post',
+	'POSTS' => 'Posts',
 	'Posted' => 'Posted',
-	'Rating' => 'Rating',
+	'RATING' => 'Rating',
 	'USERNAME' => 'Username',
 	'PASSWORD' => 'Password',
 	'Email' => 'Email',
@@ -136,8 +136,8 @@ $lang = array_merge($lang, array(
 	'FAQ' => 'FAQ',
 	'BBCode_guide' => 'BBCode Guide',
 	'Usergroups' => 'Groups',
-	'Last_Post' => 'Last Post',
-	'Moderator' => 'Moderator',
+	'LAST_POST' => 'Last Post',
+	'MODERATOR' => 'Moderator',
 	'MODERATORS' => 'Moderators',
 	'VIEW_MODERATORS' => 'List forum moderators',
 	'New_pms' => '<b>%d</b> new messages',
@@ -157,14 +157,16 @@ $lang = array_merge($lang, array(
 	'Registered_user_total' => 'We have <b>%d</b> registered user',
 	'Newest_user' => 'The newest registered user is <b>%s%s%s</b>',
 	'No_new_posts_last_visit' => 'No new posts since your last visit',
-	'No_new_posts' => 'No new posts',
-	'New_posts' => 'New posts',
-	'New_post' => 'New post',
-	'No_new_posts_hot' => 'No new posts [ Popular ]',
-	'New_posts_hot' => 'New posts [ Popular ]',
-	'No_new_posts_locked' => 'No new posts [ Locked ]',
-	'New_posts_locked' => 'New posts [ Locked ]',
-	'Forum_is_locked' => 'Forum is locked',
+	'NO_NEW_POSTS' => 'No new posts',
+	'NEW_POSTS' => 'New posts',
+	'NEW_POST' => 'New post',
+	'NO_NEW_POSTS_HOT' => 'No new posts [ Popular ]',
+	'NEW_POSTS_HOT' => 'New posts [ Popular ]',
+	'NO_NEW_POSTS_LOCKED' => 'No new posts [ Locked ]',
+	'NEW_POSTS_LOCKED' => 'New posts [ Locked ]',
+	'POST_STICKY' 	=> 'Sticky',
+	'POST_ANNOUNCEMENT' => 'Announcement',
+	'FORUM_LOCKED' => 'Forum is locked',
 	'Enter_password' => 'Please enter your username and password to login',
 	'LOGIN' => 'Login',
 	'LOGOUT' => 'Logout',
@@ -268,8 +270,6 @@ $lang = array_merge($lang, array(
 	'EDIT_POST' 	=> 'Edit post',
 	'OPTIONS' 		=> 'Options',
 	'POST_NORMAL' 	=> 'Normal',
-	'POST_STICKY' 	=> 'Sticky',
-	'POST_ANNOUNCEMENT' => 'Announcement',
 	'CONFIRM_DELETE' => 'Are you sure you want to delete this post?',
 	'Confirm_delete_poll' => 'Are you sure you want to delete this poll?',
 	'Cannot_edit_time' => 'You can no longer edit or delete that post',
@@ -540,9 +540,9 @@ $lang = array_merge($lang, array(
 	'Email_sent' => 'The email has been sent',
 	'Empty_subject_email' => 'You must specify a subject for the email',
 	'Empty_message_email' => 'You must enter a message to be emailed',
-	'Select_sort_method' => 'Select sort method',
+
+	'SELECT_SORT_METHOD' => 'Select sort method',
 	'Sort' => 'Sort',
-	'Sort_Top_Ten' => 'Top Ten Posters',
 	'Sort_Joined' => 'Joined Date',
 	'Sort_Username' => 'Username',
 	'Sort_Location' => 'Location',
@@ -552,6 +552,7 @@ $lang = array_merge($lang, array(
 	'Sort_Ascending' => 'Ascending',
 	'Sort_Descending' => 'Descending',
 	'Order' => 'Order',
+
 	'Group_Control_Panel' => 'Group Control Panel',
 	'Group_member_details' => 'Group Membership Details',
 	'Group_member_join' => 'Join a Group',