2 files changed, 35 insertions, 1 deletions
diff --git a/phpBB/admin/index.php b/phpBB/admin/index.php
index 4f739e431c..06a9b5b0db 100644
--- a/phpBB/admin/index.php
+++ b/phpBB/admin/index.php
@@ -24,6 +24,7 @@
 // Load default header
 //
 $phpbb_root_dir = "./../";
+
 $no_page_header = TRUE;
 require('pagestart.inc');
 
@@ -62,19 +63,25 @@ if( $HTTP_GET_VARS['pane'] == 'left' )
 		"L_PREVIEW_FORUM" => $lang['Preview_forum'])
 	);
 
+	ksort($module);
+
 	while( list($cat, $action_array) = each($module) )
 	{
+		$cat = $lang[$cat];
+
 		$template->assign_block_vars("catrow", array(
 			"ADMIN_CATEGORY" => $cat)
 		);
 
+		ksort($action_array);
+
 		$row_count = 0;
 		while( list($action, $file)	= each($action_array) )
 		{
 			$row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2'];
 			$row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2'];
 
-			$action = preg_replace("'_'", " ", $action);
+			$action = $lang[$action];
 
 			$template->assign_block_vars("catrow.modulerow", array(
 				"ROW_COLOR" => "#" . $row_color,
diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php
index b033e779e9..b3fa5709d8 100644
--- a/phpBB/language/lang_english/lang_admin.php
+++ b/phpBB/language/lang_english/lang_admin.php
@@ -25,6 +25,33 @@
 //
 
 //
+// Modules, this replaces the keys used
+// in the modules[][] arrays in each module file
+//
+$lang['General'] = "General Admin";
+$lang['Users'] = "User Admin";
+$lang['Groups'] = "Group Admin";
+$lang['Forums'] = "Forum Admin";
+$lang['Styles'] = "Styles Admin";
+
+$lang['Configuration'] = "Configuration";
+$lang['Permissions'] = "Permissions";
+$lang['Manage'] = "Manage";
+$lang['Disallow'] = "Disallowed words";
+$lang['Prune'] = "Pruning";
+$lang['Mass_Email'] = "Send Bulk Email";
+$lang['Ranks'] = "Ranks";
+$lang['Smilies'] = "Smilies";
+$lang['Ban_Management'] = "Ban Control";
+$lang['Word_Censor'] = "Word Censoring";
+$lang['Export'] = "Export";
+$lang['Create_new'] = "Create";
+$lang['Add_new'] = "Add";
+$lang['Backup_DB'] = "Backup Database";
+$lang['Restore_DB'] = "Restore Database";
+
+
+//
 // Index
 //
 $lang['Admin'] = "Administration";