1 files changed, 16 insertions, 10 deletions
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index c56a09d0f3..eebdd1926a 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -426,8 +426,8 @@ $lang = array_merge($lang, array(
 	'Max_sig_length' => 'Maximum signature length',
 	'Max_sig_length_explain' => 'Maximum number of characters in user signatures',
 	'Allow_name_change' => 'Allow Username changes',
-	'Forum_admin' => 'Forum Administration',
-	'Forum_admin_explain' => 'From this panel you can add, delete, edit, re-order and re-synchronise categories and forums',
+
+	'Forum_admin_explain' => 'In phpBB 2.2 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum.',
 	'Edit_forum' => 'Edit forum',
 	'Edit_category' => 'Edit category',
 	'Create_forum' => 'Create new forum',
@@ -436,27 +436,32 @@ $lang = array_merge($lang, array(
 	'Edit' => 'Edit',
 	'Move_up' => 'Move up',
 	'Move_down' => 'Move down',
-	'Resync' => 'Resync',
+	'Resync' => 'Sync',
 	'Category_name' => 'Category name',
-	'Forum_type' => 'Forum type',
+	'FORUM_TYPE' => 'Forum Type', 
+	'FORUM_STATUS' => 'Forum Status',
+	'FORUM_STYLE' => 'Forum Style', 
+	'FORUM_IMAGE' => 'Forum Image', 
 	'Parent' => 'Parent',
 	'No_parent' => 'No parent',
 	'Locked' => 'Locked',
 	'Unlocked' => 'Unlocked',
 	'General_settings' => 'General settings',
-	'Forum_settings' => 'Forum settings',
-	'Disable_post_count' => 'Disable post count',
-	'Forum_is_moderated' => 'Moderated forum',
-	'Display_on_index' => 'Display a link to this forum on index',
+	'Forum_settings' => 'Forum settings', 
+	'IS_POSTABLE' => 'Can Post', 
+	'NOT_POSTABLE' => 'Cannot Post', 
+	'ENABLE_TOPIC_ICONS' => 'Enable topic icons', 
+	'DISABLE_POST_COUNT' => 'Disable user post count incrementing',
+	'FORUM_MODERATED' => 'Enable moderation queue',
+	'Display_on_index' => 'Display link to forum on index',
 	'Forum_edit_delete_explain' => 'The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side',
 	'Forum_general' => 'General Forum Settings',
 	'Forum_name' => 'Forum name',
 	'Forum_desc' => 'Description',
-	'Forum_status' => 'Forum status',
 	'Forum_pruning' => 'Auto-pruning',
 	'prune_freq' => 'Check for topic age every',
 	'prune_days' => 'Remove topics that have not been posted to in',
-	'Set_as_category' => 'Set this forum as a category and',
+	'SET_NON_POSTABLE' => 'Set this forum as non-postable and',
 	'Forum_delete' => 'Delete Forum',
 	'Update' => 'Update',
 	'Forum_delete_explain' => 'The form below will allow you to delete a forum (or category) and decide where you want to put all topics (or forums) it contained.',
@@ -469,6 +474,7 @@ $lang = array_merge($lang, array(
 	'Forums_updated' => 'Forum and Category information updated successfully',
 	'Forum_deleted' => 'Forum successfully deleted',
 	'Click_return_forumadmin' => 'Click %sHere%s to return to Forum Administration',
+
 	'Emoticons_explain' => 'From this page you can add, remove and edit the emoticons or emoticons users can use in their posts and private messages.',
 	'Import_smilies' => 'Import emoticons pak',
 	'Import_smilies_explain' => 'Unzip the emoticons package to your emoticons directory then select the correct information in this form to import it.',