Changed $board_config to $config, more posting "stuff", altered polling code in viewtopic and loads of new problems, poor coding, etc. created :)

git-svn-id: file:///svn/phpbb/trunk@2983 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/language/en/lang_admin.php

@@ -24,13 +24,14 @@ $lang = array_merge($lang, array(
 	'No_admin' => 'You are not authorised to administer this board',
 	'No_frames' => 'Sorry, your browser does not support frames',
 	'Return_to' => 'Return to ...',
-	'General_cat' => 'General Admin',
 	'DB_cat' => 'Database Admin',
-	'Users_cat' => 'User Admin',
-	'Groups_cat' => 'Group Admin',
 	'Forums_cat' => 'Forum Admin',
-	'Styles_cat' => 'Styles Admin',
+	'General_cat' => 'General Admin',
+	'Groups_cat' => 'Group Admin',
 	'Log_cat' => 'Log Admin',
+	'Posts_cat' => 'Posting Admin',
+	'Styles_cat' => 'Styles Admin',
+	'Users_cat' => 'User Admin',
 	'Avatar_settings' => 'Avatar Settings',
 	'Cookie_settings' => 'Cookie Settings',
 	'Board_defaults' => 'Board Defaults',
@@ -45,6 +46,7 @@ $lang = array_merge($lang, array(
 	'Mass_Email' => 'Mass Email',
 	'Ranks' => 'Ranks',
 	'Smilies' => 'Smilies',
+	'Topic_icons' => 'Topic Icons',
 	'Ban_users' => 'Ban Usernames',
 	'Ban_emails' => 'Ban Emails',
 	'Ban_ips' => 'Ban IPs',

phpBB/language/en/lang_main.php

@@ -300,10 +300,8 @@ $lang = array_merge($lang, array(
 	'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_option' => 'Poll option',
-	'Add_option' => 'Add option',
-	'Update' => 'Update',
-	'Delete' => 'Delete',
+	'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' => 'Run poll for',
 	'Days' => 'Days',
 	'Poll_for_explain' => '[ Enter 0 or leave blank for a never ending poll ]',