- fix some oddities (doubled spaces for example)

- changed the way make_forum_select() is returning the forum list - now including skipped forums but being disabled. This should make identifying the correct forum much more easier.
- Changed some permission namings based on suggestions by the community
- Tried to comply to the permission field ordering within the language files while displaying permission sets. Hopefully it's worth the additional processing time.
- Disable submit buttons after clicking for installation and conversions.


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

phpBB/includes/acp/acp_language.php

@@ -325,6 +325,7 @@ class acp_language
 					if ($result === false)
 					{
 						// If failed, try to rename again and print error out...
+						$transfer->delete_file($lang_path . $file);
 						$transfer->rename($lang_path . $file . '.bak', $lang_path . $file);
 
 						trigger_error($user->lang['UPLOAD_FAILED'] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id . '&language_file=' . urlencode($selected_lang_file)), E_USER_WARNING);
@@ -922,7 +923,7 @@ class acp_language
 		}
 		$db->sql_freeresult($result);
 
-		$sql = 'SELECT *  
+		$sql = 'SELECT * 
 			FROM ' . LANG_TABLE . '
 			ORDER BY lang_english_name';
 		$result = $db->sql_query($sql);