diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php
index d7d5647879..5fcb6d94f0 100644
--- a/phpBB/language/en/lang_main.php
+++ b/phpBB/language/en/lang_main.php
@@ -344,12 +344,20 @@ $lang = array(
 	'NOT_WATCHING_TOPIC'	=> 'You are no longer watching this topic',
 	'NOW_WATCHING_TOPIC'	=> 'You are now watching this topic',
 
-	'TOTAL_VOTES'	=> 'Total Votes',
-	'VIEW_RESULTS'	=> 'View Results',
+	'ALREADY_VOTED'			=> 'You have already voted in this poll and may not change your selection.',
+	'NO_VOTE_OPTION'		=> 'You must specify an option when voting.', 
+	'TOO_MANY_VOTE_OPTIONS'	=> 'You have tried to vote for too many options.', 
+	'SUBMIT_VOTE'			=> 'Submit Vote', 
+	'MAX_OPTION_SELECT'		=> 'You may select <b>1</b> option', 
+	'MAX_OPTIONS_SELECT'	=> 'You may select up to <b>%d</b> options', 
+	'TOTAL_VOTES'			=> 'Total Votes',
+	'VIEW_RESULTS'			=> 'View Results',
+	'POLL_VOTED_OPTION'		=> 'You voted for this option', 
 
 	'VIEW_TOPIC_POST'	=> '1 Post',
 	'VIEW_TOPIC_POSTS'	=> '%d Posts',
 
+
 	'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',
@@ -383,9 +391,6 @@ $lang = array(
 	'TOO_MANY_SMILIES' => 'Your message contains too many emoticons',
 	'Forum_locked' => 'This forum is locked you cannot post, reply to or edit topics',
 	'Topic_locked' => 'This topic is locked you cannot edit posts or make replies',
-	'No_post_id' => 'No post ID was specified',
-	'No_topic_id' => 'You must select a topic to reply to',
-	'No_valid_mode' => 'You can only post, reply edit or quote messages, please return and try again',
 
 	'USER_CANNOT_POST' => 'You cannot post in this forum',
 	'USER_CANNOT_REPLY' => 'You cannot reply in this forum',
@@ -397,22 +402,17 @@ $lang = array(
 	'EDIT_OWN_POSTS' => 'Sorry but you can only edit your own posts',
 	'DELETE_OWN_POSTS' => 'Sorry but you can only delete your own posts',
 	'ALREADY_DELETED' => 'Sorry but this message is already deleted',
-	
-	'No_such_post' => 'There is no such post, please return and try again',
-	'Empty_poll_title' => 'You must enter a title for your poll',
-	'TOO_FEW_POLL_OPTIONS' => 'You must enter at least two poll options',
-	'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options',
-	'NO_DELETE_POLL_OPTIONS' => 'You cannot delete existing poll options',
-	'Post_has_no_poll' => 'This post has no poll',
-	'Already_voted' => 'You have already voted in this poll',
-	'No_vote_option' => 'You must specify an option when voting',
-	'ADD_POLL' => 'Add a Poll',
-	'ADD_POLL_EXPLAIN' => 'If you do not want to add a poll to your topic leave the fields blank',
-	'POLL_QUESTION' => 'Poll question',
-	'POLL_OPTIONS' => 'Poll options',
-	'POLL_OPTIONS_EXPLAIN' => 'Place each option on a new line. You may enter up to <b>%d</b> options',
-	'POLL_FOR_EXPLAIN' => '[ Enter 0 or leave blank for a never ending poll ]',
-	'POLL_FOR' => 'Run poll for',
+	'No_such_post'		=> 'There is no such post, please return and try again',
+
+	'ADD_POLL'				=> 'Add a Poll',
+	'ADD_POLL_EXPLAIN'		=> 'If you do not want to add a poll to your topic leave the fields blank',
+	'POLL_QUESTION'			=> 'Poll question',
+	'POLL_OPTIONS'			=> 'Poll options',
+	'POLL_OPTIONS_EXPLAIN'	=> 'Place each option on a new line. You may enter up to <b>%d</b> options',
+	'POLL_FOR_EXPLAIN'		=> '[ Enter 0 or leave blank for a never ending poll ]', 
+	'POLL_MAX_OPTIONS'		=> 'Options per user', 
+	'POLL_MAX_OPTIONS_EXPLAIN'	=> 'This is the number of options each user may select when voting.', 
+	'POLL_FOR'				=> 'Run poll for',
 	'DAYS' => 'Days',
 	'POLL_DELETE' => 'Delete Poll',
 	'ADD_ATTACHMENT' => 'Add an Attachment',
@@ -472,6 +472,10 @@ $lang = array(
 	'CLOSE_WINDOW' 	=> 'Close Window',
 	'Topic_reply_notification' => 'Topic Reply Notification',
 
+	'TOO_FEW_POLL_OPTIONS'	=> 'You must enter at least two poll options',
+	'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options',
+	'NO_DELETE_POLL_OPTIONS'=> 'You cannot delete existing poll options',
+
 	'GENERAL_UPLOAD_ERROR'	=> 'Upload Error: Could not upload Attachment to %s',
 	'TOO_MANY_ATTACHMENTS'	=> 'Attachment cannot be added, since the max. number of %d Attachments in this post was achieved',
 	'INVALID_FILENAME'		=> '%s is an invalid filename',