2 files changed, 111 insertions, 14 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 60990b4760..30d1edada4 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -52,10 +52,13 @@ $lang += array(
 	'ACP_EXTENSION_GROUPS'		=> 'Manage Extension Groups',
 	'ACP_FORUM_LOGS'			=> 'Forum Logs',
 	'ACP_GENERAL_CONFIGURATION'	=> 'General Configuration',
+	'ACP_GENERAL_TASKS'			=> 'General Tasks',
 	'ACP_ICONS'					=> 'Topic Icons',
 	'ACP_ICONS_SMILIES'			=> 'Topic Icons/Smilies',
 	'ACP_INDEX'					=> 'Admin index',
 	'ACP_JABBER_SETTINGS'		=> 'Jabber Settings',
+	'ACP_LANGUAGE'				=> 'Language Management',
+	'ACP_LANGUAGE_PACKS'		=> 'Language Packs',
 	'ACP_LOAD_SETTINGS'			=> 'Load Settings',
 	'ACP_LOGGING'				=> 'Logging',
 	'ACP_MAIN'					=> 'Admin index',
@@ -86,6 +89,8 @@ $lang += array(
 	'DIMENSIONS'			=> 'Dimensions',
 	'DISABLE'				=> 'Disable',
 	'DISPLAY'				=> 'Display',
+	'DOWNLOAD'				=> 'Download',
+	'DOWNLOAD_AS'			=> 'Download as',
 
 	'EDIT'					=> 'Edit',
 	'ENABLE'				=> 'Enable',
@@ -95,6 +100,7 @@ $lang += array(
 	'GENERAL_OPTIONS'		=> 'General Options',
 	'GENERAL_SETTINGS'		=> 'General Settings',
 
+	'INSTALL'				=> 'Install',
 	'IP'					=> 'User IP',
 	'IP_HOSTNAME'			=> 'IP addresses or hostnames',
 
@@ -205,6 +211,21 @@ $lang += array(
 	'LOG_BOT_DELETE'	=> '<b>Deleted bot</b><br />&#187; %s',
 	'LOG_BOT_UPDATED'	=> '<b>Existing bot updated</b><br />&#187; %s',
 
+	'LOG_CLEAR_ADMIN'		=> '<b>Cleared admin log</b>',
+	'LOG_CLEAR_MODE'		=> '<b>Cleared moderator log</b>',
+	'LOG_CLEAR_CRITICAL'	=> '<b>Cleared error log</b>',
+
+	'LOG_CONFIG_ATTACH'		=> '<b>Altered attachment settings</b>',
+	'LOG_CONFIG_AUTH'		=> '<b>Altered authentication settings</b>',
+	'LOG_CONFIG_AVATAR'		=> '<b>Altered avatar settings</b>',
+	'LOG_CONFIG_COOKIE'		=> '<b>Altered cookie settings</b>',
+	'LOG_CONFIG_DEFAULT'	=> '<b>Altered board defaults</b>',
+	'LOG_CONFIG_EMAIL'		=> '<b>Altered email settings</b>',
+	'LOG_CONFIG_LOAD'		=> '<b>Altered load settings</b>',
+	'LOG_CONFIG_MESSAGE'	=> '<b>Altered private message settings</b>',
+	'LOG_CONFIG_SERVER'		=> '<b>Altered server settings</b>',
+	'LOG_CONFIG_SETTINGS'	=> '<b>Altered board settings</b>',
+
 	'LOG_DOWNLOAD_EXCLUDE_IP'	=> '<b>Exluded ip/hostname from download list</b><br />&#187; %s',
 	'LOG_DOWNLOAD_IP'			=> '<b>Added ip/hostname to download list</b><br />&#187; %s',
 	'LOG_DOWNLOAD_REMOVE_IP'	=> '<b>Removed ip/hostname from download list</b><br />&#187; %s',
@@ -217,6 +238,10 @@ $lang += array(
 	'LOG_JAB_PASSCHG'	=> '<b>Jabber password changed</b>',
 	'LOG_JAB_REGISTER'	=> '<b>Jabber account registered</b>',
 
+	'LOG_LANGUAGE_PACK_DELETED'		=> '<b>Deleted language pack</b><br />&#187; %s',
+	'LOG_LANGUAGE_PACK_INSTALLED'	=> '<b>Installed language pack</b><br />&#187; %s',
+	'LOG_LANGUAGE_PACK_UPDATED'		=> '<b>Updated language pack details</b><br />&#187; %s',
+
 	'LOG_MODULE_DISABLE'	=> '<b>Module disabled</b>',
 	'LOG_MODULE_ENABLE'		=> '<b>Module enabled</b>',
 	'LOG_MODULE_MOVE_DOWN'	=> '<b>Module moved down</b><br />&#187; %s',
@@ -230,24 +255,10 @@ $lang += array(
 	'LOG_RESYNC_POSTCOUNTS'	=> '<b>User postcounts synced</b>',
 	'LOG_RESYNC_STATS'		=> '<b>Post, topic and user stats reset</b>',
 
-	'LOG_CONFIG_ATTACH'		=> '<b>Altered attachment settings</b>',
-	'LOG_CONFIG_AUTH'		=> '<b>Altered authentication settings</b>',
-	'LOG_CONFIG_AVATAR'		=> '<b>Altered avatar settings</b>',
-	'LOG_CONFIG_COOKIE'		=> '<b>Altered cookie settings</b>',
-	'LOG_CONFIG_DEFAULT'	=> '<b>Altered board defaults</b>',
-	'LOG_CONFIG_EMAIL'		=> '<b>Altered email settings</b>',
-	'LOG_CONFIG_LOAD'		=> '<b>Altered load settings</b>',
-	'LOG_CONFIG_MESSAGE'	=> '<b>Altered private message settings</b>',
-	'LOG_CONFIG_SERVER'		=> '<b>Altered server settings</b>',
-	'LOG_CONFIG_SETTINGS'	=> '<b>Altered board settings</b>',
-
 	'LOG_WORD_ADD'			=> '<b>Added word censor</b><br />&#187; %s',
 	'LOG_WORD_DELETE'		=> '<b>Deleted word censor</b><br />&#187; %s',
 	'LOG_WORD_EDIT'			=> '<b>Edited word censor</b><br />&#187; %s',
 
-	'LOG_ADMIN_CLEAR'		=> '<b>Cleared admin log</b>',
-	'LOG_MOD_CLEAR'			=> '<b>Cleared moderator log</b>',
-	'LOG_CRITICAL_CLEAR'	=> '<b>Cleared error log</b>',
 );
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
new file mode 100644
index 0000000000..927aaf5afb
--- /dev/null
+++ b/phpBB/language/en/acp/language.php
@@ -0,0 +1,86 @@
+<?php
+/** 
+*
+* acp_language [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE 
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+
+$lang += array(
+	'ACP_FILES'						=> 'Admin Language Files',
+	'ACP_LANGUAGE_PACKS_EXPLAIN'	=> 'Here you are able to install/remove language packs',
+
+	'EMAIL_FILES'			=> 'Email Templates',
+
+	'FILE_CONTENTS'				=> 'File Contents',
+	'FILE_FROM_STORAGE'			=> 'File from storage folder',
+
+	'HELP_FILES'				=> 'Help Files',
+
+	'INSTALLED_LANGUAGE_PACKS'	=> 'Installed language packs',
+	'INVALID_LANGUAGE_PACK'		=> 'The selected language pack seems to be not valid. Please verify the language pack and upload it again if necessary.',
+
+	'LANGUAGE_DETAILS_UPDATED'			=> 'Language details successfully updated',
+	'LANGUAGE_ENTRIES'					=> 'Language Entries',
+	'LANGUAGE_ENTRIES_EXPLAIN'			=> 'Here you are able to change existing language pack entries or not already translated ones.<br /><b>Note:</b> Once you changed a language file, the changes will be stored within a seperate folder for you to download. The changes will not be seen by your users until you replace the original language files at your webspace (by uploading them).',
+	'LANGUAGE_FILES'					=> 'Language Files',
+	'LANGUAGE_KEY'						=> 'Language Key',
+	'LANGUAGE_PACK_ALREADY_INSTALLED'	=> 'This language pack is already installed.',
+	'LANGUAGE_PACK_DELETED'				=> 'The language pack <b>%s</b> has been removed successfully. All users using this language have been resetted to the boards default language.',
+	'LANGUAGE_PACK_DETAILS'				=> 'Language Pack Details',
+	'LANGUAGE_PACK_INSTALLED'			=> 'The language pack <b>%s</b> has been successfully installed.',
+	'LANGUAGE_PACK_ISO'					=> 'ISO',
+	'LANGUAGE_PACK_LOCALNAME'			=> 'Local name',
+	'LANGUAGE_PACK_NAME'				=> 'Name',
+	'LANGUAGE_PACK_NOT_EXIST'			=> 'The selected language pack does not exist.',
+	'LANGUAGE_PACK_USED_BY'				=> 'Used by',
+	'LANGUAGE_VARIABLE'					=> 'Language Variable',
+	'LANG_AUTHOR'						=> 'Language Pack Author',
+	'LANG_ENGLISH_NAME'					=> 'English name',
+	'LANG_ISO_CODE'						=> 'ISO Code',
+	'LANG_LOCAL_NAME'					=> 'Local name',
+
+	'MISSING_LANGUAGE_FILE'		=> 'Missing Language File: <span style="color:red">%s</span>',
+	'MISSING_LANG_VARIABLES'	=> 'Missing Language Variables',
+	'MODS_FILES'				=> 'Mods Language Files',
+
+	'NO_LANG_ID'					=> 'You haven\'t specified a language pack',
+	'NO_REMOVE_DEFAULT_LANG'		=> 'You are not able to remove the default language pack.<br />If you want to remove this language pack, change your boards default language first.',
+	'NO_UNINSTALLED_LANGUAGE_PACKS'	=> 'No uninstalled language packs',
+
+	'REMOVE_FROM_STORAGE_FOLDER'		=> 'Remove from storage folder',
+
+	'SELECT_DOWNLOAD_FORMAT'	=> 'Select download format',
+	'SUBMIT_AND_DOWNLOAD'		=> 'Submit and Download File',
+
+	'THOSE_MISSING_LANG_FILES'			=> 'The following language files are missing from the %s language folder',
+	'THOSE_MISSING_LANG_VARIABLES'		=> 'The following language variables are missing from the <b>%s</b> language pack',
+
+	'UNINSTALLED_LANGUAGE_PACKS'	=> 'Uninstalled language packs',
+
+	'WRONG_LANGUAGE_FILE'		=> 'Selected language file is invalid',
+);
+
+?>
+\ No newline at end of file