diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php
index 1559b468e1..b6c0524d95 100644
--- a/phpBB/language/en/lang_main.php
+++ b/phpBB/language/en/lang_main.php
@@ -58,13 +58,13 @@ $lang = array_merge($lang, array(
 	'Post_time' => 'Post time',
 	'Go' => 'Go',
 	'Jump_to' => 'Jump to',
-	'Submit' => 'Submit',
+	'SUBMIT' => 'Submit',
 	'Reset' => 'Reset',
 	'Cancel' => 'Cancel',
-	'Preview' => 'Preview',
+	'PREVIEW' => 'Preview',
 	'Confirm' => 'Confirm',
 	'Delete' => 'Delete',
-	'Spellcheck' => 'Spellcheck',
+	'SPELLCHECK' => 'Spellcheck',
 	'Yes' => 'Yes',
 	'No' => 'No',
 	'Enabled' => 'Enabled',
@@ -232,8 +232,8 @@ $lang = array_merge($lang, array(
 	'ICQ_status' => 'ICQ Status',
 	'Edit_delete_post' => 'Edit/Delete this post',
 	'View_IP' => 'View IP of poster',
-	'Delete_post' => 'Delete this post',
-	'Delete_post_warn' => 'Once deleted the post cannot be recovered',
+	'DELETE_POST' => 'Delete this post',
+	'DELETE_POST_WARN' => 'Once deleted the post cannot be recovered',
 	'wrote' => 'wrote',
 	'Quote' => 'Quote',
 	'Code' => 'Code',
@@ -257,7 +257,7 @@ $lang = array_merge($lang, array(
 	'Quite_good' => 'Quite Good',
 	'Very_good' => 'Very Good',
 	'Total_votes' => 'Total Votes',
-	'Message_body' => 'Message body',
+	'MESSAGE_BODY' => 'Message body',
 	'Message_body_explain' => 'Enter your message here, it may contain no more than <b>%d</b> characters.',
 	'Topic_review' => 'Topic review',
 	'Topic_icon' => 'Topic icon',
@@ -266,7 +266,7 @@ $lang = array_merge($lang, array(
 	'Post_a_reply' => 'Post a reply',
 	'Post_topic_as' => 'Post topic as',
 	'Edit_Post' => 'Edit post',
-	'Options' => 'Options',
+	'OPTIONS' => 'Options',
 	'Post_Announcement' => 'Announcement',
 	'Post_Sticky' => 'Sticky',
 	'Post_Normal' => 'Normal',
@@ -276,7 +276,7 @@ $lang = array_merge($lang, array(
 	'Flood_Error' => 'You cannot make another post so soon after your last, please try again in a short while',
 	'Empty_subject' => 'You must specify a subject when posting a new topic',
 	'To_long_subject' => 'The subject is too long it must be 60 characters or less',
-	'Empty_message' => 'You must enter a message when posting',
+	'EMPTY_MESSAGE' => 'You must enter a message when posting',
 	'Too_few_chars' => 'Your message contains too few characters',
 	'Too_many_chars' => 'Your message contains too many characters',
 	'Too_many_smilies' => 'Your message contains too many emoticons',
@@ -330,37 +330,37 @@ $lang = array_merge($lang, array(
 	'Images_are_OFF' => '[img] is <u>OFF</u>',
 	'Flash_is_ON' => '[flash] is <u>ON</u>',
 	'Flash_is_OFF' => '[flash] is <u>ON</u>',
-	'Attach_signature' => 'Attach signature (signatures can be changed in profile)',
-	'Notify' => 'Notify me when a reply is posted',
-	'Save' => 'Save',
+	'ATTACH_SIG' => 'Attach signature (signatures can be changed in profile)',
+	'NOTIFY_REPLY' => 'Notify me when a reply is posted',
+	'SAVE' => 'Save',
 	'Stored' => 'Your message has been entered successfully',
 	'Deleted' => 'Your message has been deleted successfully',
 	'Poll_delete' => 'Your poll has been deleted successfully',
 	'Vote_cast' => 'Your vote has been cast',
 	'Topic_reply_notification' => 'Topic Reply Notification',
-	'bbcode_b_help' => 'Bold text: [b]text[/b]  (alt+b)',
-	'bbcode_i_help' => 'Italic text: [i]text[/i]  (alt+i)',
-	'bbcode_u_help' => 'Underline text: [u]text[/u]  (alt+u)',
-	'bbcode_q_help' => 'Quote text: [quote]text[/quote]  (alt+q)',
-	'bbcode_c_help' => 'Code display: [code]code[/code]  (alt+c)',
-	'bbcode_l_help' => 'List: [list]text[/list] (alt+l)',
-	'bbcode_o_help' => 'Ordered list: [list=]text[/list]  (alt+o)',
-	'bbcode_p_help' => 'Insert image: [img]http://image_url[/img]  (alt+p)',
-	'bbcode_w_help' => 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)',
-	'bbcode_a_help' => 'Close all open bbCode tags',
-	'bbcode_s_help' => 'Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000',
-	'bbcode_f_help' => 'Font size: [size=x-small]small text[/size]',
+	'BBCODE_B_HELP' => 'Bold text: [b]text[/b]  (alt+b)',
+	'BBCODE_I_HELP' => 'Italic text: [i]text[/i]  (alt+i)',
+	'BBCODE_U_HELP' => 'Underline text: [u]text[/u]  (alt+u)',
+	'BBCODE_Q_HELP' => 'Quote text: [quote]text[/quote]  (alt+q)',
+	'BBCODE_C_HELP' => 'Code display: [code]code[/code]  (alt+c)',
+	'BBCODE_L_HELP' => 'List: [list]text[/list] (alt+l)',
+	'BBCODE_O_HELP' => 'Ordered list: [list=]text[/list]  (alt+o)',
+	'BBCODE_P_HELP' => 'Insert image: [img]http://image_url[/img]  (alt+p)',
+	'BBCODE_W_HELP' => 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)',
+	'BBCODE_A_HELP' => 'Close all open bbCode tags',
+	'BBCODE_S_HELP' => 'Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000',
+	'BBCODE_F_HELP' => 'Font size: [size=x-small]small text[/size]',
 	'Emoticons' => 'Emoticons',
 	'More_emoticons' => 'View more Emoticons',
-	'Font_color' => 'Font color',
-	'Font_size' => 'Font size',
-	'font_tiny' => 'Tiny',
-	'font_small' => 'Small',
-	'font_normal' => 'Normal',
-	'font_large' => 'Large',
-	'font_huge' => 'Huge',
-	'Close_Tags' => 'Close Tags',
-	'Styles_tip' => 'Tip: Styles can be applied quickly to selected text',
+	'FONT_COLOR' => 'Font color',
+	'FONT_SIZE' => 'Font size',
+	'FONT_TINY' => 'Tiny',
+	'FONT_SMALL' => 'Small',
+	'FONT_NORMAL' => 'Normal',
+	'FONT_LARGE' => 'Large',
+	'FONT_HUGE' => 'Huge',
+	'CLOSE_TAGS' => 'Close Tags',
+	'STYLES_TIP' => 'Tip: Styles can be applied quickly to selected text',
 	'Private_Messaging' => 'Private Messaging',
 	'Unread_message' => 'Unread message',
 	'Read_message' => 'Read message',