From a9ad99302a723cd00725f57b27e9d85303d48e5a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 26 Jun 2010 00:51:13 +0200
Subject: [ticket/9684] Move currently existing GAs to a selectable forum while
 updating.

PHPBB3-9684
---
 phpBB/language/en/install.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 021f5eccb0..35fe28d8b5 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -323,6 +323,7 @@ $lang = array_merge($lang, array(
 	'SERVER_CONFIG'				=> 'Server configuration',
 	'SEARCH_INDEX_UNCONVERTED'	=> 'Search index was not converted',
 	'SEARCH_INDEX_UNCONVERTED_EXPLAIN'	=> 'Your old search index was not converted. Searching will always yield an empty result. To create a new search index go to the Administration Control Panel, select Maintenance and then choose Search index from the submenu.',
+	'SELECT_FORUM_GA'			=> 'In phpBB 3.1 the global announcements are linked to forums. Select a forum for your current global announcements (can be moved later):',
 	'SOFTWARE'					=> 'Board software',
 	'SPECIFY_OPTIONS'			=> 'Specify conversion options',
 	'STAGE_ADMINISTRATOR'		=> 'Administrator details',
-- 
cgit v1.2.1


From bf2741ca804d4a5290393c1a6bbcc11faed6bd9f Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 27 Dec 2007 16:04:42 +0000
Subject: Ticket #17705

git-svn-id: file:///svn/phpbb/trunk@8287 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/posting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index a9a3547338..2f390dfebd 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -54,7 +54,7 @@ $lang = array_merge($lang, array(
 	'BBCODE_TAG_TOO_LONG'		=> 'The tag name you selected is too long.',
 	'BBCODE_TAG_DEF_TOO_LONG'	=> 'The tag definition that you have entered is too long, please shorten your tag definition.',
 	'BBCODE_USAGE'				=> 'BBCode usage',
-	'BBCODE_USAGE_EXAMPLE'		=> '[hilight={COLOR}]{TEXT}[/hilight]<br /><br />[font={SIMPLETEXT1}]{SIMPLETEXT2}[/font]',
+	'BBCODE_USAGE_EXAMPLE'		=> '[highlight={COLOR}]{TEXT}[/highlight]<br /><br />[font={SIMPLETEXT1}]{SIMPLETEXT2}[/font]',
 	'BBCODE_USAGE_EXPLAIN'		=> 'Here you define how to use the BBCode. Replace any variable input by the corresponding token (%ssee below%s).',
 
 	'EXAMPLE'						=> 'Example:',
-- 
cgit v1.2.1


From c3ef1109c079861da46f0cb1bac769a87a986f7e Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 27 Dec 2007 16:27:24 +0000
Subject: Ticket #16945

git-svn-id: file:///svn/phpbb/trunk@8288 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/permissions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 8bddbebbd3..bba425d076 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -115,7 +115,7 @@ $lang = array_merge($lang, array(
 
 	'DEFAULT'					=> 'Default',
 	'DELETE_ROLE'				=> 'Delete role',
-	'DELETE_ROLE_CONFIRM'		=> 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> loose their permission settings.',
+	'DELETE_ROLE_CONFIRM'		=> 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> lose their permission settings.',
 	'DISPLAY_ROLE_ITEMS'		=> 'View items using this role',
 
 	'EDIT_PERMISSIONS'			=> 'Edit permissions',
-- 
cgit v1.2.1


From 85055ac97fa57ca339924cef719115d85bdf6c2e Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Thu, 3 Jan 2008 17:00:40 +0000
Subject: oh boy... - Migrate code base to PHP 5.1+

git-svn-id: file:///svn/phpbb/trunk@8295 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/search.php | 4 ----
 phpBB/language/en/install.php    | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 33aeccbc22..16fa7fdf6e 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -55,10 +55,6 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_MYSQL_INCOMPATIBLE_VERSION'	=> 'The MySQL fulltext backend can only be used with MySQL4 and above.',
 	'FULLTEXT_MYSQL_NOT_MYISAM'				=> 'MySQL fulltext indexes can only be used with MyISAM tables.',
 	'FULLTEXT_MYSQL_TOTAL_POSTS'			=> 'Total number of indexed posts',
-	'FULLTEXT_MYSQL_MBSTRING'				=> 'Support for non-latin UTF-8 characters using mbstring:',
-	'FULLTEXT_MYSQL_PCRE'					=> 'Support for non-latin UTF-8 characters using PCRE:',
-	'FULLTEXT_MYSQL_MBSTRING_EXPLAIN'		=> 'If PCRE does not have unicode character properties, the search backend will try to use mbstring’s regular expression engine.',
-	'FULLTEXT_MYSQL_PCRE_EXPLAIN'			=> 'This search backend requires PCRE unicode character properties, only available in PHP 4.4, 5.1 and above, if you want to search for non-latin characters.',
 
 	'GENERAL_SEARCH_SETTINGS'				=> 'General search settings',
 	'GO_TO_SEARCH_INDEX'					=> 'Go to search index page',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 15a5c6dca4..09e3dddd19 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -282,6 +282,8 @@ $lang = array_merge($lang, array(
 
 	'PCRE_UTF_SUPPORT'				=> 'PCRE UTF-8 support',
 	'PCRE_UTF_SUPPORT_EXPLAIN'		=> 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.',
+	'PCRE_UNI_PROP_SUPPORT'				=> 'PCRE Unicode Property support',
+	'PCRE_UNI_PROP_SUPPORT_EXPLAIN'		=> 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with Unicode Property support in the PCRE extension.',
 	'PHP_GETIMAGESIZE_SUPPORT'			=> 'PHP function getimagesize() is available',
 	'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN'	=> '<strong>Required</strong> - In order for phpBB to function correctly, the getimagesize function needs to be available.',
 	'PHP_OPTIONAL_MODULE'			=> 'Optional modules',
@@ -295,7 +297,7 @@ $lang = array_merge($lang, array(
 	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 4.3.3 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
 	'PHP_URL_FOPEN_SUPPORT'			=> 'PHP setting <var>allow_url_fopen</var> is enabled',
 	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it. ',
-	'PHP_VERSION_REQD'				=> 'PHP version >= 4.3.3',
+	'PHP_VERSION_REQD'				=> 'PHP version >= 5.1.0',
 	'POST_ID'						=> 'Post ID',
 	'PREFIX_FOUND'					=> 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
 	'PREPROCESS_STEP'				=> 'Executing pre-processing functions/queries',
-- 
cgit v1.2.1


From f0dea060972a48460ce64d3cdf885d82383763c6 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 5 Jan 2008 16:10:10 +0000
Subject: Correctly check empty subjects/messages (Bug #17915) Do not check
 usernames against word censor list. Disallowed usernames is already checked
 and word censor belong to posts. (Bug #17745) Additionally include
 non-postable forums for moderators forums shown within the teams list. (Bug
 #17265)

git-svn-id: file:///svn/phpbb/trunk@8306 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 09e3dddd19..f6ee3e99d6 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -462,7 +462,7 @@ $lang = array_merge($lang, array(
 	'NO_VISIBLE_CHANGES'			=> 'No visible changes',
 	'NOTICE'						=> 'Notice',
 	'NUM_CONFLICTS'					=> 'Number of conflicts',
-	'NUMBER_OF_FILES_COLLECTED'		=> 'Currently having differences about %1$d from %2$d files collected.<br />Please wait until file collection finished.',
+	'NUMBER_OF_FILES_COLLECTED'		=> 'Currently differences of %1$d of %2$d files have been checked.<br />Please wait until all files are checked.',
 
 	'OLD_UPDATE_FILES'		=> 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
 
-- 
cgit v1.2.1


From 57645ad5bc2469e166cb3e5d54628d87ffa74c42 Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Sun, 6 Jan 2008 02:21:44 +0000
Subject: the end of an era... - MySQL < 4.1.3 support is removed - renamed
 mysql4 to mysql, no need to cause confusion - changed the cfg cacher, reduces
 file system lookups and include count by two on every page load

git-svn-id: file:///svn/phpbb/trunk@8307 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/install.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index f6ee3e99d6..466132d55a 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -205,7 +205,7 @@ $lang = array_merge($lang, array(
 
 	<p>phpBB3 supports the following databases:</p>
 	<ul>
-		<li>MySQL 3.23 or above (MySQLi supported)</li>
+		<li>MySQL 4.1 or above (MySQLi supported)</li>
 		<li>PostgreSQL 7.3+</li>
 		<li>SQLite 2.8.2+</li>
 		<li>Firebird 2.0+</li>
@@ -227,6 +227,7 @@ $lang = array_merge($lang, array(
 	'INST_ERR_DB_CONNECT'		=> 'Could not connect to the database, see error message below.',
 	'INST_ERR_DB_FORUM_PATH'	=> 'The database file specified is within your board directory tree. You should put this file in a non web-accessible location.',
 	'INST_ERR_DB_NO_ERROR'		=> 'No error message given.',
+	'INST_ERR_DB_NO_MYSQL'		=> 'The version of MySQL installed on the target server must be at least 4.1, phpBB 3.1 cannot be installed on an older version.',
 	'INST_ERR_DB_NO_MYSQLI'		=> 'The version of MySQL installed on this machine is incompatible with the “MySQL with MySQLi Extension” option you have selected. Please try the “MySQL” option instead.',
 	'INST_ERR_DB_NO_SQLITE'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
 	'INST_ERR_DB_NO_ORACLE'		=> 'The version of Oracle installed on this machine requires you to set the <var>NLS_CHARACTERSET</var> parameter to <var>UTF8</var>. Either upgrade your installation to 9.2+ or change the parameter.',
@@ -294,7 +295,7 @@ $lang = array_merge($lang, array(
 	'PHP_REGISTER_GLOBALS_EXPLAIN'	=> 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.',
 	'PHP_SAFE_MODE'					=> 'Safe mode',
 	'PHP_SETTINGS'					=> 'PHP version and settings',
-	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 4.3.3 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
+	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.1.0 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
 	'PHP_URL_FOPEN_SUPPORT'			=> 'PHP setting <var>allow_url_fopen</var> is enabled',
 	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it. ',
 	'PHP_VERSION_REQD'				=> 'PHP version >= 5.1.0',
-- 
cgit v1.2.1


From 2f08a3606203c1a2c7aad96e2eb65f6fa882d9a8 Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Sun, 6 Jan 2008 13:46:20 +0000
Subject: - add DB2 support /me takes a nap

git-svn-id: file:///svn/phpbb/trunk@8308 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/install.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 466132d55a..4a81d2623a 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -140,6 +140,7 @@ $lang = array_merge($lang, array(
 	'DEV_NO_TEST_FILE'			=> 'No value has been specified for the test_file variable in the convertor. If you are a user of this convertor, you should not be seeing this error, please report this message to the convertor author. If you are a convertor author, you must specify the name of a file which exists in the source board to allow the path to it to be verified.',
 	'DIRECTORIES_AND_FILES'		=> 'Directory and file setup',
 	'DISABLE_KEYS'				=> 'Disabling keys',
+	'DLL_DB2'					=> 'DB2',
 	'DLL_FIREBIRD'				=> 'Firebird',
 	'DLL_FTP'					=> 'Remote FTP support [ Installation ]',
 	'DLL_GD'					=> 'GD graphics support [ Visual Confirmation ]',
@@ -211,6 +212,7 @@ $lang = array_merge($lang, array(
 		<li>Firebird 2.0+</li>
 		<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
 		<li>Oracle</li>
+		<li>IBM DB2</li>
 	</ul>
 	
 	<p>Only those databases supported on your server will be displayed.',
-- 
cgit v1.2.1


From 2928574ed46334bb8dbbb6612a62db3c3654ba12 Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Mon, 7 Jan 2008 15:19:38 +0000
Subject: - a few tiny clean ups - a new MS SQL DBAL, it does not work so hot
 because of issues with the extension it depends on

git-svn-id: file:///svn/phpbb/trunk@8313 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/install.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 4a81d2623a..4a1f1add75 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -146,6 +146,7 @@ $lang = array_merge($lang, array(
 	'DLL_GD'					=> 'GD graphics support [ Visual Confirmation ]',
 	'DLL_MBSTRING'				=> 'Multi-byte character support',
 	'DLL_MSSQL'					=> 'MSSQL Server 2000+',
+	'DLL_MSSQL_2005'			=> 'MSSQL Server 2005+',
 	'DLL_MSSQL_ODBC'			=> 'MSSQL Server 2000+ via ODBC',
 	'DLL_MYSQL'					=> 'MySQL',
 	'DLL_MYSQLI'				=> 'MySQL with MySQLi Extension',
-- 
cgit v1.2.1


From b9b46a8b454b2ad34ff1a15b0cfd7bd9eb969cb6 Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Wed, 9 Jan 2008 00:21:29 +0000
Subject: - phpBB now uses a less ancient version of Oracle

git-svn-id: file:///svn/phpbb/trunk@8317 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/install.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 4a1f1add75..3f3eb7165b 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -231,9 +231,10 @@ $lang = array_merge($lang, array(
 	'INST_ERR_DB_FORUM_PATH'	=> 'The database file specified is within your board directory tree. You should put this file in a non web-accessible location.',
 	'INST_ERR_DB_NO_ERROR'		=> 'No error message given.',
 	'INST_ERR_DB_NO_MYSQL'		=> 'The version of MySQL installed on the target server must be at least 4.1, phpBB 3.1 cannot be installed on an older version.',
-	'INST_ERR_DB_NO_MYSQLI'		=> 'The version of MySQL installed on this machine is incompatible with the “MySQL with MySQLi Extension” option you have selected. Please try the “MySQL” option instead.',
+	'INST_ERR_DB_NO_MYSQLI'		=> 'The version of MySQL installed on the target server must be at least 4.1, phpBB 3.1 cannot be installed on an older version.',
 	'INST_ERR_DB_NO_SQLITE'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
-	'INST_ERR_DB_NO_ORACLE'		=> 'The version of Oracle installed on this machine requires you to set the <var>NLS_CHARACTERSET</var> parameter to <var>UTF8</var>. Either upgrade your installation to 9.2+ or change the parameter.',
+	'INST_ERR_DB_NO_ORACLE'		=> 'The version of Oracle installed on the target server must be at least 9.2, phpBB 3.1 cannot be installed on an older version.',
+	'INST_ERR_DB_NO_ORACLE_NLS'	=> 'You must configure Oracle so that the <var>NLS_CHARACTERSET</var> parameter is set to <var>ALU32UTF8</var>.',
 	'INST_ERR_DB_NO_FIREBIRD'	=> 'The version of Firebird installed on this machine is older than 2.0, please upgrade to a newer version.',
 	'INST_ERR_DB_NO_FIREBIRD_PS'=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
 	'INST_ERR_DB_NO_POSTGRES'	=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
-- 
cgit v1.2.1


From 7fed5dd1666c2d54b87dd8e46dadcbb167e702a7 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 23 Jan 2008 14:32:15 +0000
Subject: cross-checkin for the TRUNK

git-svn-id: file:///svn/phpbb/trunk@8333 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/posting.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 2f390dfebd..961ca2612c 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -162,6 +162,8 @@ $lang = array_merge($lang, array(
 	'SMILIES_CONFIG'			=> 'Smiley configuration',
 	'SMILIES_DELETED'			=> 'The smiley has been removed successfully.',
 	'SMILIES_EDIT'				=> 'Edit smiley',
+	'SMILIE_NO_CODE'			=> 'The smilie “%s”  was ignored, as there was no code entered.',
+	'SMILIE_NO_EMOTION'			=> 'The smilie “%s” was ignored, as there was no emotion entered.',
 	'SMILIES_NONE_EDITED'		=> 'No smilies were updated.',
 	'SMILIES_ONE_EDITED'		=> 'The smiley has been updated successfully.',
 	'SMILIES_EDITED'			=> 'The smilies have been updated successfully.',
-- 
cgit v1.2.1


From 4b5fab372ff69a809144dee3a0a7f90c219fe400 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 30 Jan 2008 16:14:39 +0000
Subject: merge with revision #r8350

git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/common.php            | 40 ++++++++++++++---------------
 phpBB/language/en/acp/permissions_phpbb.php |  4 +--
 phpBB/language/en/acp/posting.php           | 10 ++++----
 phpBB/language/en/help_faq.php              |  2 +-
 phpBB/language/en/mcp.php                   |  6 ++---
 phpBB/language/en/posting.php               |  2 +-
 6 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 98db554843..0c6014bc24 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* acp common [English]
+* acp_common [English]
 *
 * @package language
 * @version $Id$
@@ -57,7 +57,7 @@ $lang = array_merge($lang, array(
 	'ACP_BOARD_MANAGEMENT'		=> 'Board management',
 	'ACP_BOARD_SETTINGS'		=> 'Board settings',
 	'ACP_BOTS'					=> 'Spiders/Robots',
-	
+
 	'ACP_CAPTCHA'				=> 'CAPTCHA',
 
 	'ACP_CAT_DATABASE'			=> 'Database',
@@ -75,14 +75,14 @@ $lang = array_merge($lang, array(
 	'ACP_COOKIE_SETTINGS'		=> 'Cookie settings',
 	'ACP_CRITICAL_LOGS'			=> 'Error log',
 	'ACP_CUSTOM_PROFILE_FIELDS'	=> 'Custom profile fields',
-	
+
 	'ACP_DATABASE'				=> 'Database management',
 	'ACP_DISALLOW'				=> 'Disallow',
 	'ACP_DISALLOW_USERNAMES'	=> 'Disallow usernames',
-	
+
 	'ACP_EMAIL_SETTINGS'		=> 'E-mail settings',
 	'ACP_EXTENSION_GROUPS'		=> 'Manage extension groups',
-	
+
 	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
 	'ACP_FORUM_LOGS'				=> 'Forum logs',
 	'ACP_FORUM_MANAGEMENT'			=> 'Forum management',
@@ -99,20 +99,20 @@ $lang = array_merge($lang, array(
 	'ACP_GROUPS_MANAGE'				=> 'Manage groups',
 	'ACP_GROUPS_MANAGEMENT'			=> 'Group management',
 	'ACP_GROUPS_PERMISSIONS'		=> 'Groups’ permissions',
-	
+
 	'ACP_ICONS'					=> 'Topic icons',
 	'ACP_ICONS_SMILIES'			=> 'Topic icons/smilies',
 	'ACP_IMAGESETS'				=> 'Imagesets',
 	'ACP_INACTIVE_USERS'		=> 'Inactive users',
 	'ACP_INDEX'					=> 'ACP 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'					=> 'ACP index',
 	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions',
 	'ACP_MANAGE_FORUMS'			=> 'Manage forums',
@@ -125,9 +125,9 @@ $lang = array_merge($lang, array(
 	'ACP_MODULE_MANAGEMENT'		=> 'Module management',
 	'ACP_MOD_LOGS'				=> 'Moderator log',
 	'ACP_MOD_ROLES'				=> 'Moderator roles',
-	
+
 	'ACP_ORPHAN_ATTACHMENTS'	=> 'Orphaned attachments',
-	
+
 	'ACP_PERMISSIONS'			=> 'Permissions',
 	'ACP_PERMISSION_MASKS'		=> 'Permission masks',
 	'ACP_PERMISSION_ROLES'		=> 'Permission roles',
@@ -137,9 +137,9 @@ $lang = array_merge($lang, array(
 	'ACP_PRUNE_FORUMS'			=> 'Prune forums',
 	'ACP_PRUNE_USERS'			=> 'Prune users',
 	'ACP_PRUNING'				=> 'Pruning',
-	
+
 	'ACP_QUICK_ACCESS'			=> 'Quick access',
-	
+
 	'ACP_RANKS'					=> 'Ranks',
 	'ACP_REASONS'				=> 'Report/denial reasons',
 	'ACP_REGISTER_SETTINGS'		=> 'User registration settings',
@@ -158,10 +158,10 @@ $lang = array_merge($lang, array(
 	'ACP_STYLE_COMPONENTS'		=> 'Style components',
 	'ACP_STYLE_MANAGEMENT'		=> 'Style management',
 	'ACP_STYLES'				=> 'Styles',
-	
+
 	'ACP_TEMPLATES'				=> 'Templates',
 	'ACP_THEMES'				=> 'Themes',
-	
+
 	'ACP_UPDATE'					=> 'Updating',
 	'ACP_USERS_FORUM_PERMISSIONS'	=> 'Users’ forum permissions',
 	'ACP_USERS_LOGS'				=> 'User logs',
@@ -188,7 +188,7 @@ $lang = array_merge($lang, array(
 	'ACP_VIEW_FORUM_PERMISSIONS'		=> 'View forum-based permissions',
 	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS'	=> 'View global moderation permissions',
 	'ACP_VIEW_USER_PERMISSIONS'			=> 'View user-based permissions',
-	
+
 	'ACP_WORDS'					=> 'Word censoring',
 
 	'ACTION'				=> 'Action',
@@ -242,7 +242,7 @@ $lang = array_merge($lang, array(
 	'NOTIFY'				=> 'Notification',
 	'NO_ADMIN'				=> 'You are not authorised to administrate this board.',
 	'NO_EMAILS_DEFINED'		=> 'No valid e-mail addresses found.',
-	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',	
+	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',
 
 	'OFF'					=> 'Off',
 	'ON'					=> 'On',
@@ -252,7 +252,7 @@ $lang = array_merge($lang, array(
 	'PARSE_URLS'						=> 'Parse links',
 	'PERMISSIONS_TRANSFERRED'			=> 'Permissions transferred',
 	'PERMISSIONS_TRANSFERRED_EXPLAIN'	=> 'You currently have the permissions from %1$s. You are able to browse the board with this user’s permissions, but not access the administration control panel since admin permissions were not transferred. You can <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.',
-	'PIXEL'								=> 'px',	
+	'PIXEL'								=> 'px',
 	'PROCEED_TO_ACP'					=> '%sProceed to the ACP%s',
 
 	'REMIND'							=> 'Remind',
@@ -404,7 +404,7 @@ $lang = array_merge($lang, array(
 
 	'LOG_ACL_TRANSFER_PERMISSIONS'		=> '<strong>Permissions transferred from</strong><br />» %s',
 	'LOG_ACL_RESTORE_PERMISSIONS'		=> '<strong>Own permissions restored after using permissions from</strong><br />» %s',
-	
+
 	'LOG_ADMIN_AUTH_FAIL'		=> '<strong>Failed administration login attempt</strong>',
 	'LOG_ADMIN_AUTH_SUCCESS'	=> '<strong>Successful administration login</strong>',
 
@@ -498,7 +498,7 @@ $lang = array_merge($lang, array(
 
 	'LOG_ERROR_JABBER'		=> '<strong>Jabber error</strong><br />» %s',
 	'LOG_ERROR_EMAIL'		=> '<strong>E-mail error</strong><br />» %s',
-	
+
 	'LOG_FORUM_ADD'							=> '<strong>Created new forum</strong><br />» %s',
 	'LOG_FORUM_DEL_FORUM'					=> '<strong>Deleted forum</strong><br />» %s',
 	'LOG_FORUM_DEL_FORUMS'					=> '<strong>Deleted forum and its subforums</strong><br />» %s',
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index d5b4f0015d..8f090667b4 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* acp_permissions (phpBB Permission Set) [English]
+* acp_permissions_phpbb (phpBB Permission Set) [English]
 *
 * @package language
 * @version $Id$
@@ -35,7 +35,7 @@ if (empty($lang) || !is_array($lang))
 
 /**
 *	MODDERS PLEASE NOTE
-*	
+*
 *	You are able to put your permission sets into a separate file too by
 *	prefixing the new file with permissions_ and putting it into the acp
 *	language folder.
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 961ca2612c..ebde75cfaa 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* posting [English]
+* acp_posting [English]
 *
 * @package language
 * @version $Id$
@@ -103,7 +103,7 @@ $lang = array_merge($lang, array(
 	'DISPLAY_POSTING_NO'		=> 'Not on posting page',
 
 
-	
+
 	'EDIT_ICONS'				=> 'Edit icons',
 	'EDIT_SMILIES'				=> 'Edit smilies',
 	'EMOTION'					=> 'Emotion',
@@ -207,7 +207,7 @@ $lang = array_merge($lang, array(
 	'ADD_RANK'				=> 'Add new rank',
 
 	'MUST_SELECT_RANK'		=> 'You must select a rank.',
-	
+
 	'NO_ASSIGNED_RANK'		=> 'No special rank assigned.',
 	'NO_RANK_TITLE'			=> 'You haven’t specified a title for the rank.',
 	'NO_UPDATE_RANKS'		=> 'The rank was successfully deleted. However user accounts using this rank were not updated. You will need to manually reset the rank on these accounts.',
@@ -243,12 +243,12 @@ $lang = array_merge($lang, array(
 	'ACP_REASONS_EXPLAIN'	=> 'Here you can manage the reasons used in reports and denial messages when disapproving posts. There is one default reason (marked with a *) you are not able to remove, this reason is normally used for custom messages if no reason fits.',
 	'ADD_NEW_REASON'		=> 'Add new reason',
 	'AVAILABLE_TITLES'		=> 'Available localised reason titles',
-	
+
 	'IS_NOT_TRANSLATED'			=> 'Reason has <strong>not</strong> been localised.',
 	'IS_NOT_TRANSLATED_EXPLAIN'	=> 'Reason has <strong>not</strong> been localised. If you want to provide the localised form, specify the correct key from the language files report reasons section.',
 	'IS_TRANSLATED'				=> 'Reason has been localised.',
 	'IS_TRANSLATED_EXPLAIN'		=> 'Reason has been localised. If the title you enter here is specified within the language files report reasons section, the localised form of the title and description will be used.',
-	
+
 	'NO_REASON'					=> 'Reason could not be found.',
 	'NO_REASON_INFO'			=> 'You have to specify a title and a description for this reason.',
 	'NO_REMOVE_DEFAULT_REASON'	=> 'You are not able to remove the default reason “Other”.',
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 808f6fdc10..354d432d51 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -144,7 +144,7 @@ $help = array(
 	),
 	array(
 		0 => 'Why did I receive a warning?',
-		1 => 'Each board administrator has their own set of rules for their site. If you have broken a rule, you may issued a warning. Please note that this is the board administrator’s decision, and the phpBB Group has nothing to do with the warnings on the given site. Contact the board administrator if you are unsure about why you were issued a warning.'
+		1 => 'Each board administrator has their own set of rules for their site. If you have broken a rule, you may be issued a warning. Please note that this is the board administrator’s decision, and the phpBB Group has nothing to do with the warnings on the given site. Contact the board administrator if you are unsure about why you were issued a warning.'
 	),
 	array(
 		0 => 'How can I report posts to a moderator?',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 2f238ffa37..f53babdc69 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -223,7 +223,7 @@ $lang = array_merge($lang, array(
 	'NO_POST_SELECTED'				=> 'You must select at least one post to perform this action.',
 	'NO_REASON_DISAPPROVAL'			=> 'Please give an appropriate reason for disapproval.',
 	'NO_REPORT'						=> 'No report found',
-	'NO_REPORTS'					=> 'No reports found',	
+	'NO_REPORTS'					=> 'No reports found',
 	'NO_REPORT_SELECTED'			=> 'You must select at least one report to perform this action.',
 	'NO_TOPIC_ICON'					=> 'None',
 	'NO_TOPIC_SELECTED'				=> 'You must select at least one topic to perform this action.',
@@ -273,8 +273,8 @@ $lang = array_merge($lang, array(
 	'REPORT_TOTAL'				=> 'In total there is <strong>1</strong> report to review.',
 	'RESYNC'					=> 'Resync',
 	'RETURN_MESSAGE'			=> '%sReturn to the message%s',
-	'RETURN_NEW_FORUM'			=> '%sReturn to the new forum%s',
-	'RETURN_NEW_TOPIC'			=> '%sReturn to the new topic%s',
+	'RETURN_NEW_FORUM'			=> '%sGo to the new forum%s',
+	'RETURN_NEW_TOPIC'			=> '%sGo to the new topic%s',
 	'RETURN_POST'				=> '%sReturn to the post%s',
 	'RETURN_QUEUE'				=> '%sReturn to the queue%s',
 	'RETURN_REPORTS'			=> '%sReturn to the reports%s',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index c24a2a173e..76878c8f7c 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -77,7 +77,7 @@ $lang = array_merge($lang, array(
 	'DELETE_MESSAGE'			=> 'Delete message',
 	'DELETE_MESSAGE_CONFIRM'	=> 'Are you sure you want to delete this message?',
 	'DELETE_OWN_POSTS'			=> 'Sorry but you can only delete your own posts.',
-	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this message?',
+	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
 	'DELETE_POST_WARN'			=> 'Once deleted the post cannot be recovered',
 	'DISABLE_BBCODE'			=> 'Disable BBCode',
 	'DISABLE_MAGIC_URL'			=> 'Do not automatically parse URLs',
-- 
cgit v1.2.1


From e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 2 Feb 2008 15:24:55 +0000
Subject: merge revisions: #r8359, #r8360, #r8368

git-svn-id: file:///svn/phpbb/trunk@8369 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/groups.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php
index 7cee799535..9f72d4070f 100644
--- a/phpBB/language/en/groups.php
+++ b/phpBB/language/en/groups.php
@@ -40,8 +40,10 @@ $lang = array_merge($lang, array(
 	'ALREADY_IN_GROUP'			=> 'You are already a member of the selected group.',
 	'ALREADY_IN_GROUP_PENDING'	=> 'You already requested joining the selected group.',
 
-	'CHANGED_DEFAULT_GROUP'	=> 'Successfully changed default group.',
-	
+	'CANNOT_JOIN_GROUP'			=> 'You are not able to join this group. You are only able to join open and freely open groups.',
+	'CANNOT_RESIGN_GROUP'		=> 'You are not able to resign from this group. You are only able to resign from open and freely open groups.',
+	'CHANGED_DEFAULT_GROUP'		=> 'Successfully changed default group.',
+
 	'GROUP_AVATAR'						=> 'Group avatar',
 	'GROUP_CHANGE_DEFAULT'				=> 'Are you sure you want to change your default membership to the group “%s”?',
 	'GROUP_CLOSED'						=> 'Closed',
-- 
cgit v1.2.1


From 3b669aedfde10b95996d529da9b21e31c46cc8a6 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 3 Feb 2008 22:39:38 +0000
Subject: adding a new option to hide the entire list of subforums on
 listforums

git-svn-id: file:///svn/phpbb/trunk@8373 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/forums.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 72c92a6740..84f280c779 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -114,10 +114,12 @@ $lang = array_merge($lang, array(
 
 	'GENERAL_FORUM_SETTINGS'	=> 'General forum settings',
 
-	'LINK'					=> 'Link',
-	'LIST_INDEX'			=> 'List subforum in parent-forum’s legend',
-	'LIST_INDEX_EXPLAIN'	=> 'Displays this forum on the index and elsewhere as a link within the legend of its parent-forum.',
-	'LOCKED'				=> 'Locked',
+	'LINK'						=> 'Link',
+	'LIST_INDEX'				=> 'List subforum in parent-forum’s legend',
+	'LIST_INDEX_EXPLAIN'		=> 'Displays this forum on the index and elsewhere as a link within the legend of its parent-forum if the parent-forum’s “List subforums in legend” option is enabled.',
+	'LIST_SUBFORUMS'			=> 'List subforums in legend',
+	'LIST_SUBFORUMS_EXPLAIN'	=> 'Displays this forum’s subforums on the index and elsewhere as a link within the legend if their “List subforum in parent-forum’s legend” option is enabled.',
+	'LOCKED'					=> 'Locked',
 
 	'MOVE_POSTS_NO_POSTABLE_FORUM'	=> 'The forum you selected for moving the posts to is not postable. Please select a postable forum.',
 	'MOVE_POSTS_TO'					=> 'Move posts to',
-- 
cgit v1.2.1


From 2cedbbac0944da85a01f3a3afbac65756610f29d Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 23 Feb 2008 14:23:34 +0000
Subject: merge revisions #r8384, #r8387, #r8388, #r8389 and #r8390

git-svn-id: file:///svn/phpbb/trunk@8391 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/groups.php | 1 +
 phpBB/language/en/acp/users.php  | 4 ++--
 phpBB/language/en/common.php     | 2 ++
 phpBB/language/en/memberlist.php | 2 +-
 phpBB/language/en/ucp.php        | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index f73bf063a6..714cbe7f0d 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -107,6 +107,7 @@ $lang = array_merge($lang, array(
 	'NO_GROUPS_CREATED'			=> 'No groups created yet.',
 	'NO_PERMISSIONS'			=> 'Do not copy permissions',
 	'NO_USERS'					=> 'You haven’t entered any users.',
+	'NO_USERS_ADDED'			=> 'No users were added to the group.',
 
 	'SPECIAL_GROUPS'			=> 'Pre-defined groups',
 	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 408afc4c5b..0217238a0d 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -44,10 +44,10 @@ $lang = array_merge($lang, array(
 
 	'CANNOT_BAN_FOUNDER'			=> 'You are not allowed to ban founder accounts.',
 	'CANNOT_BAN_YOURSELF'			=> 'You are not allowed to ban yourself.',
-	'CANNOT_DEACTIVATE_BOT'			=> 'You are not allowed to deactivate bot accounts. Please deactivate the bot instead.',
+	'CANNOT_DEACTIVATE_BOT'			=> 'You are not allowed to deactivate bot accounts. Please deactivate the bot within the bots page instead.',
 	'CANNOT_DEACTIVATE_FOUNDER'		=> 'You are not allowed to deactivate founder accounts.',
 	'CANNOT_DEACTIVATE_YOURSELF'	=> 'You are not allowed to deactivate your own account.',
-	'CANNOT_FORCE_REACT_BOT'		=> 'You are not allowed to force reactivation on bot accounts. Please deactivate the bot instead.',
+	'CANNOT_FORCE_REACT_BOT'		=> 'You are not allowed to force reactivation on bot accounts. Please deactivate the bot within the bots page instead.',
 	'CANNOT_FORCE_REACT_FOUNDER'	=> 'You are not allowed to force reactivation on founder accounts.',
 	'CANNOT_FORCE_REACT_YOURSELF'	=> 'You are not allowed to force reactivation of your own account.',
 	'CANNOT_REMOVE_ANONYMOUS'		=> 'You are not able to remove the guest user account.',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index f7e672e22b..8e739206c5 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -278,6 +278,7 @@ $lang = array_merge($lang, array(
 	'JUMP_TO_PAGE'			=> 'Click to jump to page…',
 
 	'KB'					=> 'KB',
+	'KIB'					=> 'KiB',
 
 	'LAST_POST'							=> 'Last post',
 	'LAST_UPDATED'						=> 'Last updated',
@@ -311,6 +312,7 @@ $lang = array_merge($lang, array(
 	'MARK_ALL'				=> 'Mark all',
 	'MARK_FORUMS_READ'		=> 'Mark forums read',
 	'MB'					=> 'MB',
+	'MIB'					=> 'MiB',
 	'MCP'					=> 'Moderator Control Panel',
 	'MEMBERLIST'			=> 'Members',
 	'MEMBERLIST_EXPLAIN'	=> 'View complete list of members',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index a278eb1306..ad4dd83ca4 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -84,7 +84,7 @@ $lang = array_merge($lang, array(
 	'IM_MSNM_CONNECT'		=> 'MSNM is not connected.\nYou have to connect to MSNM to continue.',		
 	'IM_NAME'				=> 'Your Name',
 	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
-	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this server. You will need a Jabber client installed on your system to contact the recipient above.',
+	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
 	'IM_RECIPIENT'			=> 'Recipient',
 	'IM_SEND'				=> 'Send message',
 	'IM_SEND_MESSAGE'		=> 'Send message',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index d7006549ce..dfeb1f20dd 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -88,7 +88,7 @@ $lang = array_merge($lang, array(
 	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
 	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
-	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$dkB.',
+	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$.2lf KiB.',
 	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
 	'AVATAR_GALLERY'				=> 'Local gallery',
 	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',
-- 
cgit v1.2.1


From 2a3eb724a84120e1d89e56536dcd1f1f5e20a408 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 27 Feb 2008 15:21:23 +0000
Subject: cross-ci

git-svn-id: file:///svn/phpbb/trunk@8411 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/common.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 0c6014bc24..c3f884bc8e 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -262,6 +262,11 @@ $lang = array_merge($lang, array(
 	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
 	'SELECT_OPTION'			=> 'Select option',
 
+	'SETTING_TOO_LOW'		=> 'The entered value for the setting %s is too low. The minimal allowed value is %d.',
+	'SETTING_TOO_BIG'		=> 'The entered value for the setting %s is too big. The maximal allowed value is %d.',	
+	'SETTING_TOO_LONG'		=> 'The entered value for the setting %s is too long. The maximal allowed length is %d.',
+	'SETTING_TOO_SHORT'		=> 'The entered value for the setting %s is not long enough. The minimal allowed length is %d.',
+
 	'UCP'					=> 'User Control Panel',
 	'USERNAMES_EXPLAIN'		=> 'Place each username on a separate line.',
 	'USER_CONTROL_PANEL'	=> 'User Control Panel',
-- 
cgit v1.2.1


From 8c64d7c32afa5a8c28522ac0d99faa78a75ebefc Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 13 Mar 2008 15:25:20 +0000
Subject: merging #r8426 to #r8430

git-svn-id: file:///svn/phpbb/trunk@8431 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/board.php  | 4 ++--
 phpBB/language/en/acp/common.php | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 0cc1064916..f328c05882 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -134,7 +134,7 @@ $lang = array_merge($lang, array(
 	'ACP_POST_SETTINGS_EXPLAIN'			=> 'Here you can set all default settings for posting.',
 	'ALLOW_POST_LINKS'					=> 'Allow links in posts/private messages',
 	'ALLOW_POST_LINKS_EXPLAIN'			=> 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.',
-	'ALLOW_POST_FLASH'					=> 'Allow use of <code>[FLASH]</code> BBCode tag in posts. ',
+	'ALLOW_POST_FLASH'					=> 'Allow use of <code>[FLASH]</code> BBCode tag in posts',
 	'ALLOW_POST_FLASH_EXPLAIN'			=> 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.',
 
 	'BUMP_INTERVAL'					=> 'Bump interval',
@@ -323,7 +323,7 @@ $lang = array_merge($lang, array(
 	'LDAP_USER'						=> 'LDAP user <var>dn</var>',
 	'LDAP_USER_EXPLAIN'				=> 'Leave blank to use anonymous binding. If filled in phpBB uses the specified distinguished name on login attempts to find the correct user, e.g. <samp>uid=Username,ou=MyUnit,o=MyCompany,c=US</samp>. Required for Active Directory Servers.',
 	'LDAP_USER_FILTER'				=> 'LDAP user filter',
-	'LDAP_USER_FILTER_EXPLAIN'		=> 'Optionally you can further limit the searched objects with additional filters. For example <samp>objectClass=posixGroup</samp> would result in the use of <samp>(&(uid=$username)(objectClass=posixGroup))</samp>',
+	'LDAP_USER_FILTER_EXPLAIN'		=> 'Optionally you can further limit the searched objects with additional filters. For example <samp>objectClass=posixGroup</samp> would result in the use of <samp>(&amp;(uid=$username)(objectClass=posixGroup))</samp>',
 ));
 
 // Server Settings
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index c3f884bc8e..47cb5de680 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -126,6 +126,8 @@ $lang = array_merge($lang, array(
 	'ACP_MOD_LOGS'				=> 'Moderator log',
 	'ACP_MOD_ROLES'				=> 'Moderator roles',
 
+	'ACP_NO_ITEMS'				=> 'There are no items yet.',
+
 	'ACP_ORPHAN_ATTACHMENTS'	=> 'Orphaned attachments',
 
 	'ACP_PERMISSIONS'			=> 'Permissions',
-- 
cgit v1.2.1


From 3e42df098cedbd4c70f893ea23de7f06df519fe2 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 31 Mar 2008 14:58:14 +0000
Subject: merging some changes

git-svn-id: file:///svn/phpbb/trunk@8484 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/common.php | 8 ++++----
 phpBB/language/en/acp/users.php  | 2 +-
 phpBB/language/en/install.php    | 2 +-
 phpBB/language/en/ucp.php        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 47cb5de680..f380b1f570 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -264,10 +264,10 @@ $lang = array_merge($lang, array(
 	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
 	'SELECT_OPTION'			=> 'Select option',
 
-	'SETTING_TOO_LOW'		=> 'The entered value for the setting %s is too low. The minimal allowed value is %d.',
-	'SETTING_TOO_BIG'		=> 'The entered value for the setting %s is too big. The maximal allowed value is %d.',	
-	'SETTING_TOO_LONG'		=> 'The entered value for the setting %s is too long. The maximal allowed length is %d.',
-	'SETTING_TOO_SHORT'		=> 'The entered value for the setting %s is not long enough. The minimal allowed length is %d.',
+	'SETTING_TOO_LOW'		=> 'The entered value for the setting “%1$s” is too low. The minimal allowed value is %2$d.',
+	'SETTING_TOO_BIG'		=> 'The entered value for the setting “%1$s” is too big. The maximal allowed value is %2$d.',	
+	'SETTING_TOO_LONG'		=> 'The entered value for the setting “%1$s” is too long. The maximal allowed length is %2$d.',
+	'SETTING_TOO_SHORT'		=> 'The entered value for the setting “%1$s” is not long enough. The minimal allowed length is %2$d.',
 
 	'UCP'					=> 'User Control Panel',
 	'USERNAMES_EXPLAIN'		=> 'Place each username on a separate line.',
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 0217238a0d..dc28032483 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -47,7 +47,7 @@ $lang = array_merge($lang, array(
 	'CANNOT_DEACTIVATE_BOT'			=> 'You are not allowed to deactivate bot accounts. Please deactivate the bot within the bots page instead.',
 	'CANNOT_DEACTIVATE_FOUNDER'		=> 'You are not allowed to deactivate founder accounts.',
 	'CANNOT_DEACTIVATE_YOURSELF'	=> 'You are not allowed to deactivate your own account.',
-	'CANNOT_FORCE_REACT_BOT'		=> 'You are not allowed to force reactivation on bot accounts. Please deactivate the bot within the bots page instead.',
+	'CANNOT_FORCE_REACT_BOT'		=> 'You are not allowed to force reactivation on bot accounts. Please reactivate the bot within the bots page instead.',
 	'CANNOT_FORCE_REACT_FOUNDER'	=> 'You are not allowed to force reactivation on founder accounts.',
 	'CANNOT_FORCE_REACT_YOURSELF'	=> 'You are not allowed to force reactivation of your own account.',
 	'CANNOT_REMOVE_ANONYMOUS'		=> 'You are not able to remove the guest user account.',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 3f3eb7165b..a6703f4337 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -85,7 +85,7 @@ $lang = array_merge($lang, array(
 	'CONVERT_NEW_CONVERSION'	=> 'New conversion',
 	'CONVERT_NOT_EXIST'			=> 'The specified convertor does not exist.',
 	'CONVERT_OPTIONS'			=> 'Options',
-	'CONVERT_SETTINGS_VERIFIED'	=> 'The information you entered has been verified. To start the conversion process, push the button below to begin.',
+	'CONVERT_SETTINGS_VERIFIED'	=> 'The information you entered has been verified. To start the conversion process, please push the button below.',
 	'CONV_ERR_FATAL'			=> 'Fatal conversion error',
 
 	'CONV_ERROR_ATTACH_FTP_DIR'			=> 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index dfeb1f20dd..4f9920c931 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -88,7 +88,7 @@ $lang = array_merge($lang, array(
 	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
 	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
-	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$.2lf KiB.',
+	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$.2f KiB.',
 	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
 	'AVATAR_GALLERY'				=> 'Local gallery',
 	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',
-- 
cgit v1.2.1


From 91b4fe1868ca2c4d81111943f781e3cfd0262ef2 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 28 May 2008 13:05:45 +0000
Subject: Merging mime and referer checks into the Trunk

git-svn-id: file:///svn/phpbb/trunk@8571 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/attachments.php |  2 ++
 phpBB/language/en/acp/board.php       | 11 +++++------
 phpBB/language/en/acp/common.php      |  1 +
 phpBB/language/en/common.php          |  1 +
 phpBB/language/en/posting.php         |  1 +
 5 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 6edae1a4cc..594eb9de33 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -71,6 +71,8 @@ $lang = array_merge($lang, array(
 	'CAT_QUICKTIME_FILES'		=> 'Quicktime media files',
 	'CAT_RM_FILES'				=> 'RealMedia media files',
 	'CAT_WM_FILES'				=> 'Windows Media media files',
+	'CHECK_CONTENT'				=> 'Check attachment files',
+	'CHECK_CONTENT_EXPLAIN'		=> 'Some browsers can be tricked to assume an incorrect mimetype for uploaded files. This option ensures that such files likely to cause this are rejected.',
 	'CREATE_GROUP'				=> 'Create new group',
 	'CREATE_THUMBNAIL'			=> 'Create thumbnail',
 	'CREATE_THUMBNAIL_EXPLAIN'	=> 'Create a thumbnail in all possible situations.',
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index f328c05882..ae122c54ee 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -206,10 +206,6 @@ $lang = array_merge($lang, array(
 	'ENABLE_COPPA_EXPLAIN'		=> 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA. If this is disabled the COPPA specific groups will no longer be displayed.',
 	'MAX_CHARS'					=> 'Max',
 	'MIN_CHARS'					=> 'Min',
-	'MIN_TIME_REG'				=> 'Minimum time for registration',
-	'MIN_TIME_REG_EXPLAIN'		=> 'The registration form cannot be submitted before this time has passed.',
-	'MIN_TIME_TERMS'			=> 'Minimum time for accepting terms',
-	'MIN_TIME_TERMS_EXPLAIN'	=> 'The terms page cannot be skipped before this time has passed.',
 	'NO_AUTH_PLUGIN'			=> 'No suitable auth plugin found.',
 	'PASSWORD_LENGTH'			=> 'Password length',
 	'PASSWORD_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in passwords.',
@@ -375,8 +371,6 @@ $lang = array_merge($lang, array(
 	'FORCE_PASS_CHANGE_EXPLAIN'		=> 'Require user to change their password after a set number of days. Setting this value to 0 disables this behaviour.',
 	'FORM_TIME_MAX'					=> 'Maximum time to submit forms',
 	'FORM_TIME_MAX_EXPLAIN'			=> 'The time a user has to submit a form. Use -1 to disable. Note that a form might become invalid if the session expires, regardless of this setting.',
-	'FORM_TIME_MIN'					=> 'Minimum time to submit forms',
-	'FORM_TIME_MIN_EXPLAIN'			=> 'Submissions faster than this time are ignored by the board. Use 0 to disable.',
 	'FORM_SID_GUESTS'				=> 'Tie forms to guest sessions',
 	'FORM_SID_GUESTS_EXPLAIN'		=> 'If enabled, the form token issued to guests will be session-exclusive. This can cause problems with some ISPs.',
 	'FORWARDED_FOR_VALID'			=> 'Validated <var>X_FORWARDED_FOR</var> header',
@@ -386,12 +380,17 @@ $lang = array_merge($lang, array(
 	'MAX_LOGIN_ATTEMPTS'			=> 'Maximum number of login attempts',
 	'MAX_LOGIN_ATTEMPTS_EXPLAIN'	=> 'After this number of failed logins the user needs to additionally confirm his login visually (visual confirmation).',
 	'NO_IP_VALIDATION'				=> 'None',
+	'NO_REF_VALIDATION'				=> 'None',
 	'PASSWORD_TYPE'					=> 'Password complexity',
 	'PASSWORD_TYPE_EXPLAIN'			=> 'Determines how complex a password needs to be when set or altered, subsequent options include the previous ones.',
 	'PASS_TYPE_ALPHA'				=> 'Must contain letters and numbers',
 	'PASS_TYPE_ANY'					=> 'No requirements',
 	'PASS_TYPE_CASE'				=> 'Must be mixed case',
 	'PASS_TYPE_SYMBOL'				=> 'Must contain symbols',
+	'REF_HOST'						=> 'Only validate host',
+	'REF_PATH'						=> 'Also validate path',
+	'REFERER_VALID'					=> 'Validate Referer',
+	'REFERER_VALID_EXPLAIN'			=> 'If enabled, the referer of POST requests will be checked against the host/script path settings. This may cause issues with boards using several domains and or external logins.',
 	'TPL_ALLOW_PHP'					=> 'Allow php in templates',
 	'TPL_ALLOW_PHP_EXPLAIN'			=> 'If this option is enabled, <code>PHP</code> and <code>INCLUDEPHP</code> statements will be recognised and parsed in templates.',
 ));
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index f380b1f570..85c57fb1c3 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -608,6 +608,7 @@ $lang = array_merge($lang, array(
 	'LOG_REASON_REMOVED'	=> '<strong>Removed report/denial reason</strong><br />» %s',
 	'LOG_REASON_UPDATED'	=> '<strong>Updated report/denial reason</strong><br />» %s',
 
+	'LOG_REFERER_INVALID'		=> '<strong>Referer validation failed</strong><br />»Referer was “<em>%1$s</em>”. The request was rejected and the session killed.',
 	'LOG_RESET_DATE'			=> '<strong>Board start date reset</strong>',
 	'LOG_RESET_ONLINE'			=> '<strong>Most users online reset</strong>',
 	'LOG_RESYNC_POSTCOUNTS'		=> '<strong>User post counts resynchronised</strong>',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 8e739206c5..0895dd23eb 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -78,6 +78,7 @@ $lang = array_merge($lang, array(
 	'ATTACHED_IMAGE_NOT_IMAGE'		=> 'The image file you tried to attach is invalid.',
 	'AUTHOR'						=> 'Author',
 	'AUTH_NO_PROFILE_CREATED'		=> 'The creation of a user profile was unsuccessful.',
+	'AVATAR_DISALLOWED_CONTENT'		=> 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
 	'AVATAR_DISALLOWED_EXTENSION'	=> 'This file cannot be displayed because the extension <strong>%s</strong> is not allowed.',
 	'AVATAR_EMPTY_REMOTE_DATA'		=> 'The specified avatar could not be uploaded because the remote data appears to be invalid or corrupted.',
 	'AVATAR_EMPTY_FILEUPLOAD'		=> 'The uploaded avatar file is empty.',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 76878c8f7c..f75837e96f 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -82,6 +82,7 @@ $lang = array_merge($lang, array(
 	'DISABLE_BBCODE'			=> 'Disable BBCode',
 	'DISABLE_MAGIC_URL'			=> 'Do not automatically parse URLs',
 	'DISABLE_SMILIES'			=> 'Disable smilies',
+	'DISALLOWED_CONTENT'		=> 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
 	'DISALLOWED_EXTENSION'		=> 'The extension %s is not allowed.',
 	'DRAFT_LOADED'				=> 'Draft loaded into posting area, you may want to finish your post now.<br />Your draft will be deleted after submitting this post.',
 	'DRAFT_LOADED_PM'			=> 'Draft loaded into message area, you may want to finish your private message now.<br />Your draft will be deleted after submitting this private message.',
-- 
cgit v1.2.1


From 98dadd5eb84ba4cf6ccdcde3783a4366fa2cc1d9 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Thu, 29 May 2008 14:07:55 +0000
Subject: merge

git-svn-id: file:///svn/phpbb/trunk@8575 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/memberlist.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index ad4dd83ca4..b5b8434776 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -132,6 +132,7 @@ $lang = array_merge($lang, array(
 
 	'USERNAME_BEGINS_WITH'	=> 'Username begins with',
 	'USER_ADMIN'			=> 'Administrate user',
+	'USER_BAN'				=> 'Banning',
 	'USER_FORUM'			=> 'User statistics',
 	'USER_ONLINE'			=> 'Online',
 	'USER_PRESENCE'			=> 'Board presence',
-- 
cgit v1.2.1


From 65fb840b761cb04d52bd03ef0d5ed20053ae16ba Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Tue, 3 Jun 2008 16:33:02 +0000
Subject: merge

git-svn-id: file:///svn/phpbb/trunk@8587 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/common.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 85c57fb1c3..41ade70855 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -201,6 +201,9 @@ $lang = array_merge($lang, array(
 	'ADMIN_INDEX'			=> 'Admin index',
 	'ADMIN_PANEL'			=> 'Administration Control Panel',
 
+	'ADM_LOGOUT'			=> 'ACP Logout',
+	'ADM_LOGGED_OUT'		=> 'Successfully logged out from Administration Control Panel',
+
 	'BACK'					=> 'Back',
 
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
@@ -236,6 +239,7 @@ $lang = array_merge($lang, array(
 	'LOOK_UP_FORUM'			=> 'Select a forum',
 	'LOOK_UP_FORUMS_EXPLAIN'=> 'You are able to select more than one forum.',
 
+	'LOGIN_REDIRECT'		=> 'You have been successfully logged in.',
 	'MANAGE'				=> 'Manage',
 	'MENU_TOGGLE'			=> 'Hide or display the side menu',
 	'MOVE_DOWN'				=> 'Move down',
-- 
cgit v1.2.1


From 150c6c4c245ac2728bca78aee998da9fe8ca7bb8 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Wed, 4 Jun 2008 15:38:14 +0000
Subject: removed executable props [Bug #6464]

git-svn-id: file:///svn/phpbb/trunk@8599 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/install.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 phpBB/language/en/install.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
old mode 100755
new mode 100644
-- 
cgit v1.2.1


From d7a217c28cbe4a91cecbb0b0e329402527463ca8 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 9 Jun 2008 13:06:14 +0000
Subject: #16124

git-svn-id: file:///svn/phpbb/trunk@8635 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/groups.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 714cbe7f0d..f74110a7d3 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -108,6 +108,7 @@ $lang = array_merge($lang, array(
 	'NO_PERMISSIONS'			=> 'Do not copy permissions',
 	'NO_USERS'					=> 'You haven’t entered any users.',
 	'NO_USERS_ADDED'			=> 'No users were added to the group.',
+	'NO_VALID_USERS'			=> 'You haven’t entered any users eligible for that action.',
 
 	'SPECIAL_GROUPS'			=> 'Pre-defined groups',
 	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
-- 
cgit v1.2.1


From aeb36226c04722ca38a7daed6fddf6a3bbbed749 Mon Sep 17 00:00:00 2001
From: "Marek A. R" <aptx@phpbb.com>
Date: Wed, 18 Jun 2008 21:32:58 +0000
Subject: Change 5.1.0 to 5.2.0

git-svn-id: file:///svn/phpbb/trunk@8659 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index a6703f4337..bfb71a20f0 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -299,10 +299,10 @@ $lang = array_merge($lang, array(
 	'PHP_REGISTER_GLOBALS_EXPLAIN'	=> 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.',
 	'PHP_SAFE_MODE'					=> 'Safe mode',
 	'PHP_SETTINGS'					=> 'PHP version and settings',
-	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.1.0 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
+	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.2.0 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
 	'PHP_URL_FOPEN_SUPPORT'			=> 'PHP setting <var>allow_url_fopen</var> is enabled',
 	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it. ',
-	'PHP_VERSION_REQD'				=> 'PHP version >= 5.1.0',
+	'PHP_VERSION_REQD'				=> 'PHP version >= 5.2.0',
 	'POST_ID'						=> 'Post ID',
 	'PREFIX_FOUND'					=> 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
 	'PREPROCESS_STEP'				=> 'Executing pre-processing functions/queries',
-- 
cgit v1.2.1


From d8f2c4a1c4468440cf6c8657891e179bf7d222f5 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 28 Jul 2008 13:21:53 +0000
Subject: add warning to ACP index if config file is writeable

git-svn-id: file:///svn/phpbb/trunk@8689 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/common.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 41ade70855..db59100915 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -269,7 +269,7 @@ $lang = array_merge($lang, array(
 	'SELECT_OPTION'			=> 'Select option',
 
 	'SETTING_TOO_LOW'		=> 'The entered value for the setting “%1$s” is too low. The minimal allowed value is %2$d.',
-	'SETTING_TOO_BIG'		=> 'The entered value for the setting “%1$s” is too big. The maximal allowed value is %2$d.',	
+	'SETTING_TOO_BIG'		=> 'The entered value for the setting “%1$s” is too big. The maximal allowed value is %2$d.',
 	'SETTING_TOO_LONG'		=> 'The entered value for the setting “%1$s” is too long. The maximal allowed length is %2$d.',
 	'SETTING_TOO_SHORT'		=> 'The entered value for the setting “%1$s” is not long enough. The minimal allowed length is %2$d.',
 
@@ -363,6 +363,7 @@ $lang = array_merge($lang, array(
 	'VIEW_INACTIVE_USERS'	=> 'View inactive users',
 
 	'WELCOME_PHPBB'			=> 'Welcome to phpBB',
+	'WRITEABLE_CONFIG'		=> 'Your config file (config.php) is currently world-writeable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
 ));
 
 // Inactive Users
-- 
cgit v1.2.1


From e9b2e6174e6f26208595a40c69b5448369c27f54 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Tue, 29 Jul 2008 14:56:40 +0000
Subject: Add VST

git-svn-id: file:///svn/phpbb/trunk@8715 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 0895dd23eb..9b3c60319b 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -731,6 +731,7 @@ $lang = array_merge($lang, array(
 		'-7'	=> 'UTC - 7 hours',
 		'-6'	=> 'UTC - 6 hours',
 		'-5'	=> 'UTC - 5 hours',
+		'-4.5'	=> 'UTC - 4:30 hours',
 		'-4'	=> 'UTC - 4 hours',
 		'-3.5'	=> 'UTC - 3:30 hours',
 		'-3'	=> 'UTC - 3 hours',
@@ -774,6 +775,7 @@ $lang = array_merge($lang, array(
 		'-7'	=> '[UTC - 7] Mountain Standard Time',
 		'-6'	=> '[UTC - 6] Central Standard Time',
 		'-5'	=> '[UTC - 5] Eastern Standard Time',
+		'-4.5'	=> '[UTC - 4:30] Venezuelan Standard Time',
 		'-4'	=> '[UTC - 4] Atlantic Standard Time',
 		'-3.5'	=> '[UTC - 3:30] Newfoundland Standard Time',
 		'-3'	=> '[UTC - 3] Amazon Standard Time, Central Greenland Time',
-- 
cgit v1.2.1


From 6eed0e5bd2ace03c027a6c02ca3af3f0cde6cb58 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 13 Aug 2008 12:28:17 +0000
Subject: merge

git-svn-id: file:///svn/phpbb/trunk@8744 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/posting.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index ebde75cfaa..66ce911ff6 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -47,6 +47,8 @@ $lang = array_merge($lang, array(
 	'BBCODE_HELPLINE'			=> 'Help line',
 	'BBCODE_HELPLINE_EXPLAIN'	=> 'This field contains the mouse over text of the BBCode.',
 	'BBCODE_HELPLINE_TEXT'		=> 'Help line text',
+	'BBCODE_HELPLINE_TOO_LONG'	=> 'The help line you entered is too long.',
+
 	'BBCODE_INVALID_TAG_NAME'	=> 'The BBCode tag name that you selected already exists.',
 	'BBCODE_INVALID'			=> 'Your BBCode is constructed in an invalid form.',
 	'BBCODE_OPEN_ENDED_TAG'		=> 'Your custom BBCode must contain both an opening and a closing tag.',
-- 
cgit v1.2.1


From f741c4ff0572cdb621ddd6312c8ccf79c56b850e Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Thu, 14 Aug 2008 12:49:11 +0000
Subject: merge

git-svn-id: file:///svn/phpbb/trunk@8757 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/email/group_request.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/group_request.txt b/phpBB/language/en/email/group_request.txt
index 85664857dd..75840831fb 100644
--- a/phpBB/language/en/email/group_request.txt
+++ b/phpBB/language/en/email/group_request.txt
@@ -2,7 +2,7 @@ Subject: A request to join your group has been made
 
 Dear {USERNAME},
 
-A user has requested to join the group "{GROUP_NAME}" you moderate on "{SITENAME}".
+The user "{REQUEST_USERNAME}" has requested to join the group "{GROUP_NAME}" you moderate on "{SITENAME}".
 To approve or deny this request for group membership please visit the following link:
 
 {U_PENDING}
-- 
cgit v1.2.1


From 15e04808fc3a6699ac857c2252cce70090df80ba Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 16 Aug 2008 13:11:50 +0000
Subject: writeable -> writable merge

git-svn-id: file:///svn/phpbb/trunk@8762 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index db59100915..b6a985d9d6 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -363,7 +363,7 @@ $lang = array_merge($lang, array(
 	'VIEW_INACTIVE_USERS'	=> 'View inactive users',
 
 	'WELCOME_PHPBB'			=> 'Welcome to phpBB',
-	'WRITEABLE_CONFIG'		=> 'Your config file (config.php) is currently world-writeable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
+	'WRITABLE_CONFIG'		=> 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
 ));
 
 // Inactive Users
-- 
cgit v1.2.1


From 3a3b9eb8efe08f086bcbd1d88a34355e31df7650 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Thu, 21 Aug 2008 15:50:21 +0000
Subject: merge

git-svn-id: file:///svn/phpbb/trunk@8776 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/common.php    | 2 ++
 phpBB/language/en/viewtopic.php | 1 +
 2 files changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 9b3c60319b..e62afdb199 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -169,6 +169,8 @@ $lang = array_merge($lang, array(
 	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
 	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
 	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
+	'ERR_UNWATCHING'					=> 'An error occured while trying to unsubscribe.',
+	'ERR_WATCHING'						=> 'An error occured while trying to subscribe.',
 	'ERR_WRONG_PATH_TO_PHPBB'			=> 'The phpBB path specified appears to be invalid.',
 	'EXPAND_VIEW'						=> 'Expand view',
 	'EXTENSION'							=> 'Extension',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 337a21c11f..4252fa7542 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -40,6 +40,7 @@ $lang = array_merge($lang, array(
 	'ATTACHMENT_FUNCTIONALITY_DISABLED'	=> 'The attachments feature has been disabled.',
 
 	'BOOKMARK_ADDED'		=> 'Bookmarked topic successfully.',
+	'BOOKMARK_ERR'			=> 'Bookmarking the topic failed. Please try again.',
 	'BOOKMARK_REMOVED'		=> 'Removed bookmarked topic successfully.',
 	'BOOKMARK_TOPIC'		=> 'Bookmark topic',
 	'BOOKMARK_TOPIC_REMOVE'	=> 'Remove from bookmarks',
-- 
cgit v1.2.1


From 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Thu, 4 Sep 2008 11:39:25 +0000
Subject: Remove caching of templates from the database completely, themes is
 cut down ready for a complete chop, and fix the installer :)

git-svn-id: file:///svn/phpbb/trunk@8812 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/styles.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index a6333fcba0..4b13d62ace 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -64,7 +64,6 @@ $lang = array_merge($lang, array(
 	'CACHE_MODIFIED'				=> 'Modified',
 	'CONFIRM_IMAGESET_REFRESH'		=> 'Are you sure you wish to refresh all imageset data? The settings from the imageset configuration file will overwrite all modifications to the imageset which have been carried out with the imageset editor.',
 	'CONFIRM_TEMPLATE_CLEAR_CACHE'	=> 'Are you sure you wish to clear all cached versions of your template files?',
-	'CONFIRM_TEMPLATE_REFRESH'		=> 'Are you sure you wish to refresh all template data in the database with the contents of the template files on the filesystem? This will overwrite all modifications which have been carried out with the template editor while the template was stored in the database.',
 	'CONFIRM_THEME_REFRESH'			=> 'Are you sure you wish to refresh the theme data stored in the database with the contents of the theme on the filesystem? This will overwrite all modifications which have been carried out with the theme editor while the theme was stored in the database.',
 	'COPYRIGHT'						=> 'Copyright',
 	'CREATE_IMAGESET'				=> 'Create new imageset',
@@ -98,7 +97,6 @@ $lang = array_merge($lang, array(
 	'EDIT_IMAGESET_EXPLAIN'				=> 'Here you can edit the individual images which define the imageset. You can also specify dimensions for the image. Dimensions are optional, specifying them can overcome certain rendering issues with some browsers. By not specifying them you reduce the size of the database record a little.',
 	'EDIT_TEMPLATE'						=> 'Edit template',
 	'EDIT_TEMPLATE_EXPLAIN'				=> 'Here you can edit your template set directly. Please remember that these edits are permanent and cannot be undone once submitted. If PHP can write to the template files in your styles directory any changes here will be written directly to those files. If PHP cannot write to those files they will be copied into the database and all changes will only be reflected there. Please take care when editing your template set, remember to close all replacement variable terms {XXXX} and conditional statements.',
-	'EDIT_TEMPLATE_STORED_DB'			=> 'The template file was unwritable so the template set is now stored in the database containing the modified file.',
 	'EDIT_THEME'						=> 'Edit theme',
 	'EDIT_THEME_EXPLAIN'				=> 'Here you can edit the selected theme, changing colours, images, etc.',
 	'EDIT_THEME_STORED_DB'				=> 'The stylesheet file was unwritable so the stylesheet is now stored in the database containing your modification.',
@@ -358,7 +356,6 @@ $lang = array_merge($lang, array(
 	'STYLE_USED_BY'				=> 'Used by (including robots)',
 
 	'TEMPLATE_ADDED'			=> 'Template set added and stored on filesystem.',
-	'TEMPLATE_ADDED_DB'			=> 'Template set added and stored in database.',
 	'TEMPLATE_CACHE'			=> 'Template cache',
 	'TEMPLATE_CACHE_EXPLAIN'	=> 'By default phpBB caches the compiled version of its templates. This decreases the load on the server each time a page is viewed and thus may reduce the page generation time. Here you can view the cache status of each file and delete individual files or the entire cache.',
 	'TEMPLATE_CACHE_CLEARED'	=> 'Template cache cleared successfully.',
@@ -384,7 +381,6 @@ $lang = array_merge($lang, array(
 	'TEMPLATE_LOCATION'			=> 'Store templates in',
 	'TEMPLATE_LOCATION_EXPLAIN'	=> 'Images are always stored on the filesystem.',
 	'TEMPLATE_NAME'				=> 'Template name',
-	'TEMPLATE_REFRESHED'		=> 'Template refreshed successfully.',
 
 	'THEME_ADDED'				=> 'New theme added on filesystem.',
 	'THEME_ADDED_DB'			=> 'New theme added to database.',
-- 
cgit v1.2.1


From 44416f4744b9a55e35c7945a13759d3e7d71fd3d Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 4 Sep 2008 14:04:30 +0000
Subject: - queue trigger feature - queued posts do not affect user_posts -
 show links to MCP + queued posts in ucp and acp

git-svn-id: file:///svn/phpbb/trunk@8816 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/board.php | 5 +++++
 phpBB/language/en/common.php    | 7 +++++++
 2 files changed, 12 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index ae122c54ee..b0cbc7e184 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -137,6 +137,11 @@ $lang = array_merge($lang, array(
 	'ALLOW_POST_FLASH'					=> 'Allow use of <code>[FLASH]</code> BBCode tag in posts',
 	'ALLOW_POST_FLASH_EXPLAIN'			=> 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.',
 
+	'ENABLE_QUEUE_TRIGGER'			=> 'Enable queued posts',
+	'ENABLE_QUEUE_TRIGGER_EXPLAIN'	=> 'Ability to put registered users posts to post approval if their post count is lower than the specified value below. This setting has no effect on the permission setting for post/topic approval.',
+	'QUEUE_TRIGGER_POSTS'			=> 'Maximum post count for queued posts',
+	'QUEUE_TRIGGER_POSTS_EXPLAIN'	=> 'If queued posts is enabled, this is the post count the user need to reach in order to post without post approval. If the users post count is below this number, the post is stored in the queue automatically.',
+
 	'BUMP_INTERVAL'					=> 'Bump interval',
 	'BUMP_INTERVAL_EXPLAIN'			=> 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.',
 	'CHAR_LIMIT'					=> 'Maximum characters per post',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index e62afdb199..de9f8695f8 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -390,6 +390,13 @@ $lang = array_merge($lang, array(
 	'NO_USERS'					=> 'The requested users do not exist.',
 	'NO_USER_SPECIFIED'			=> 'No username was specified.',
 
+	// Nullar/Singular/Plural language entry. The key numbers define the number range in which a certain grammatical expression is valid.
+	'NUM_POSTS_IN_QUEUE'		=> array(
+		0			=> 'No posts in queue',		// 0
+		1			=> '1 post in queue',		// 1
+		2			=> '%d posts in queue',		// 2+
+	),
+
 	'OCCUPATION'				=> 'Occupation',
 	'OFFLINE'					=> 'Offline',
 	'ONLINE'					=> 'Online',
-- 
cgit v1.2.1


From a32f3a67095327dc3e75c01ba21bbb90ad479c83 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Fri, 5 Sep 2008 13:49:04 +0000
Subject: Merge in r8827

git-svn-id: file:///svn/phpbb/trunk@8828 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 4f9920c931..1f0002923d 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -288,6 +288,7 @@ $lang = array_merge($lang, array(
 	'NO_AUTH_EDIT_MESSAGE'			=> 'You are not authorised to edit private messages.',
 	'NO_AUTH_FORWARD_MESSAGE'		=> 'You are not authorised to forward private messages.',
 	'NO_AUTH_GROUP_MESSAGE'			=> 'You are not authorised to send private messages to groups.',
+	'NO_AUTH_READ_HOLD_MESSAGE'		=> 'You are not authorised to read private messages that are on hold.',
 	'NO_AUTH_READ_MESSAGE'			=> 'You are not authorised to read private messages.',
 	'NO_AUTH_READ_REMOVED_MESSAGE'	=> 'You are not able to read this message because it was removed by the author.',
 	'NO_AUTH_SEND_MESSAGE'			=> 'You are not authorised sending private messages.',
-- 
cgit v1.2.1


From 0e0100c5255dd288cc479274a112e4eb42a4bacf Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Mon, 8 Sep 2008 13:39:34 +0000
Subject: merge r8829, r8830, r8831, r8832, r8833, r8834, r8835, r8836, r8837,
 r8838

git-svn-id: file:///svn/phpbb/trunk@8839 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/board.php | 2 +-
 phpBB/language/en/ucp.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index b0cbc7e184..21343895e9 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -283,7 +283,7 @@ $lang = array_merge($lang, array(
 	'YES_ANON_READ_MARKING'			=> 'Enable topic marking for guests',
 	'YES_ANON_READ_MARKING_EXPLAIN'	=> 'Stores read/unread status information for guests. If disabled posts are always read for guests.',
 	'YES_BIRTHDAYS'					=> 'Enable birthday listing',
-	'YES_BIRTHDAYS_EXPLAIN'			=> 'If disabled the birthday listing is no longer displayed. To let this setting take effect the birthday feature need to be enabled too.',
+	'YES_BIRTHDAYS_EXPLAIN'			=> 'If disabled the birthday listing is no longer displayed. To let this setting take effect the birthday feature needs to be enabled too.',
 	'YES_JUMPBOX'					=> 'Enable display of jumpbox',
 	'YES_MODERATORS'				=> 'Enable display of moderators',
 	'YES_ONLINE'					=> 'Enable online user listings',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 1f0002923d..6f262b980a 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -50,7 +50,7 @@ $lang = array_merge($lang, array(
 	<br />
 	We may also create cookies external to the phpBB software whilst browsing “%1$s”, though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”) and posts submitted by you after registration and whilst logged in (hereinafter “your posts”).<br />
 	<br />
-	Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid e-mail address (hereinafter “your e-mail”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password and your e-mail required by “%1$s” during the registration process are at our digression what is mandatory and what is optional. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated e-mails from the phpBB software.<br />
+	Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid e-mail address (hereinafter “your e-mail”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password, and your e-mail address required by “%1$s” during the registration process is either mandatory or optional, at the discretion of “%1$s”. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated e-mails from the phpBB software.<br />
 	<br />
 	Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your e-mail, then the phpBB software will generate a new password to reclaim your account.<br />
 	',
-- 
cgit v1.2.1


From 2eeeaadcfdb710d14cacca46e0c573e1e1d372f1 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 16 Sep 2008 13:21:12 +0000
Subject: emails to e-mails

git-svn-id: file:///svn/phpbb/trunk@8856 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 21343895e9..81d2504a1c 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -415,7 +415,7 @@ $lang = array_merge($lang, array(
 	'EMAIL_FUNCTION_NAME'			=> 'E-mail function name',
 	'EMAIL_FUNCTION_NAME_EXPLAIN'	=> 'The e-mail function used to send mails through PHP.',
 	'EMAIL_PACKAGE_SIZE'			=> 'E-mail package size',
-	'EMAIL_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of maximum e-mails sent out in one package. This setting is applied to the internal message queue; set this value to 0 if you have problems with non-delivered notification emails.',
+	'EMAIL_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of maximum e-mails sent out in one package. This setting is applied to the internal message queue; set this value to 0 if you have problems with non-delivered notification e-mails.',
 	'EMAIL_SIG'						=> 'E-mail signature',
 	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all e-mails the board sends.',
 	'ENABLE_EMAIL'					=> 'Enable board-wide e-mails',
-- 
cgit v1.2.1


From 461be11e8d0f5d4bd879cf95bd1472dbe985e0b6 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 19 Sep 2008 13:17:30 +0000
Subject: Okay, that is pretty raw, but better to have it in place than trying
 to play catch-up. Introducing an early stage of CAPTCHA modules.

git-svn-id: file:///svn/phpbb/trunk@8889 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/board.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 81d2504a1c..e61f04904b 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -230,8 +230,9 @@ $lang = array_merge($lang, array(
 
 // Visual Confirmation Settings
 $lang = array_merge($lang, array(
-	'ACP_VC_SETTINGS_EXPLAIN'		=> 'Here you are able to define visual confirmation defaults and CAPTCHA settings.',
-
+	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you are able to define visual confirmation defaults and CAPTCHA settings.',
+	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
+	'CAPTCHA_UNAVAILABLE'					=> 'The CAPTCHA cannot be selected as its requirements are not met.',
 	'CAPTCHA_GD'							=> 'GD CAPTCHA',
 	'CAPTCHA_GD_FOREGROUND_NOISE'			=> 'GD CAPTCHA foreground noise',
 	'CAPTCHA_GD_EXPLAIN'					=> 'Use GD to make a more advanced CAPTCHA.',
@@ -241,8 +242,17 @@ $lang = array_merge($lang, array(
 	'CAPTCHA_GD_Y_GRID'						=> 'GD CAPTCHA background noise y-axis',
 	'CAPTCHA_GD_Y_GRID_EXPLAIN'				=> 'Use lower settings of this to make the GD based CAPTCHA harder. 0 will disable y-axis background noise.',
 
+	'CAPTCHA_NO_GD'							=> 'CAPTCHA without GD',
+
 	'CAPTCHA_PREVIEW_MSG'					=> 'Your changes to the visual confirmation setting were not saved. This is just a preview.',
-	'CAPTCHA_PREVIEW_EXPLAIN'				=> 'The CAPTCHA as it will look like using the current settings. Use the preview button to refresh. Note that captchas are randomized and will differ from one view to the next.',
+	'CAPTCHA_PREVIEW_EXPLAIN'				=> 'The CAPTCHA as it would look like using the current selection.',
+	
+	'CAPTCHA_SELECT'						=> 'Installed CAPTCHA plugins',
+	'CAPTCHA_SELECT_EXPLAIN'				=> 'The dropdown holds the CAPTCHA plugins recognized by the board. Gray entries are not available right now and might need configuration prior to use.',
+	'CAPTCHA_CONFIGURE'						=> 'Configure CAPTCHAs',
+	'CAPTCHA_CONFIGURE_EXPLAIN'				=> 'Change the settings for the selected CAPTCHA.',
+	'CONFIGURE'								=> 'Configure',
+	'CAPTCHA_NO_OPTIONS'					=> 'This CAPTCHA has no configuration options.',
 	'VISUAL_CONFIRM_POST'					=> 'Enable visual confirmation for guest postings',
 	'VISUAL_CONFIRM_POST_EXPLAIN'			=> 'Requires anonymous users to enter a random code matching an image to help prevent mass postings.',
 	'VISUAL_CONFIRM_REG'					=> 'Enable visual confirmation for registrations',
-- 
cgit v1.2.1


From 8fd7f1664265276917550f3092d2347d3388ce55 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 19 Sep 2008 17:00:26 +0000
Subject: language correction (Bug #23955)

git-svn-id: file:///svn/phpbb/trunk@8897 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/help_faq.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 354d432d51..89ac845021 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -120,7 +120,7 @@ $help = array(
 	),
 	array(
 		0 => 'How do I add a signature to my post?',
-		1 => 'To add a signature to a post you must first create one via your User Control Panel. Once created, you can check the <em>Add signature</em> box on the posting form to add your signature. You can also add a signature by default to all your posts by checking the appropriate radio button in your profile. If you do so, you can still prevent a signature being added to individual posts by un-checking the add signature box within the posting form.'
+		1 => 'To add a signature to a post you must first create one via your User Control Panel. Once created, you can check the <em>Attach a signature</em> box on the posting form to add your signature. You can also add a signature by default to all your posts by checking the appropriate radio button in your profile. If you do so, you can still prevent a signature being added to individual posts by un-checking the add signature box within the posting form.'
 	),
 	array(
 		0 => 'How do I create a poll?',
-- 
cgit v1.2.1


From 0f14f278d0fa9d765bb141ab79242a34fa73a883 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 22 Sep 2008 12:37:42 +0000
Subject: fixing some vC bugs (attempt counting and posting) and introducing
 prototype for reCaptcha

git-svn-id: file:///svn/phpbb/trunk@8903 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/recaptcha.php | 51 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 phpBB/language/en/recaptcha.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/recaptcha.php b/phpBB/language/en/recaptcha.php
new file mode 100644
index 0000000000..140e300b7b
--- /dev/null
+++ b/phpBB/language/en/recaptcha.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* recaptcha [English]
+*
+* @package language
+* @version $Id: groups.php 8477 2008-03-29 00:08:34Z naderman $
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'RECAPTCHA_LANG'				=> 'en',
+	'RECAPTCHA_NOT_AVAILABLE'		=> 'You have to register for reCaptcha at <a href="http://recaptcha.net">reCaptcha.net</a>.',
+	'CAPTCHA_RECAPTCHA'				=> 'reCaptcha',
+	'RECAPTCHA_INCORRECT'			=> 'The entered visual confirmation was incorrect',
+
+	'RECAPTCHA_PUBLIC'				=> 'Public reCaptcha key',
+	'RECAPTCHA_PUBLIC_EXPLAIN'		=> 'Your public reCaptcha key. You can obtain keys from <a href="http://recaptcha.net">reCaptcha.net</a>.',
+	'RECAPTCHA_PRIVATE'				=> 'Private reCaptcha key',
+	'RECAPTCHA_PRIVATE_EXPLAIN'		=> 'Your private reCaptcha key. You can obtain keys from <a href="http://recaptcha.net">reCaptcha.net</a>.',
+
+));
+
+?>
\ No newline at end of file
-- 
cgit v1.2.1


From b486710ea127ca055ac1cb117f056e837a32370f Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Tue, 23 Sep 2008 12:56:34 +0000
Subject: Merge in r8843, r8908, r8909

git-svn-id: file:///svn/phpbb/trunk@8910 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index b6a985d9d6..a6df7102f0 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -480,7 +480,7 @@ $lang = array_merge($lang, array(
 	'LOG_LOCK'					=> '<strong>Locked topic</strong><br />» %s',
 	'LOG_LOCK_POST'				=> '<strong>Locked post</strong><br />» %s',
 	'LOG_MERGE'					=> '<strong>Merged posts</strong> into topic<br />» %s',
-	'LOG_MOVE'					=> '<strong>Moved topic</strong><br />» from %s',
+	'LOG_MOVE'					=> '<strong>Moved topic</strong><br />» from %1$s to %2$s',
 	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br />» %s',
 	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” with the following reason</strong><br />» %2$s',
 	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
-- 
cgit v1.2.1


From ce6b87ccec8a92c5455871446f88b122019672e9 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 23 Sep 2008 13:11:34 +0000
Subject: - Automatically add users/groups to the PM recipient list, if entered
 or selected. - Reply to PM now includes all previous recipients and not only
 the original sender. - Added 'max_recipients' setting for private messages.
 This setting allows admins to define the maximum number of recipients per
 private message with a board-wide setting and a group-specific setting. -
 Added new permission setting for sending private messages to groups. Now
 there are two permissions to define sending private messages to multiple
 recipients and private messages to groups.

git-svn-id: file:///svn/phpbb/trunk@8914 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/board.php             | 3 +++
 phpBB/language/en/acp/groups.php            | 2 ++
 phpBB/language/en/acp/permissions_phpbb.php | 3 ++-
 phpBB/language/en/ucp.php                   | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index e61f04904b..77e04e61c4 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -113,6 +113,7 @@ $lang = array_merge($lang, array(
 	'ALLOW_FORWARD_PM'			=> 'Allow forwarding of private messages',
 	'ALLOW_IMG_PM'				=> 'Allow use of <code>[IMG]</code> BBCode tag',
 	'ALLOW_MASS_PM'				=> 'Allow sending of private messages to multiple users and groups',
+	'ALLOW_MASS_PM_EXPLAIN'		=> 'Sending to groups can be adjusted per group within the group settings page.',
 	'ALLOW_PRINT_PM'			=> 'Allow print view in private messaging',
 	'ALLOW_QUOTE_PM'			=> 'Allow quotes in private messages',
 	'ALLOW_SIG_PM'				=> 'Allow signature in private messages',
@@ -127,6 +128,8 @@ $lang = array_merge($lang, array(
 	'HOLD_NEW_MESSAGES'			=> 'Hold new messages',
 	'PM_EDIT_TIME'				=> 'Limit editing time',
 	'PM_EDIT_TIME_EXPLAIN'		=> 'Limits the time available to edit a private message not already delivered. Setting the value to 0 disables this behaviour.',
+	'PM_MAX_RECIPIENTS'			=> 'Maximum number of allowed recipients',
+	'PM_MAX_RECIPIENTS_EXPLAIN'	=> 'The maximum number of allowed recipients in a private message. If 0 is entered, an unlimited number is allowed. This setting can be adjusted for every group within the group settings page.',
 ));
 
 // Post Settings
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index f74110a7d3..db6f334540 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -86,6 +86,8 @@ $lang = array_merge($lang, array(
 	'GROUP_NAME_TAKEN'				=> 'The group name you entered is already in use, please select an alternative.',
 	'GROUP_OPEN'					=> 'Open',
 	'GROUP_PENDING'					=> 'Pending members',
+	'GROUP_MAX_RECIPIENTS'			=> 'Maximum number of allowed recipients per private message',
+	'GROUP_MAX_RECIPIENTS_EXPLAIN'	=> 'The maximum number of allowed recipients in a private message. If 0 is entered, the board-wide setting is used.',
 	'GROUP_PROMOTE'					=> 'Promote to group leader',
 	'GROUP_RANK'					=> 'Group rank',
 	'GROUP_RECEIVE_PM'				=> 'Group able to receive private messages',
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 8f090667b4..c8ccc0e56a 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -111,7 +111,8 @@ $lang = array_merge($lang, array(
 	'acl_u_sig'			=> array('lang' => 'Can use signature', 'cat' => 'post'),
 
 	'acl_u_sendpm'		=> array('lang' => 'Can send private messages', 'cat' => 'pm'),
-	'acl_u_masspm'		=> array('lang' => 'Can send pm to multiple users and groups', 'cat' => 'pm'),
+	'acl_u_masspm'		=> array('lang' => 'Can send messages to multiple users', 'cat' => 'pm'),
+	'acl_u_masspm_group'=> array('lang' => 'Can send messages to groups', 'cat' => 'pm'),
 	'acl_u_readpm'		=> array('lang' => 'Can read private messages', 'cat' => 'pm'),
 	'acl_u_pm_edit'		=> array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
 	'acl_u_pm_delete'	=> array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 6f262b980a..79026af56f 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -391,7 +391,7 @@ $lang = array_merge($lang, array(
 
 	'TIMEZONE'					=> 'Timezone',
 	'TO'						=> 'To',
-	'TOO_MANY_RECIPIENTS'		=> 'Too many recipients.',
+	'TOO_MANY_RECIPIENTS'		=> 'You tried to send a private message to too many recipients.',
 	'TOO_MANY_REGISTERS'		=> 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',
 
 	'UCP'						=> 'User Control Panel',
-- 
cgit v1.2.1


From 0a4c62f12e9cfea1215150a580ca76961e1ac7f1 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Fri, 26 Sep 2008 09:28:12 +0000
Subject: Merge in r8924, r8925, r8926, r8936, r8938

git-svn-id: file:///svn/phpbb/trunk@8939 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/mcp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index f53babdc69..4172d162c3 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -292,7 +292,7 @@ $lang = array_merge($lang, array(
 	'SORT_DATE'							=> 'Date',
 	'SORT_IP'							=> 'IP address',
 	'SORT_WARNINGS'						=> 'Warnings',
-	'SPLIT_AFTER'						=> 'Split from selected post',
+	'SPLIT_AFTER'						=> 'Split topic from selected post onwards',
 	'SPLIT_FORUM'						=> 'Forum for new topic',
 	'SPLIT_POSTS'						=> 'Split selected posts',
 	'SPLIT_SUBJECT'						=> 'New topic title',
-- 
cgit v1.2.1


From c439b286e95b7d12b7c633cb4991e630d430e2ee Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Sat, 27 Sep 2008 11:45:30 +0000
Subject: Merge in r8940, r8941, r8942, r8945, r8946, r8947, r8949, r8950,
 r8951

git-svn-id: file:///svn/phpbb/trunk@8952 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/attachments.php | 6 +++---
 phpBB/language/en/acp/common.php      | 7 ++++++-
 phpBB/language/en/common.php          | 2 +-
 phpBB/language/en/mcp.php             | 1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 594eb9de33..f6369b6739 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -59,7 +59,7 @@ $lang = array_merge($lang, array(
 	'ATTACH_MAX_FILESIZE'				=> 'Maximum file size',
 	'ATTACH_MAX_FILESIZE_EXPLAIN'		=> 'Maximum size of each file, with 0 being unlimited.',
 	'ATTACH_MAX_PM_FILESIZE'			=> 'Maximum file size messaging',
-	'ATTACH_MAX_PM_FILESIZE_EXPLAIN'	=> 'Maximum drive space available per user for private message attachments, with 0 being unlimited.',
+	'ATTACH_MAX_PM_FILESIZE_EXPLAIN'	=> 'Maximum size of each file, with 0 being unlimited, attached to a private message.',
 	'ATTACH_ORPHAN_URL'					=> 'Orphan attachments',
 	'ATTACH_POST_ID'					=> 'Post ID',
 	'ATTACH_QUOTA'						=> 'Total attachment quota',
@@ -105,8 +105,8 @@ $lang = array_merge($lang, array(
 	'IMAGICK_PATH'				=> 'Imagemagick path',
 	'IMAGICK_PATH_EXPLAIN'		=> 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>.',
 
-	'MAX_ATTACHMENTS'				=> 'Max attachments per post',
-	'MAX_ATTACHMENTS_PM'			=> 'Max attachments per message',
+	'MAX_ATTACHMENTS'				=> 'Maximum number of attachments per post',
+	'MAX_ATTACHMENTS_PM'			=> 'Maximum number of attachments per private message',
 	'MAX_EXTGROUP_FILESIZE'			=> 'Maximum file size',
 	'MAX_IMAGE_SIZE'				=> 'Maximum image dimensions',
 	'MAX_IMAGE_SIZE_EXPLAIN'		=> 'Maximum size of image attachments. Set both values to 0px by 0px to disable dimension checking.',
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index a6df7102f0..146cc7a654 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -475,6 +475,7 @@ $lang = array_merge($lang, array(
 	'LOG_APPROVE_TOPIC'			=> '<strong>Approved topic</strong><br />» %s',
 	'LOG_BUMP_TOPIC'			=> '<strong>User bumped topic</strong><br />» %s',
 	'LOG_DELETE_POST'			=> '<strong>Deleted post</strong><br />» %s',
+	'LOG_DELETE_SHADOW_TOPIC'	=> '<strong>Deleted shadow topic</strong><br />» %s',
 	'LOG_DELETE_TOPIC'			=> '<strong>Deleted topic</strong><br />» %s',
 	'LOG_FORK'					=> '<strong>Copied topic</strong><br />» from %s',
 	'LOG_LOCK'					=> '<strong>Locked topic</strong><br />» %s',
@@ -489,7 +490,6 @@ $lang = array_merge($lang, array(
 	'LOG_SPLIT_DESTINATION'		=> '<strong>Moved split posts</strong><br />» to %s',
 	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br />» from %s',
 
-	'LOG_TOPIC_DELETED'			=> '<strong>Deleted topic</strong><br />» %s',
 	'LOG_TOPIC_APPROVED'		=> '<strong>Approved topic</strong><br />» %s',
 	'LOG_TOPIC_DISAPPROVED'		=> '<strong>Disapproved topic “%1$s” with the following reason</strong><br />%2$s',
 	'LOG_TOPIC_RESYNC'			=> '<strong>Resynchronised topic counters</strong><br />» %s',
@@ -689,4 +689,9 @@ $lang = array_merge($lang, array(
 	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br />» %s',
 ));
 
+// Two language keys with the same text were used in different locations
+// LOG_DELETE_TOPIC is the correct one, this line is here so that existing
+// log entries are not broken. Ensure it is included in your language file.
+$lang['LOG_TOPIC_DELETED'] = $lang['LOG_DELETE_TOPIC'];
+
 ?>
\ No newline at end of file
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index de9f8695f8..b6ab95c818 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -276,7 +276,7 @@ $lang = array_merge($lang, array(
 
 	'JABBER'				=> 'Jabber',
 	'JOINED'				=> 'Joined',
-	'JUMP_PAGE'				=> 'Enter the page number you wish to go to.',
+	'JUMP_PAGE'				=> 'Enter the page number you wish to go to',
 	'JUMP_TO'				=> 'Jump to',
 	'JUMP_TO_PAGE'			=> 'Click to jump to page…',
 
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 4172d162c3..93b694be77 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -346,6 +346,7 @@ $lang = array_merge($lang, array(
 	'USER_WARNING_ADDED'			=> 'User warned successfully.',
 
 	'VIEW_DETAILS'			=> 'View details',
+	'VIEW_POST'				=> 'View post',
 
 	'WARNED_USERS'			=> 'Warned users',
 	'WARNED_USERS_EXPLAIN'	=> 'This is a list of users with unexpired warnings issued to them.',
-- 
cgit v1.2.1


From 18bfc5e69b3709452828cb3b94d15283a992c82a Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 1 Oct 2008 10:29:27 +0000
Subject: and why not this as well?

git-svn-id: file:///svn/phpbb/trunk@8965 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/board.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 77e04e61c4..3d4e1f39c4 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -237,6 +237,7 @@ $lang = array_merge($lang, array(
 	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
 	'CAPTCHA_UNAVAILABLE'					=> 'The CAPTCHA cannot be selected as its requirements are not met.',
 	'CAPTCHA_GD'							=> 'GD CAPTCHA',
+	'CAPTCHA_GD_WAVE'						=> 'GD Wave Captcha',
 	'CAPTCHA_GD_FOREGROUND_NOISE'			=> 'GD CAPTCHA foreground noise',
 	'CAPTCHA_GD_EXPLAIN'					=> 'Use GD to make a more advanced CAPTCHA.',
 	'CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN'	=> 'Use foreground noise to make the GD based CAPTCHA harder.',
-- 
cgit v1.2.1


From 9d9d61b1a209098dc30d0905d88575a4f84cb197 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 8 Oct 2008 12:51:43 +0000
Subject: Merge revisions: r8974, r8975, r8976, r8977, r8978, r8979

git-svn-id: file:///svn/phpbb/trunk@8980 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/board.php | 4 ++--
 phpBB/language/en/install.php   | 4 ++--
 phpBB/language/en/ucp.php       | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 3d4e1f39c4..315f95c3d7 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -470,8 +470,8 @@ $lang = array_merge($lang, array(
 	'JAB_SETTINGS_CHANGED'		=> 'Jabber settings changed successfully.',
 	'JAB_USE_SSL'				=> 'Use SSL to connect',
 	'JAB_USE_SSL_EXPLAIN'		=> 'If enabled a secure connection is tried to be established. The Jabber port will be modified to 5223 if port 5222 is specified.',
-	'JAB_USERNAME'				=> 'Jabber username',
-	'JAB_USERNAME_EXPLAIN'		=> 'Specify a registered username. The username will not be checked for validity.',
+	'JAB_USERNAME'				=> 'Jabber username or JID',
+	'JAB_USERNAME_EXPLAIN'		=> 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.',
 ));
 
 ?>
\ No newline at end of file
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index bfb71a20f0..cc68e59190 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -215,7 +215,7 @@ $lang = array_merge($lang, array(
 		<li>Oracle</li>
 		<li>IBM DB2</li>
 	</ul>
-	
+
 	<p>Only those databases supported on your server will be displayed.',
 	'INSTALL_INTRO_NEXT'		=> 'To commence the installation, please press the button below.',
 	'INSTALL_LOGIN'				=> 'Login',
@@ -283,7 +283,7 @@ $lang = array_merge($lang, array(
 	'NO_LOCATION'				=> 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel',
 	'NO_TABLES_FOUND'			=> 'No tables found.',
 
-	'OVERVIEW_BODY'				=> 'Welcome to phpBB3!<br /><br />phpBB™ is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a seven year long package lineup. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="../docs/INSTALL.html">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
+	'OVERVIEW_BODY'				=> 'Welcome to phpBB3!<br /><br />phpBB™ is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="../docs/INSTALL.html">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
 
 	'PCRE_UTF_SUPPORT'				=> 'PCRE UTF-8 support',
 	'PCRE_UTF_SUPPORT_EXPLAIN'		=> 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 79026af56f..3cf8d8cce3 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -288,6 +288,7 @@ $lang = array_merge($lang, array(
 	'NO_AUTH_EDIT_MESSAGE'			=> 'You are not authorised to edit private messages.',
 	'NO_AUTH_FORWARD_MESSAGE'		=> 'You are not authorised to forward private messages.',
 	'NO_AUTH_GROUP_MESSAGE'			=> 'You are not authorised to send private messages to groups.',
+	'NO_AUTH_PASSWORD_REMINDER'		=> 'You are not authorised to request a new password.',
 	'NO_AUTH_READ_HOLD_MESSAGE'		=> 'You are not authorised to read private messages that are on hold.',
 	'NO_AUTH_READ_MESSAGE'			=> 'You are not authorised to read private messages.',
 	'NO_AUTH_READ_REMOVED_MESSAGE'	=> 'You are not able to read this message because it was removed by the author.',
-- 
cgit v1.2.1


From 746b617807048de6f768a74c6d852aeeea8f3a28 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 9 Oct 2008 15:42:08 +0000
Subject: Add two standard language items - #30885 Make sure users still get
 notifications if they set to only be notified by Jabber, but Jabber service
 disabled. (Bug #29715 - Patch by Paul)

git-svn-id: file:///svn/phpbb/trunk@8991 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/common.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b6ab95c818..cc8859d851 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -545,6 +545,8 @@ $lang = array_merge($lang, array(
 	'THE_TEAM'			=> 'The team',
 	'TIME'				=> 'Time',
 
+	'TOO_LONG'						=> 'The value you entered is too long',
+
 	'TOO_LONG_AIM'					=> 'The screenname you entered is too long.',
 	'TOO_LONG_CONFIRM_CODE'			=> 'The confirm code you entered is too long.',
 	'TOO_LONG_DATEFORMAT'			=> 'The date format you entered is too long.',
@@ -565,6 +567,8 @@ $lang = array_merge($lang, array(
 
 	'TOO_MANY_VOTE_OPTIONS'			=> 'You have tried to vote for too many options.',
 
+	'TOO_SHORT'						=> 'The value you entered is too short.',
+
 	'TOO_SHORT_AIM'					=> 'The screenname you entered is too short.',
 	'TOO_SHORT_CONFIRM_CODE'		=> 'The confirm code you entered is too short.',
 	'TOO_SHORT_DATEFORMAT'			=> 'The date format you entered is too short.',
-- 
cgit v1.2.1


From c903b453fa00871a11ea988b5e348c3a2741b251 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 2 Nov 2008 11:22:30 +0000
Subject: i had these changes sitting... must've been a merge not committed
 (and because we do not use svn 1.5 as the client version i am not able to say
 which they were)

git-svn-id: file:///svn/phpbb/trunk@9042 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/board.php | 2 +-
 phpBB/language/en/install.php   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 315f95c3d7..b9b089969e 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -381,7 +381,7 @@ $lang = array_merge($lang, array(
 	'BROWSER_VALID'					=> 'Validate browser',
 	'BROWSER_VALID_EXPLAIN'			=> 'Enables browser validation for each session improving security.',
 	'CHECK_DNSBL'					=> 'Check IP against DNS Blackhole List',
-	'CHECK_DNSBL_EXPLAIN'			=> 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: <a href="http://spamcop.net">spamcop.net</a>, <a href="http://dsbl.org">dsbl.org</a> and <a href="http://www.spamhaus.org">www.spamhaus.org</a>. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.',
+	'CHECK_DNSBL_EXPLAIN'			=> 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: <a href="http://spamcop.net">spamcop.net</a> and <a href="http://www.spamhaus.org">www.spamhaus.org</a>. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.',
 	'CLASS_B'						=> 'A.B',
 	'CLASS_C'						=> 'A.B.C',
 	'EMAIL_CHECK_MX'				=> 'Check e-mail domain for valid MX record',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index cc68e59190..de117098e2 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -404,6 +404,7 @@ $lang = array_merge($lang, array(
 	'DONE'								=> 'Done',
 	'DOWNLOAD'							=> 'Download',
 	'DOWNLOAD_AS'						=> 'Download as',
+	'DOWNLOAD_UPDATE_METHOD_BUTTON'		=> 'Download modified files archive (recommended)',
 	'DOWNLOAD_UPDATE_METHOD'			=> 'Download modified files archive',
 	'DOWNLOAD_UPDATE_METHOD_EXPLAIN'	=> 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.',
 
@@ -504,6 +505,8 @@ $lang = array_merge($lang, array(
 	'STATUS_UP_TO_DATE'			=> 'Already updated file',
 
 	'TOGGLE_DISPLAY'			=> 'View/Hide file list',
+	'TRY_DOWNLOAD_METHOD'		=> 'You may want to try the download modified files method.<br />This method always works and is also the recommended update path.',
+	'TRY_DOWNLOAD_METHOD_BUTTON'=> 'Try this method now',
 
 	'UPDATE_COMPLETED'				=> 'Update completed',
 	'UPDATE_DATABASE'				=> 'Update database',
-- 
cgit v1.2.1


From ef0c0d4c82dadfb856357f6ae906263420d84791 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Thu, 13 Nov 2008 13:04:54 +0000
Subject: been a while :( ... merge in r8997, r8998, r8999, r9000, r9001,
 r9002, r9003, r9004, r9005, r9007, r9008, r9009, r9010, r9011, r9012, r9013,
 r9014, r9015, r9022, r9023, r9029, r9030, r9034, r9048, r9049, r9054, r9056

git-svn-id: file:///svn/phpbb/trunk@9064 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/common.php | 5 -----
 phpBB/language/en/common.php     | 2 +-
 phpBB/language/en/ucp.php        | 3 ++-
 3 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 146cc7a654..8b936979ed 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -689,9 +689,4 @@ $lang = array_merge($lang, array(
 	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br />» %s',
 ));
 
-// Two language keys with the same text were used in different locations
-// LOG_DELETE_TOPIC is the correct one, this line is here so that existing
-// log entries are not broken. Ensure it is included in your language file.
-$lang['LOG_TOPIC_DELETED'] = $lang['LOG_DELETE_TOPIC'];
-
 ?>
\ No newline at end of file
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index cc8859d851..7c8de35264 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -545,7 +545,7 @@ $lang = array_merge($lang, array(
 	'THE_TEAM'			=> 'The team',
 	'TIME'				=> 'Time',
 
-	'TOO_LONG'						=> 'The value you entered is too long',
+	'TOO_LONG'						=> 'The value you entered is too long.',
 
 	'TOO_LONG_AIM'					=> 'The screenname you entered is too long.',
 	'TOO_LONG_CONFIRM_CODE'			=> 'The confirm code you entered is too long.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 3cf8d8cce3..f18ebbaf8b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -292,7 +292,7 @@ $lang = array_merge($lang, array(
 	'NO_AUTH_READ_HOLD_MESSAGE'		=> 'You are not authorised to read private messages that are on hold.',
 	'NO_AUTH_READ_MESSAGE'			=> 'You are not authorised to read private messages.',
 	'NO_AUTH_READ_REMOVED_MESSAGE'	=> 'You are not able to read this message because it was removed by the author.',
-	'NO_AUTH_SEND_MESSAGE'			=> 'You are not authorised sending private messages.',
+	'NO_AUTH_SEND_MESSAGE'			=> 'You are not authorised to send private messages.',
 	'NO_AUTH_SIGNATURE'				=> 'You are not authorised to define a signature.',
 
 	'NO_BCC_RECIPIENT'			=> 'None',
@@ -316,6 +316,7 @@ $lang = array_merge($lang, array(
 	'NO_SAVED_DRAFTS'			=> 'No drafts saved.',
 	'NO_TO_RECIPIENT'			=> 'None',
 	'NO_WATCHED_FORUMS'			=> 'You are not subscribed to any forums.',
+	'NO_WATCHED_SELECTED'		=> 'You have not selected any subscribed topics or forums.',
 	'NO_WATCHED_TOPICS'			=> 'You are not subscribed to any topics.',
 
 	'PASS_TYPE_ALPHA_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case and must contain numbers.',
-- 
cgit v1.2.1


From d46e8e6f98054fc58a126c865184369198d9a2ed Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 22 Nov 2008 19:38:25 +0000
Subject: merge revisions i missed... hopefully not breaking things - did not
 check every change.

git-svn-id: file:///svn/phpbb/trunk@9077 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/styles.php |  2 +-
 phpBB/language/en/common.php     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 4b13d62ace..2d28b4fb2a 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -166,7 +166,7 @@ $lang = array_merge($lang, array(
 	'IMG_FORUM_UNREAD_SUBFORUM'	=> 'Subforum new posts',
 	'IMG_SUBFORUM_READ'			=> 'Legend subforum',
 	'IMG_SUBFORUM_UNREAD'		=> 'Legend subforum new posts',
-	
+
 	'IMG_TOPIC_MOVED'			=> 'Topic moved',
 
 	'IMG_TOPIC_READ'				=> 'Topic',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 7c8de35264..f6d009b5dd 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -260,7 +260,7 @@ $lang = array_merge($lang, array(
 	'HOME'						=> 'Home',
 
 	'ICQ'						=> 'ICQ',
-	'ICQ_STATUS'				=> 'ICQ status',	
+	'ICQ_STATUS'				=> 'ICQ status',
 	'IF'						=> 'If',
 	'IMAGE'						=> 'Image',
 	'IMAGE_FILETYPE_INVALID'	=> 'Image file type %d for mimetype %s not supported.',
@@ -331,7 +331,7 @@ $lang = array_merge($lang, array(
 	'MODERATORS'			=> 'Moderators',
 	'MONTH'					=> 'Month',
 	'MOVE'					=> 'Move',
-	'MSNM'					=> 'MSNM/WLM',	
+	'MSNM'					=> 'MSNM/WLM',
 
 	'NA'						=> 'N/A',
 	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
@@ -370,7 +370,7 @@ $lang = array_merge($lang, array(
 	'NO_MEMBERS'				=> 'No members found for this search criterion.',
 	'NO_MESSAGES'				=> 'No messages',
 	'NO_MODE'					=> 'No mode specified.',
-	'NO_MODERATORS'				=> 'No moderators assigned at this board.',
+	'NO_MODERATORS'				=> 'There are no moderators.',
 	'NO_NEW_MESSAGES'			=> 'No new messages',
 	'NO_NEW_PM'					=> '<strong>0</strong> new messages',
 	'NO_NEW_POSTS'				=> 'No new posts',
@@ -502,7 +502,7 @@ $lang = array_merge($lang, array(
 	'SEARCHING_FORUMS'			=> 'Searching forums',
 	'SEARCH_ACTIVE_TOPICS'		=> 'View active topics',
 	'SEARCH_FOR'				=> 'Search for',
-	'SEARCH_FORUM'				=> 'Search this forum…',	
+	'SEARCH_FORUM'				=> 'Search this forum…',
 	'SEARCH_NEW'				=> 'View new posts',
 	'SEARCH_POSTS_BY'			=> 'Search posts by',
 	'SEARCH_SELF'				=> 'View your posts',
@@ -545,7 +545,7 @@ $lang = array_merge($lang, array(
 	'THE_TEAM'			=> 'The team',
 	'TIME'				=> 'Time',
 
-	'TOO_LONG'						=> 'The value you entered is too long.',
+	'TOO_LONG'						=> 'The value you entered is too long',
 
 	'TOO_LONG_AIM'					=> 'The screenname you entered is too long.',
 	'TOO_LONG_CONFIRM_CODE'			=> 'The confirm code you entered is too long.',
@@ -680,7 +680,7 @@ $lang = array_merge($lang, array(
 	'YEAR'				=> 'Year',
 	'YEAR_MONTH_DAY'	=> '(YYYY-MM-DD)',
 	'YES'				=> 'Yes',
-	'YIM'				=> 'YIM',	
+	'YIM'				=> 'YIM',
 	'YOU_LAST_VISIT'	=> 'Last visit was: %s',
 	'YOU_NEW_PM'		=> 'A new private message is waiting for you in your Inbox.',
 	'YOU_NEW_PMS'		=> 'New private messages are waiting for you in your Inbox.',
-- 
cgit v1.2.1


From 4379b3d7bcd62e4d99fc8cc71c91a2c05c4f85d5 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 30 Nov 2008 14:43:25 +0000
Subject: =?UTF-8?q?[Change]=20Performance=20increase=20for=20format=5Fdate?=
 =?UTF-8?q?()=20(Bug=20#37575=20-=20Patch=20by=20BartVB)=20[Change]=20Chan?=
 =?UTF-8?q?ged=20prosilver=20date=20separator=20from=20'on'=20to=20'=C2=BB?=
 =?UTF-8?q?'=20[Feature]=20Added=20'AGO'=20setting=20to=20relative=20date?=
 =?UTF-8?q?=20strings.=20For=20example:=20posted=2014=20minutes=20ago.=20(?=
 =?UTF-8?q?Patch=20by=20BartVB)=20[Fix]=20Extend=20vertical=20line=20for?=
 =?UTF-8?q?=20last=20post=20column=20if=20no=20posts=20in=20forum=20(Bug?=
 =?UTF-8?q?=20#37125)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///svn/phpbb/trunk@9137 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/common.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index f6d009b5dd..a7d938c6d4 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -690,6 +690,12 @@ $lang = array_merge($lang, array(
 		'TODAY'		=> 'Today',
 		'TOMORROW'	=> 'Tomorrow',
 		'YESTERDAY'	=> 'Yesterday',
+		'AGO'		=> array(
+			0		=> '%d minutes ago',
+			1		=> '%d minute ago',
+			2		=> '%d minutes ago',
+			60		=> '1 hour ago',
+		),
 
 		'Sunday'	=> 'Sunday',
 		'Monday'	=> 'Monday',
-- 
cgit v1.2.1


From c076becc5ae1428f6988c1d6db8879802617e359 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 3 Dec 2008 11:19:25 +0000
Subject: Use "less than a minute ago" instead of "0 minutes ago" Use "Sent:
 {DATE}" in pm's, instead of "Sent at: {DATE}"

git-svn-id: file:///svn/phpbb/trunk@9163 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/common.php | 2 +-
 phpBB/language/en/ucp.php    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a7d938c6d4..283159dce2 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -691,7 +691,7 @@ $lang = array_merge($lang, array(
 		'TOMORROW'	=> 'Tomorrow',
 		'YESTERDAY'	=> 'Yesterday',
 		'AGO'		=> array(
-			0		=> '%d minutes ago',
+			0		=> 'less than a minute ago',
 			1		=> '%d minute ago',
 			2		=> '%d minutes ago',
 			60		=> '1 hour ago',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index f18ebbaf8b..4ece142031 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -118,7 +118,7 @@ $lang = array_merge($lang, array(
 	'CHANGE_PASSWORD'			=> 'Change password',
 	'CLICK_RETURN_FOLDER'		=> '%1$sReturn to your “%3$s” folder%2$s',
 	'CONFIRMATION'				=> 'Confirmation of registration',
-	'CONFIRM_CHANGES'			=> 'Confirm changes',	
+	'CONFIRM_CHANGES'			=> 'Confirm changes',
 	'CONFIRM_EMAIL'				=> 'Confirm e-mail address',
 	'CONFIRM_EMAIL_EXPLAIN'		=> 'You only need to specify this if you are changing your e-mail address.',
 	'CONFIRM_EXPLAIN'			=> 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
@@ -378,7 +378,7 @@ $lang = array_merge($lang, array(
 	'SAME_PASSWORD_ERROR'		=> 'The new password you entered is the same as your current password.',
 	'SEARCH_YOUR_POSTS'			=> 'Show your posts',
 	'SEND_PASSWORD'				=> 'Send password',
-	'SENT_AT'					=> 'Sent at',
+	'SENT_AT'					=> 'Sent',			// Used before dates in private messages
 	'SHOW_EMAIL'				=> 'Users can contact me by e-mail',
 	'SIGNATURE_EXPLAIN'			=> 'This is a block of text that can be added to posts you make. There is a %d character limit.',
 	'SIGNATURE_PREVIEW'			=> 'Your signature will appear like this in posts',
@@ -421,7 +421,7 @@ $lang = array_merge($lang, array(
 	'UCP_PREFS_PERSONAL'		=> 'Edit global settings',
 	'UCP_PREFS_POST'			=> 'Edit posting defaults',
 	'UCP_PREFS_VIEW'			=> 'Edit display options',
-	
+
 	'UCP_PM'					=> 'Private messages',
 	'UCP_PM_COMPOSE'			=> 'Compose message',
 	'UCP_PM_DRAFTS'				=> 'Manage PM drafts',
-- 
cgit v1.2.1


From e85f9f79bc892533e8b67d80ae265167f2e5d4cd Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 24 Dec 2008 13:14:24 +0000
Subject: remove no longer necessary files... hooray

git-svn-id: file:///svn/phpbb/trunk@9221 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/index.htm   | 10 ----------
 phpBB/language/en/email/index.htm | 10 ----------
 phpBB/language/en/index.htm       | 10 ----------
 phpBB/language/en/mods/index.htm  |  0
 4 files changed, 30 deletions(-)
 delete mode 100644 phpBB/language/en/acp/index.htm
 delete mode 100644 phpBB/language/en/email/index.htm
 delete mode 100644 phpBB/language/en/index.htm
 delete mode 100644 phpBB/language/en/mods/index.htm

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/index.htm b/phpBB/language/en/acp/index.htm
deleted file mode 100644
index ee1f723a7d..0000000000
--- a/phpBB/language/en/acp/index.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-</body>
-</html>
diff --git a/phpBB/language/en/email/index.htm b/phpBB/language/en/email/index.htm
deleted file mode 100644
index ee1f723a7d..0000000000
--- a/phpBB/language/en/email/index.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-</body>
-</html>
diff --git a/phpBB/language/en/index.htm b/phpBB/language/en/index.htm
deleted file mode 100644
index ee1f723a7d..0000000000
--- a/phpBB/language/en/index.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-</body>
-</html>
diff --git a/phpBB/language/en/mods/index.htm b/phpBB/language/en/mods/index.htm
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit v1.2.1


From cf5c856c2896d888add328ae96081b2c38b4e265 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 27 Dec 2008 13:52:27 +0000
Subject: change page_header/page_footer and message handler

git-svn-id: file:///svn/phpbb/trunk@9234 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/common.php | 93 +++++++++++++++++++++++++++++---------------
 phpBB/language/en/ucp.php    |  2 +-
 2 files changed, 62 insertions(+), 33 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 283159dce2..78948e8858 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -107,8 +107,10 @@ $lang = array_merge($lang, array(
 	'BOARD_DISABLE'			=> 'Sorry but this board is currently unavailable.',
 	'BOARD_DISABLED'		=> 'This board is currently disabled.',
 	'BOARD_UNAVAILABLE'		=> 'Sorry but the board is temporarily unavailable, please try again in a few minutes.',
-	'BROWSING_FORUM_GUEST'	=> 'Users browsing this forum: %1$s and %2$d guest',
-	'BROWSING_FORUM_GUESTS'	=> 'Users browsing this forum: %1$s and %2$d guests',
+	'BROWSING_FORUM_GUESTS'	=> array(
+		0		=> 'Users browsing this forum: %1$s and %2$d guest',
+		2		=> 'Users browsing this forum: %1$s and %2$d guests',
+	),
 	'BYTES'					=> 'Bytes',
 
 	'CANCEL'				=> 'Cancel',
@@ -236,11 +238,15 @@ $lang = array_merge($lang, array(
 	'GROUP_ERR_USER_LONG'		=> 'Group names cannot exceed 60 characters. The specified group name is too long.',
 	'GUEST'						=> 'Guest',
 	'GUEST_USERS_ONLINE'		=> 'There are %d guest users online',
-	'GUEST_USERS_TOTAL'			=> '%d guests',
 	'GUEST_USERS_ZERO_ONLINE'	=> 'There are 0 guest users online',
-	'GUEST_USERS_ZERO_TOTAL'	=> '0 guests',
 	'GUEST_USER_ONLINE'			=> 'There is %d guest user online',
-	'GUEST_USER_TOTAL'			=> '%d guest',
+
+	'GUEST_USER_COUNT'			=> array(
+		0		=> '%d guests',
+		1		=> '%d guest',
+		2		=> '%d guests',
+	),
+
 	'G_ADMINISTRATORS'			=> 'Administrators',
 	'G_BOTS'					=> 'Bots',
 	'G_GUESTS'					=> 'Guests',
@@ -249,11 +255,13 @@ $lang = array_merge($lang, array(
 	'G_GLOBAL_MODERATORS'		=> 'Global moderators',
 
 	'HIDDEN_USERS_ONLINE'		=> '%d hidden users online',
-	'HIDDEN_USERS_TOTAL'		=> '%d hidden and ',
 	'HIDDEN_USERS_ZERO_ONLINE'	=> '0 hidden users online',
-	'HIDDEN_USERS_ZERO_TOTAL'	=> '0 hidden and ',
 	'HIDDEN_USER_ONLINE'		=> '%d hidden user online',
-	'HIDDEN_USER_TOTAL'			=> '%d hidden and ',
+
+	'HIDDEN_USER_COUNT'			=> array(
+		0			=> '%d hidden and ',
+	),
+
 	'HIDE_GUESTS'				=> 'Hide guests',
 	'HIDE_ME'					=> 'Hide my online status this session',
 	'HOURS'						=> 'Hours',
@@ -327,8 +335,10 @@ $lang = array_merge($lang, array(
 	'MESSAGE_BODY'			=> 'Message body',
 	'MINUTES'				=> 'Minutes',
 	'MODERATE'				=> 'Moderate',
-	'MODERATOR'				=> 'Moderator',
-	'MODERATORS'			=> 'Moderators',
+	'MODERATORS'			=> array(
+		0	=> 'Moderator',
+		2	=> 'Moderators',
+	),
 	'MONTH'					=> 'Month',
 	'MOVE'					=> 'Move',
 	'MSNM'					=> 'MSNM/WLM',
@@ -337,8 +347,11 @@ $lang = array_merge($lang, array(
 	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
 	'NEW_MESSAGE'				=> 'New message',
 	'NEW_MESSAGES'				=> 'New messages',
-	'NEW_PM'					=> '<strong>%d</strong> new message',
-	'NEW_PMS'					=> '<strong>%d</strong> new messages',
+	'NEW_PM'					=> array(
+		0		=> '<strong>%d</strong> new messages',
+		1		=> '<strong>%d</strong> new message',
+		2		=> '<strong>%d</strong> new messages',
+	),
 	'NEW_POST'					=> 'New post',
 	'NEW_POSTS'					=> 'New posts',
 	'NEXT'						=> 'Next',		// Used in pagination
@@ -401,9 +414,12 @@ $lang = array_merge($lang, array(
 	'OFFLINE'					=> 'Offline',
 	'ONLINE'					=> 'Online',
 	'ONLINE_BUDDIES'			=> 'Online friends',
-	'ONLINE_USERS_TOTAL'		=> 'In total there are <strong>%d</strong> users online :: ',
-	'ONLINE_USERS_ZERO_TOTAL'	=> 'In total there are <strong>0</strong> users online :: ',
-	'ONLINE_USER_TOTAL'			=> 'In total there is <strong>%d</strong> user online :: ',
+
+	'ONLINE_USER_COUNT'			=> array(
+		0		=> 'In total there are <strong>0</strong> users online :: ',
+		1		=> 'In total there is <strong>%d</strong> user online :: ',
+		2		=> 'In total there are <strong>%d</strong> users online :: ',
+	),
 	'OPTIONS'					=> 'Options',
 
 	'PAGE_OF'				=> 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
@@ -455,11 +471,13 @@ $lang = array_merge($lang, array(
 	'REGISTER'					=> 'Register',
 	'REGISTERED_USERS'			=> 'Registered users:',
 	'REG_USERS_ONLINE'			=> 'There are %d registered users and ',
-	'REG_USERS_TOTAL'			=> '%d registered, ',
 	'REG_USERS_ZERO_ONLINE'		=> 'There are 0 registered users and ',
-	'REG_USERS_ZERO_TOTAL'		=> '0 registered, ',
+
+	'REG_USER_COUNT'			=> array(
+		0			=> '%d registered, ',
+	),
+
 	'REG_USER_ONLINE'			=> 'There is %d registered user and ',
-	'REG_USER_TOTAL'			=> '%d registered, ',
 	'REMOVE'					=> 'Remove',
 	'REMOVE_INSTALL'			=> 'Please delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.',
 	'REPLIES'					=> 'Replies',
@@ -535,8 +553,10 @@ $lang = array_merge($lang, array(
 	'START_WATCHING_TOPIC'		=> 'Subscribe topic',
 	'STOP_WATCHING_FORUM'		=> 'Unsubscribe forum',
 	'STOP_WATCHING_TOPIC'		=> 'Unsubscribe topic',
-	'SUBFORUM'					=> 'Subforum',
-	'SUBFORUMS'					=> 'Subforums',
+	'SUBFORUMS'					=> array(
+		0	=> 'Subforum',
+		2	=> 'Subforums',
+	),
 	'SUBJECT'					=> 'Subject',
 	'SUBMIT'					=> 'Submit',
 
@@ -602,14 +622,18 @@ $lang = array_merge($lang, array(
 	'TOTAL_NO_PM'		=> '0 private messages in total',
 	'TOTAL_PM'			=> '1 private message in total',
 	'TOTAL_PMS'			=> '%d private messages in total',
-	'TOTAL_POSTS'		=> 'Total posts',
-	'TOTAL_POSTS_OTHER'	=> 'Total posts <strong>%d</strong>',
-	'TOTAL_POSTS_ZERO'	=> 'Total posts <strong>0</strong>',
 	'TOPIC_REPORTED'	=> 'This topic has been reported',
-	'TOTAL_TOPICS_OTHER'=> 'Total topics <strong>%d</strong>',
-	'TOTAL_TOPICS_ZERO'	=> 'Total topics <strong>0</strong>',
-	'TOTAL_USERS_OTHER'	=> 'Total members <strong>%d</strong>',
-	'TOTAL_USERS_ZERO'	=> 'Total members <strong>0</strong>',
+	'TOTAL_POSTS'		=> 'Total posts',
+
+	'TOTAL_POSTS_COUNT'	=> array(
+		0		=> 'Total posts <strong>%d</strong>',
+	),
+	'TOTAL_TOPICS_COUNT'=> array(
+		0		=> 'Total topics <strong>%d</strong>',
+	),
+	'TOTAL_USERS_COUNT'	=> array(
+		0		=> 'Total members <strong>%d</strong>',
+	),
 	'TRACKED_PHP_ERROR'	=> 'Tracked PHP errors: %s',
 
 	'UNABLE_GET_IMAGE_SIZE'	=> 'It was not possible to determine the dimensions of the image.',
@@ -617,8 +641,11 @@ $lang = array_merge($lang, array(
 	'UNKNOWN_BROWSER'		=> 'Unknown browser',
 	'UNMARK_ALL'			=> 'Unmark all',
 	'UNREAD_MESSAGES'		=> 'Unread messages',
-	'UNREAD_PM'				=> '<strong>%d</strong> unread message',
-	'UNREAD_PMS'			=> '<strong>%d</strong> unread messages',
+	'UNREAD_PM'				=> array(
+		0		=> '<strong>%d</strong> unread messages',
+		1		=> '<strong>%d</strong> unread message',
+		2		=> '<strong>%d</strong> unread messages',
+	),
 	'UNWATCHED_FORUMS'			=> 'You are no longer subscribed to the selected forums.',
 	'UNWATCHED_TOPICS'			=> 'You are no longer subscribed to the selected topics.',
 	'UNWATCHED_FORUMS_TOPICS'	=> 'You are no longer subscribed to the selected entries.',
@@ -651,8 +678,10 @@ $lang = array_merge($lang, array(
 	'VIEW_LATEST_POST'			=> 'View the latest post',
 	'VIEW_NEWEST_POST'			=> 'View first unread post',
 	'VIEW_NOTES'				=> 'View user notes',
-	'VIEW_ONLINE_TIME'			=> 'based on users active over the past %d minute',
-	'VIEW_ONLINE_TIMES'			=> 'based on users active over the past %d minutes',
+	'VIEW_ONLINE_TIME'			=> array(
+		0		=> 'based on users active over the past %d minute',
+		2		=> 'based on users active over the past %d minutes',
+	),
 	'VIEW_TOPIC'				=> 'View topic',
 	'VIEW_TOPIC_ANNOUNCEMENT'	=> 'Announcement: ',
 	'VIEW_TOPIC_GLOBAL'			=> 'Global Announcement: ',
@@ -844,4 +873,4 @@ $lang = array_merge($lang, array(
 
 ));
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 4ece142031..4f393c2108 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -541,4 +541,4 @@ $lang = array_merge($lang, array(
 	'NO_NONMEMBER'	=> 'No non-member groups',
 ));
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.1


From fbaf2baa8d683a2afdd3cf98ea1e7c035369f1a3 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 28 Dec 2008 10:53:28 +0000
Subject: document plugin-support move language path declaration to object
 instantiation

git-svn-id: file:///svn/phpbb/trunk@9239 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/common.php | 2 +-
 phpBB/language/en/ucp.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 78948e8858..36b6c048df 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -873,4 +873,4 @@ $lang = array_merge($lang, array(
 
 ));
 
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 4f393c2108..4ece142031 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -541,4 +541,4 @@ $lang = array_merge($lang, array(
 	'NO_NONMEMBER'	=> 'No non-member groups',
 ));
 
-?>
+?>
\ No newline at end of file
-- 
cgit v1.2.1


From 14eb46cda05d75e0e3d4f8190b1b7661d8b72793 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 19 Jan 2009 15:24:24 +0000
Subject: Adjust some files to support new methods...

git-svn-id: file:///svn/phpbb/trunk@9279 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/common.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 36b6c048df..3dbda4a4db 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -151,12 +151,16 @@ $lang = array_merge($lang, array(
 	'DISPLAY_TOPICS'		=> 'Display topics from previous',
 	'DOWNLOADED'			=> 'Downloaded',
 	'DOWNLOADING_FILE'		=> 'Downloading file',
-	'DOWNLOAD_COUNT'		=> 'Downloaded %d time',
-	'DOWNLOAD_COUNTS'		=> 'Downloaded %d times',
-	'DOWNLOAD_COUNT_NONE'	=> 'Not downloaded yet',
-	'VIEWED_COUNT'			=> 'Viewed %d time',
-	'VIEWED_COUNTS'			=> 'Viewed %d times',
-	'VIEWED_COUNT_NONE'		=> 'Not viewed yet',
+	'DOWNLOAD_COUNT'		=> array(
+		0		=> 'Not downloaded yet',
+		1		=> 'Downloaded %d time',
+		2		=> 'Downloaded %d times',
+	),
+	'VIEWED_COUNT'			=> array(
+		0		=> 'Not viewed yet',
+		1		=> 'Viewed %d time',
+		2		=> 'Viewed %d times',
+	),
 
 	'EDIT_POST'							=> 'Edit post',
 	'EMAIL'								=> 'E-mail',
-- 
cgit v1.2.1


From 9f060eba6eb8f2e54f5c26cc23c4f82eee7903b8 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 21 Jan 2009 17:03:00 +0000
Subject: some adjustements to the installer

git-svn-id: file:///svn/phpbb/trunk@9284 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/install.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index de117098e2..99b608e326 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -230,14 +230,15 @@ $lang = array_merge($lang, array(
 	'INST_ERR_DB_CONNECT'		=> 'Could not connect to the database, see error message below.',
 	'INST_ERR_DB_FORUM_PATH'	=> 'The database file specified is within your board directory tree. You should put this file in a non web-accessible location.',
 	'INST_ERR_DB_NO_ERROR'		=> 'No error message given.',
-	'INST_ERR_DB_NO_MYSQL'		=> 'The version of MySQL installed on the target server must be at least 4.1, phpBB 3.1 cannot be installed on an older version.',
-	'INST_ERR_DB_NO_MYSQLI'		=> 'The version of MySQL installed on the target server must be at least 4.1, phpBB 3.1 cannot be installed on an older version.',
-	'INST_ERR_DB_NO_SQLITE'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
-	'INST_ERR_DB_NO_ORACLE'		=> 'The version of Oracle installed on the target server must be at least 9.2, phpBB 3.1 cannot be installed on an older version.',
-	'INST_ERR_DB_NO_ORACLE_NLS'	=> 'You must configure Oracle so that the <var>NLS_CHARACTERSET</var> parameter is set to <var>ALU32UTF8</var>.',
-	'INST_ERR_DB_NO_FIREBIRD'	=> 'The version of Firebird installed on this machine is older than 2.0, please upgrade to a newer version.',
-	'INST_ERR_DB_NO_FIREBIRD_PS'=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
-	'INST_ERR_DB_NO_POSTGRES'	=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
+
+	'INST_ERR_DB_MYSQL_VERSION'		=> 'The version of MySQL installed on the target server must be at least 4.1, phpBB 3.1 cannot be installed on an older version.',
+	'INST_ERR_DB_SQLITE_VERSION'	=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
+	'INST_ERR_DB_ORACLE_VERSION'	=> 'The version of Oracle installed on the target server must be at least 9.2, phpBB 3.1 cannot be installed on an older version.',
+	'INST_ERR_DB_FIREBIRD_VERSION'	=> 'The version of Firebird installed on this machine is older than 2.0, please upgrade to a newer version.',
+	'INST_ERR_DB_POSTGRES_VERSION'	=> 'The version of PostgreSQL installed on this machine is older than 8.2, please upgrade to a newer version.',
+	'INST_ERR_DB_NO_ORACLE_NLS'		=> 'You must configure Oracle so that the <var>NLS_CHARACTERSET</var> parameter is set to <var>ALU32UTF8</var>.',
+	'INST_ERR_DB_NO_FIREBIRD_PS'	=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
+	'INST_ERR_DB_NO_POSTGRES_UTF8'	=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
 	'INST_ERR_DB_NO_NAME'		=> 'No database name specified.',
 	'INST_ERR_EMAIL_INVALID'	=> 'The e-mail address you entered is invalid.',
 	'INST_ERR_EMAIL_MISMATCH'	=> 'The e-mails you entered did not match.',
-- 
cgit v1.2.1


From 5f265f47d98700e84284b97529187869d144dac1 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Thu, 22 Jan 2009 12:54:26 +0000
Subject: aaaand DB2 support. :)

git-svn-id: file:///svn/phpbb/trunk@9294 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/install.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 99b608e326..4181e081ca 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -235,7 +235,10 @@ $lang = array_merge($lang, array(
 	'INST_ERR_DB_SQLITE_VERSION'	=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
 	'INST_ERR_DB_ORACLE_VERSION'	=> 'The version of Oracle installed on the target server must be at least 9.2, phpBB 3.1 cannot be installed on an older version.',
 	'INST_ERR_DB_FIREBIRD_VERSION'	=> 'The version of Firebird installed on this machine is older than 2.0, please upgrade to a newer version.',
-	'INST_ERR_DB_POSTGRES_VERSION'	=> 'The version of PostgreSQL installed on this machine is older than 8.2, please upgrade to a newer version.',
+	'INST_ERR_DB_POSTGRES_VERSION'	=> 'The version of PostgreSQL installed on the target server is older than 8.2, please upgrade to a newer version.',
+	'INST_ERR_DB_DB2_VERSION'		=> 'The version of DB2 installed on the target server is older than 8.2.2, please upgrade to a newer version.',
+	'INST_ERR_DB_DB2_EXT_VERSION'	=> 'The version of the IBM_DB2 extension installed on this machine is older than 1.6.0, please install a newer version.',
+
 	'INST_ERR_DB_NO_ORACLE_NLS'		=> 'You must configure Oracle so that the <var>NLS_CHARACTERSET</var> parameter is set to <var>ALU32UTF8</var>.',
 	'INST_ERR_DB_NO_FIREBIRD_PS'	=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
 	'INST_ERR_DB_NO_POSTGRES_UTF8'	=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
-- 
cgit v1.2.1


From 4cbf6bc703bdadf716197b68a89b3438247ff022 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 22 Mar 2009 16:34:26 +0000
Subject: Merge most changes from 3.0.x branch since the 25th december.
 (Captcha changes for refreshing captcha image not included)

git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/board.php             | 14 ++++++++++++--
 phpBB/language/en/acp/common.php            | 10 +++++-----
 phpBB/language/en/acp/forums.php            |  1 +
 phpBB/language/en/acp/posting.php           |  2 +-
 phpBB/language/en/acp/profile.php           |  2 +-
 phpBB/language/en/email/newtopic_notify.txt |  2 +-
 phpBB/language/en/install.php               | 14 +++++++++-----
 phpBB/language/en/ucp.php                   |  5 ++++-
 8 files changed, 34 insertions(+), 16 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index b9b089969e..dc12cbb42a 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -245,12 +245,20 @@ $lang = array_merge($lang, array(
 	'CAPTCHA_GD_X_GRID_EXPLAIN'				=> 'Use lower settings of this to make the GD based CAPTCHA harder. 0 will disable x-axis background noise.',
 	'CAPTCHA_GD_Y_GRID'						=> 'GD CAPTCHA background noise y-axis',
 	'CAPTCHA_GD_Y_GRID_EXPLAIN'				=> 'Use lower settings of this to make the GD based CAPTCHA harder. 0 will disable y-axis background noise.',
+	'CAPTCHA_GD_WAVE'						=> 'GD CAPTCHA wave distortion',
+	'CAPTCHA_GD_WAVE_EXPLAIN'				=> 'This applies a wave distortion to the CAPTCHA.',
+ 	'CAPTCHA_GD_3D_NOISE'					=> 'Add 3D-noise objects',
+	'CAPTCHA_GD_3D_NOISE_EXPLAIN'			=> 'This adds additional objects to the CAPTCHA, over the letters.',
+  	'CAPTCHA_GD_FONTS'						=> 'Use different fonts',
+	'CAPTCHA_GD_FONTS_EXPLAIN'				=> 'This setting controls how many different letter shapes are used. You can just use the default shapes or introduce altered letters. Adding lowercase letters is also possible.',
+	'CAPTCHA_FONT_DEFAULT'					=> 'Default',
+	'CAPTCHA_FONT_NEW'						=> 'New Shapes',
+	'CAPTCHA_FONT_LOWER'					=> 'Also use lowercase',
 
-	'CAPTCHA_NO_GD'							=> 'CAPTCHA without GD',
 
 	'CAPTCHA_PREVIEW_MSG'					=> 'Your changes to the visual confirmation setting were not saved. This is just a preview.',
 	'CAPTCHA_PREVIEW_EXPLAIN'				=> 'The CAPTCHA as it would look like using the current selection.',
-	
+
 	'CAPTCHA_SELECT'						=> 'Installed CAPTCHA plugins',
 	'CAPTCHA_SELECT_EXPLAIN'				=> 'The dropdown holds the CAPTCHA plugins recognized by the board. Gray entries are not available right now and might need configuration prior to use.',
 	'CAPTCHA_CONFIGURE'						=> 'Configure CAPTCHAs',
@@ -261,6 +269,8 @@ $lang = array_merge($lang, array(
 	'VISUAL_CONFIRM_POST_EXPLAIN'			=> 'Requires anonymous users to enter a random code matching an image to help prevent mass postings.',
 	'VISUAL_CONFIRM_REG'					=> 'Enable visual confirmation for registrations',
 	'VISUAL_CONFIRM_REG_EXPLAIN'			=> 'Requires new users to enter a random code matching an image to help prevent mass registrations.',
+	'VISUAL_CONFIRM_REFRESH'				=> 'Enable users to request new images',
+	'VISUAL_CONFIRM_REFRESH_EXPLAIN'		=> 'Allows users to request new images, if they are unable to solve the VC during registration.',
 ));
 
 // Cookie Settings
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 8b936979ed..d1157b4dc4 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -201,7 +201,7 @@ $lang = array_merge($lang, array(
 	'ADMIN_INDEX'			=> 'Admin index',
 	'ADMIN_PANEL'			=> 'Administration Control Panel',
 
-	'ADM_LOGOUT'			=> 'ACP Logout',
+	'ADM_LOGOUT'			=> 'ACP&nbsp;Logout',
 	'ADM_LOGGED_OUT'		=> 'Successfully logged out from Administration Control Panel',
 
 	'BACK'					=> 'Back',
@@ -516,11 +516,11 @@ $lang = array_merge($lang, array(
 	'LOG_FORUM_DEL_FORUMS'					=> '<strong>Deleted forum and its subforums</strong><br />» %s',
 	'LOG_FORUM_DEL_MOVE_FORUMS'				=> '<strong>Deleted forum and moved subforums</strong> to %1$s<br />» %2$s',
 	'LOG_FORUM_DEL_MOVE_POSTS'				=> '<strong>Deleted forum and moved posts </strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_DEL_MOVE_POSTS_FORUMS'		=> '<strong>Deleted forum and its subforums, moved messages</strong> to %1$s<br />» %2$s',
+	'LOG_FORUM_DEL_MOVE_POSTS_FORUMS'		=> '<strong>Deleted forum and its subforums, moved posts</strong> to %1$s<br />» %2$s',
 	'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS'	=> '<strong>Deleted forum, moved posts</strong> to %1$s <strong>and subforums</strong> to %2$s<br />» %3$s',
-	'LOG_FORUM_DEL_POSTS'					=> '<strong>Deleted forum and its messages</strong><br />» %s',
-	'LOG_FORUM_DEL_POSTS_FORUMS'			=> '<strong>Deleted forum, its messages and subforums</strong><br />» %s',
-	'LOG_FORUM_DEL_POSTS_MOVE_FORUMS'		=> '<strong>Deleted forum and its messages, moved subforums</strong> to %1$s<br />» %2$s',
+	'LOG_FORUM_DEL_POSTS'					=> '<strong>Deleted forum and its posts</strong><br />» %s',
+	'LOG_FORUM_DEL_POSTS_FORUMS'			=> '<strong>Deleted forum, its posts and subforums</strong><br />» %s',
+	'LOG_FORUM_DEL_POSTS_MOVE_FORUMS'		=> '<strong>Deleted forum and its posts, moved subforums</strong> to %1$s<br />» %2$s',
 	'LOG_FORUM_EDIT'						=> '<strong>Edited forum details</strong><br />» %s',
 	'LOG_FORUM_MOVE_DOWN'					=> '<strong>Moved forum</strong> %1$s <strong>below</strong> %2$s',
 	'LOG_FORUM_MOVE_UP'						=> '<strong>Moved forum</strong> %1$s <strong>above</strong> %2$s',
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 84f280c779..52919f4f40 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -81,6 +81,7 @@ $lang = array_merge($lang, array(
 	'FORUM_EDIT_EXPLAIN'				=> 'The form below will allow you to customise this forum. Please note that moderation and post count controls are set via forum permissions for each user or usergroup.',
 	'FORUM_IMAGE'						=> 'Forum image',
 	'FORUM_IMAGE_EXPLAIN'				=> 'Location, relative to the phpBB root directory, of an additional image to associate with this forum.',
+	'FORUM_IMAGE_NO_EXIST'				=> 'The specified forum image does not exist',
 	'FORUM_LINK_EXPLAIN'				=> 'Full URL (including the protocol, i.e.: <samp>http://</samp>) to the destination location that clicking this forum will take the user, e.g.: <samp>http://www.phpbb.com/</samp>.',
 	'FORUM_LINK_TRACK'					=> 'Track link redirects',
 	'FORUM_LINK_TRACK_EXPLAIN'			=> 'Records the number of times a forum link was clicked.',
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 66ce911ff6..01453b85ef 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -185,7 +185,7 @@ $lang = array_merge($lang, array(
 
 // Word censors
 $lang = array_merge($lang, array(
-	'ACP_WORDS_EXPLAIN'		=> 'From this control panel you can add, edit, and remove words that will be automatically censored on your forums. In addition people will not be allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, e.g. *test* will match detestable, test* would match testing, *test would match detest.',
+	'ACP_WORDS_EXPLAIN'		=> 'From this control panel you can add, edit, and remove words that will be automatically censored on your forums. People are still allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, e.g. *test* will match detestable, test* would match testing, *test would match detest.',
 	'ADD_WORD'				=> 'Add new word',
 
 	'EDIT_WORD'		=> 'Edit word censor',
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index ca63c9c639..295571226e 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -66,7 +66,7 @@ $lang = array_merge($lang, array(
 	'DISPLAY_AT_PROFILE_EXPLAIN'	=> 'The user is able to change this profile field within the user control panel.',
 	'DISPLAY_AT_REGISTER'			=> 'Display at registration screen',
 	'DISPLAY_AT_REGISTER_EXPLAIN'	=> 'If this option is enabled, the field will be displayed on registration and able to be changed within the user control panel.',
-	'DISPLAY_PROFILE_FIELD'			=> 'Display profile field',
+	'DISPLAY_PROFILE_FIELD'			=> 'Publicly display profile field',
 	'DISPLAY_PROFILE_FIELD_EXPLAIN'	=> 'The profile field will be shown in all places allowed within the load settings. Setting this to “no” will hide the field from topic pages, profiles and the memberlist.',
 	'DROPDOWN_ENTRIES_EXPLAIN'		=> 'Enter your options now, every option in one line.',
 
diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt
index 1c471a3c01..529bbf0f8f 100644
--- a/phpBB/language/en/email/newtopic_notify.txt
+++ b/phpBB/language/en/email/newtopic_notify.txt
@@ -2,7 +2,7 @@ Subject: New topic notification - "{FORUM_NAME}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view forum, no more notifications will be sent until you visit the forum.
+You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
 
 {U_FORUM}
 
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 4181e081ca..087149e5aa 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -278,6 +278,8 @@ $lang = array_merge($lang, array(
 	'MAKE_FOLDER_WRITABLE'		=> 'Please make sure that this folder exists and is writable by the webserver then try again:<br />»<strong>%s</strong>.',
 	'MAKE_FOLDERS_WRITABLE'		=> 'Please make sure that these folders exist and are writable by the webserver then try again:<br />»<strong>%s</strong>.',
 
+	'MYSQL_SCHEMA_UPDATE_REQUIRED'	=> 'Your MySQL database schema for phpBB is outdated. phpBB detected a schema for MySQL 3.x/4.x, but the server runs on MySQL %2s.<br /><strong>Before you proceed the update, you need to upgrade the schema.</strong><br /><br />Please refer to the <a href="http://www.phpbb.com/kb/article/doesnt-have-a-default-value-errors/">Knowledge Base article about upgrading the MySQL schema</a>. If you encounter problems, please use <a href="http://www.phpbb.com/community/viewforum.php?f=46">our support forums</a>.',
+
 	'NAMING_CONFLICT'			=> 'Naming conflict: %s and %s are both aliases<br /><br />%s',
 	'NEXT_STEP'					=> 'Proceed to next step',
 	'NOT_FOUND'					=> 'Cannot find',
@@ -391,7 +393,7 @@ $lang = array_merge($lang, array(
 	'COLLECTING_FILE_DIFFS'			=> 'Collecting file differences',
 	'COMPLETE_LOGIN_TO_BOARD'		=> 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
 	'CONTINUE_UPDATE_NOW'			=> 'Continue the update process now',
-	'CURRENT_FILE'					=> 'Beginning of current original file',
+	'CURRENT_FILE'					=> 'Begin of Conflict - Original File code before update',
 	'CURRENT_VERSION'				=> 'Current version',
 
 	'DATABASE_TYPE'						=> 'Database type',
@@ -401,7 +403,7 @@ $lang = array_merge($lang, array(
 	'DESTINATION'						=> 'Destination file',
 	'DIFF_INLINE'						=> 'Inline',
 	'DIFF_RAW'							=> 'Raw unified diff',
-	'DIFF_SEP_EXPLAIN'					=> 'End of current original file / Beginning of new updated file',
+	'DIFF_SEP_EXPLAIN'					=> 'Code block used within the updated/new file',
 	'DIFF_SIDE_BY_SIDE'					=> 'Side by Side',
 	'DIFF_UNIFIED'						=> 'Unified diff',
 	'DO_NOT_UPDATE'						=> 'Do not update this file',
@@ -409,6 +411,8 @@ $lang = array_merge($lang, array(
 	'DOWNLOAD'							=> 'Download',
 	'DOWNLOAD_AS'						=> 'Download as',
 	'DOWNLOAD_UPDATE_METHOD_BUTTON'		=> 'Download modified files archive (recommended)',
+	'DOWNLOAD_CONFLICTS'				=> 'Download conflicts for this file',
+	'DOWNLOAD_CONFLICTS_EXPLAIN'		=> 'Search for &lt;&lt;&lt; to spot conflicts',
 	'DOWNLOAD_UPDATE_METHOD'			=> 'Download modified files archive',
 	'DOWNLOAD_UPDATE_METHOD_EXPLAIN'	=> 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.',
 
@@ -453,13 +457,13 @@ $lang = array_merge($lang, array(
 
 	'MERGE_NO_MERGE_NEW_OPTION'	=> 'Do not merge - use new file',
 	'MERGE_NO_MERGE_MOD_OPTION'	=> 'Do not merge - use currently installed file',
-	'MERGE_MOD_FILE_OPTION'		=> 'Merge differences and use modified code within conflicting block',
-	'MERGE_NEW_FILE_OPTION'		=> 'Merge differences and use new file code within conflicting block',
+	'MERGE_MOD_FILE_OPTION'		=> 'Merge modifications (Loose new phpBB code within conflicting block)',
+	'MERGE_NEW_FILE_OPTION'		=> 'Merge modifications (Loose modified code within conflicting block)',
 	'MERGE_SELECT_ERROR'		=> 'Conflicting file merge modes are not correctly selected.',
 	'MERGING_FILES'				=> 'Merging differences',
 	'MERGING_FILES_EXPLAIN'		=> 'Currently collecting final file changes.<br /><br />Please wait until phpBB has completed all operations on changed files.',
 
-	'NEW_FILE'						=> 'End of new updated file',
+	'NEW_FILE'						=> 'End of Conflict',
 	'NEW_USERNAME'					=> 'New username',
 	'NO_AUTH_UPDATE'				=> 'Not authorised to update',
 	'NO_ERRORS'						=> 'No errors',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 4ece142031..0c26e612e3 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -122,6 +122,9 @@ $lang = array_merge($lang, array(
 	'CONFIRM_EMAIL'				=> 'Confirm e-mail address',
 	'CONFIRM_EMAIL_EXPLAIN'		=> 'You only need to specify this if you are changing your e-mail address.',
 	'CONFIRM_EXPLAIN'			=> 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
+	'VC_REFRESH'				=> 'New Image',
+	'VC_REFRESH_EXPLAIN'		=> 'If you cannot read the code, then you can request a new one by clicking the button.',
+
 	'CONFIRM_PASSWORD'			=> 'Confirm password',
 	'CONFIRM_PASSWORD_EXPLAIN'	=> 'You only need to confirm your password if you changed it above.',
 	'COPPA_BIRTHDAY'			=> 'To continue with the registration procedure please tell us when you were born.',
@@ -325,7 +328,7 @@ $lang = array_merge($lang, array(
 	'PASS_TYPE_SYMBOL_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case, must contain numbers and must contain symbols.',
 	'PASSWORD'					=> 'Password',
 	'PASSWORD_ACTIVATED'		=> 'Your new password has been activated.',
-	'PASSWORD_UPDATED'			=> 'Your password has been sent successfully to your original e-mail address.',
+	'PASSWORD_UPDATED'			=> 'A new password was sent to your registered email address.',
 	'PERMISSIONS_RESTORED'		=> 'Successfully restored original permissions.',
 	'PERMISSIONS_TRANSFERRED'	=> 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
 	'PM_DISABLED'				=> 'Private messaging has been disabled on this board.',
-- 
cgit v1.2.1


From 1042152a55ab2d0764c446949a77f085ab7a77f3 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 18 Apr 2009 15:09:19 +0000
Subject: Merge changes made in revisions #r9405 to #r9467 2009-04-18

git-svn-id: file:///svn/phpbb/trunk@9468 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/board.php       |  4 ++--
 phpBB/language/en/acp/permissions.php | 14 +++++++-------
 phpBB/language/en/acp/search.php      |  2 ++
 phpBB/language/en/common.php          |  8 +++++---
 phpBB/language/en/help_bbcode.php     |  2 +-
 phpBB/language/en/posting.php         |  2 +-
 phpBB/language/en/search.php          |  2 ++
 phpBB/language/en/ucp.php             |  4 ++--
 8 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index dc12cbb42a..3c96f239e8 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -269,8 +269,8 @@ $lang = array_merge($lang, array(
 	'VISUAL_CONFIRM_POST_EXPLAIN'			=> 'Requires anonymous users to enter a random code matching an image to help prevent mass postings.',
 	'VISUAL_CONFIRM_REG'					=> 'Enable visual confirmation for registrations',
 	'VISUAL_CONFIRM_REG_EXPLAIN'			=> 'Requires new users to enter a random code matching an image to help prevent mass registrations.',
-	'VISUAL_CONFIRM_REFRESH'				=> 'Enable users to request new images',
-	'VISUAL_CONFIRM_REFRESH_EXPLAIN'		=> 'Allows users to request new images, if they are unable to solve the VC during registration.',
+	'VISUAL_CONFIRM_REFRESH'				=> 'Enable users to refresh the confirmation image',
+	'VISUAL_CONFIRM_REFRESH_EXPLAIN'		=> 'Allows users to request new confirmation codes, if they are unable to solve the VC during registration.',
 ));
 
 // Cookie Settings
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index bba425d076..920643d927 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -50,7 +50,7 @@ $lang = array_merge($lang, array(
 
 		<h2>Permission Masks</h2>
 		<p>These are used to view the effective permissions assigned to Users, Moderators (Local and Global), Administrators or Forums.</p>
-	
+
 		<br />
 
 		<p>For further information on setting up and managing permissions on your phpBB3 board, please see <a href="http://www.phpbb.com/support/documentation/3.0/quickstart/quick_permissions.html">Chapter 1.5 of our Quick Start Guide</a>.</p>
@@ -71,7 +71,7 @@ $lang = array_merge($lang, array(
 	'ACL_TYPE_GLOBAL_M_'	=> 'Global Moderator permissions',
 	'ACL_TYPE_LOCAL_M_'		=> 'Forum Moderator permissions',
 	'ACL_TYPE_LOCAL_F_'		=> 'Forum permissions',
-	
+
 	'ACL_NO'				=> 'No',
 	'ACL_VIEW'				=> 'Viewing permissions',
 	'ACL_VIEW_EXPLAIN'		=> 'Here you can see the effective permissions the user/group is having. A red square indicates that the user/group does not have the permission, a green square indicates that the user/group does have the permission.',
@@ -83,10 +83,10 @@ $lang = array_merge($lang, array(
 	'ACP_GLOBAL_MODERATORS_EXPLAIN'				=> 'Here you can assign global moderator permissions to users or groups. These moderators are like ordinary moderators except they have access to every forum on your board.',
 	'ACP_GROUPS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to groups.',
 	'ACP_GROUPS_PERMISSIONS_EXPLAIN'			=> 'Here you can assign global permissions to groups - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. Individual users permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
-	'ACP_ADMIN_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.',
-	'ACP_FORUM_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.',
-	'ACP_MOD_ROLES_EXPLAIN'						=> 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.',
-	'ACP_USER_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.',
+	'ACP_ADMIN_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
+	'ACP_FORUM_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
+	'ACP_MOD_ROLES_EXPLAIN'						=> 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
+	'ACP_USER_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
 	'ACP_USERS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to users.',
 	'ACP_USERS_PERMISSIONS_EXPLAIN'				=> 'Here you can assign global permissions to users - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. To alter these settings for large numbers of users the Group permissions system is the preferred method. User’s permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
 	'ACP_VIEW_ADMIN_PERMISSIONS_EXPLAIN'		=> 'Here you can view the effective administrative permissions assigned to the selected users/groups.',
@@ -196,7 +196,7 @@ $lang = array_merge($lang, array(
 	'ROLE_DESCRIPTION_USER_NOAVATAR'		=> 'Has a limited feature set and is not allowed to use the Avatar feature.',
 	'ROLE_DESCRIPTION_USER_NOPM'			=> 'Has a limited feature set, and is not allowed to use Private Messages.',
 	'ROLE_DESCRIPTION_USER_STANDARD'		=> 'Can access most but not all user features. Cannot change user name or ignore the flood limit, for instance.',
-	
+
 	'ROLE_DESCRIPTION_EXPLAIN'		=> 'You are able to enter a short explanation of what the role is doing or for what it is meant for. The text you enter here will be displayed within the permissions screens too.',
 	'ROLE_DESCRIPTION_LONG'			=> 'The role description is too long, please limit it to 4000 characters.',
 	'ROLE_DETAILS'					=> 'Role details',
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 16fa7fdf6e..11e6723c75 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -68,6 +68,8 @@ $lang = array_merge($lang, array(
 
 	'MAX_SEARCH_CHARS'						=> 'Max characters indexed by search',
 	'MAX_SEARCH_CHARS_EXPLAIN'				=> 'Words with no more than this many characters will be indexed for searching.',
+	'MAX_NUM_SEARCH_KEYWORDS'				=> 'Maximum number of allowed keywords',
+	'MAX_NUM_SEARCH_KEYWORDS_EXPLAIN'		=> 'Maximum number of words the user is able to search for. A value of 0 allows an unlimited number of words.',
 	'MIN_SEARCH_CHARS'						=> 'Min characters indexed by search',
 	'MIN_SEARCH_CHARS_EXPLAIN'				=> 'Words with at least this many characters will be indexed for searching.',
 	'MIN_SEARCH_AUTHOR_CHARS'				=> 'Min author name characters',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 3dbda4a4db..048e732e83 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -87,7 +87,7 @@ $lang = array_merge($lang, array(
 	'AVATAR_NO_SIZE'				=> 'The width or height of the linked avatar could not be determined. Please enter them manually.',
 	'AVATAR_PARTIAL_UPLOAD'			=> 'The specified file was only partially uploaded.',
 	'AVATAR_PHP_SIZE_NA'			=> 'The avatar’s filesize is too large.<br />The maximum allowed filesize set in php.ini could not be determined.',
-	'AVATAR_PHP_SIZE_OVERRUN'		=> 'The avatar’s filesize is too large. The maximum allowed upload size is %d MB.<br />Please note this is set in php.ini and cannot be overridden.',
+	'AVATAR_PHP_SIZE_OVERRUN'		=> 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
 	'AVATAR_URL_INVALID'			=> 'The URL you specified is invalid.',
 	'AVATAR_URL_NOT_FOUND'			=> 'The file specified could not be found.',
 	'AVATAR_WRONG_FILESIZE'			=> 'The avatar’s filesize must be between 0 and %1d %2s.',
@@ -163,7 +163,7 @@ $lang = array_merge($lang, array(
 	),
 
 	'EDIT_POST'							=> 'Edit post',
-	'EMAIL'								=> 'E-mail',
+	'EMAIL'								=> 'E-mail', // Short form for EMAIL_ADDRESS
 	'EMAIL_ADDRESS'						=> 'E-mail address',
 	'EMAIL_SMTP_ERROR_RESPONSE'			=> 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',
 	'EMPTY_SUBJECT'						=> 'You must specify a subject when posting a new topic.',
@@ -233,6 +233,8 @@ $lang = array_merge($lang, array(
 	'FTP_USERNAME_EXPLAIN'		=> 'Username used to connect to your server.',
 
 	'GENERAL_ERROR'				=> 'General Error',
+	'GB'						=> 'GB',
+	'GIB'						=> 'GiB',
 	'GO'						=> 'Go',
 	'GOTO_PAGE'					=> 'Go to page',
 	'GROUP'						=> 'Group',
@@ -535,7 +537,7 @@ $lang = array_merge($lang, array(
 	'SELECT_ALL_CODE'			=> 'Select all',
 	'SELECT_DESTINATION_FORUM'	=> 'Please select a destination forum',
 	'SELECT_FORUM'				=> 'Select a forum',
-	'SEND_EMAIL'				=> 'E-mail',
+	'SEND_EMAIL'				=> 'E-mail',				// Used for submit buttons
 	'SEND_EMAIL_USER'			=> 'E-mail',				// Used as: {L_SEND_EMAIL_USER} {USERNAME} -> E-mail UserX
 	'SEND_PRIVATE_MESSAGE'		=> 'Send private message',
 	'SETTINGS'					=> 'Settings',
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index 00b00c9e19..ed6fea96d3 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -76,7 +76,7 @@ $help = array(
 	),
 	array(
 		0 => 'Creating an Ordered list',
-		1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: arabic-numbers"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>'
+		1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>'
 	),
 	array(
 		0 => '--',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index f75837e96f..b3acb7f290 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -141,7 +141,7 @@ $lang = array_merge($lang, array(
 
 	'PARTIAL_UPLOAD'			=> 'The uploaded file was only partially uploaded.',
 	'PHP_SIZE_NA'				=> 'The attachment’s file size is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
-	'PHP_SIZE_OVERRUN'			=> 'The attachment’s file size is too large, the maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overridden.',
+	'PHP_SIZE_OVERRUN'			=> 'The attachment’s file size is too large, the maximum upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
 	'PLACE_INLINE'				=> 'Place inline',
 	'POLL_DELETE'				=> 'Delete poll',
 	'POLL_FOR'					=> 'Run poll for',
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 8e376b2602..4618a585b3 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -54,6 +54,8 @@ $lang = array_merge($lang, array(
 
 	'LOGIN_EXPLAIN_EGOSEARCH'	=> 'The board requires you to be registered and logged in to view your own posts.',
 
+	'MAX_NUM_SEARCH_KEYWORDS_REFINE'	=> 'You specified too many words to search for. Please do not enter more than %1$d words.',
+
 	'NO_KEYWORDS'			=> 'You must specify at least one word to search for. Each word must consist of at least %d characters and must not contain more than %d characters excluding wildcards.',
 	'NO_RECENT_SEARCHES'	=> 'No searches have been carried out recently.',
 	'NO_SEARCH'				=> 'Sorry but you are not permitted to use the search system.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 0c26e612e3..ccb6fbdbb4 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -122,8 +122,8 @@ $lang = array_merge($lang, array(
 	'CONFIRM_EMAIL'				=> 'Confirm e-mail address',
 	'CONFIRM_EMAIL_EXPLAIN'		=> 'You only need to specify this if you are changing your e-mail address.',
 	'CONFIRM_EXPLAIN'			=> 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
-	'VC_REFRESH'				=> 'New Image',
-	'VC_REFRESH_EXPLAIN'		=> 'If you cannot read the code, then you can request a new one by clicking the button.',
+	'VC_REFRESH'				=> 'Refresh confirmation code',
+	'VC_REFRESH_EXPLAIN'		=> 'If you cannot read the code you can request a new one by clicking the button.',
 
 	'CONFIRM_PASSWORD'			=> 'Confirm password',
 	'CONFIRM_PASSWORD_EXPLAIN'	=> 'You only need to confirm your password if you changed it above.',
-- 
cgit v1.2.1


From cd40f978f769c6029fdb5839ca0e2f71485e5eae Mon Sep 17 00:00:00 2001
From: Jim Wigginton <terrafrost@phpbb.com>
Date: Sun, 7 Jun 2009 00:51:45 +0000
Subject: - added sftp support

git-svn-id: file:///svn/phpbb/trunk@9553 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/common.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 048e732e83..ec9faad8c1 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -232,6 +232,19 @@ $lang = array_merge($lang, array(
 	'FTP_USERNAME'				=> 'FTP username',
 	'FTP_USERNAME_EXPLAIN'		=> 'Username used to connect to your server.',
 
+	'SFTP_HOST'					=> 'SFTP host',
+	'SFTP_HOST_EXPLAIN'			=> 'SFTP server used to connect your site.',
+	'SFTP_PASSWORD'				=> 'SFTP password',
+	'SFTP_PASSWORD_EXPLAIN'		=> 'Password for your SFTP username.',
+	'SFTP_PORT'					=> 'SFTP port',
+	'SFTP_PORT_EXPLAIN'			=> 'Port used to connect to your server.',
+	'SFTP_ROOT_PATH'			=> 'Path to phpBB',
+	'SFTP_ROOT_PATH_EXPLAIN'	=> 'Path from the root to your phpBB board.',
+	'SFTP_TIMEOUT'				=> 'SFTP timeout',
+	'SFTP_TIMEOUT_EXPLAIN'		=> 'The amount of time, in seconds, that the system will wait for a reply from your server.',
+	'SFTP_USERNAME'				=> 'SFTP username',
+	'SFTP_USERNAME_EXPLAIN'		=> 'Username used to connect to your server.',
+
 	'GENERAL_ERROR'				=> 'General Error',
 	'GB'						=> 'GB',
 	'GIB'						=> 'GiB',
-- 
cgit v1.2.1


From 7909b729bbb1facce975b10da28754eb157723aa Mon Sep 17 00:00:00 2001
From: Jim Wigginton <terrafrost@phpbb.com>
Date: Sun, 12 Jul 2009 15:44:43 +0000
Subject: unified the transfer routines from the updater and from
 acp_language.php. still needs work..

git-svn-id: file:///svn/phpbb/trunk@9751 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/common.php  | 18 ++++++++++++++++++
 phpBB/language/en/install.php | 15 +--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index ec9faad8c1..657df9301b 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -131,6 +131,7 @@ $lang = array_merge($lang, array(
 	'CONGRATULATIONS'		=> 'Congratulations to',
 	'CONNECTION_FAILED'		=> 'Connection failed.',
 	'CONNECTION_SUCCESS'	=> 'Connection was successful!',
+	'CONTINUE_UPDATE'			=> 'Back',
 	'COOKIES_DELETED'		=> 'All board cookies successfully deleted.',
 	'CURRENT_TIME'			=> 'It is currently %s',
 
@@ -162,6 +163,10 @@ $lang = array_merge($lang, array(
 		2		=> 'Viewed %d times',
 	),
 
+	'DOWNLOAD_UPDATE_METHOD'			=> 'Download modified files archive',
+	'DOWNLOAD_UPDATE_METHOD_BUTTON'		=> 'Download modified files archive (recommended)',
+	'DOWNLOAD_UPDATE_METHOD_EXPLAIN'	=> 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.',
+
 	'EDIT_POST'							=> 'Edit post',
 	'EMAIL'								=> 'E-mail', // Short form for EMAIL_ADDRESS
 	'EMAIL_ADDRESS'						=> 'E-mail address',
@@ -206,6 +211,9 @@ $lang = array_merge($lang, array(
 	'FROM'					=> 'from',
 	'FSOCK_DISABLED'		=> 'The operation could not be completed because the <var>fsockopen</var> function has been disabled or the server being queried could not be found.',
 
+	'FTP_SETTINGS'					=> 'FTP settings',
+	'FTP_UPDATE_METHOD'				=> 'FTP upload',
+
 	'FTP_FSOCK_HOST'				=> 'FTP host',
 	'FTP_FSOCK_HOST_EXPLAIN'		=> 'FTP server used to connect your site.',
 	'FTP_FSOCK_PASSWORD'			=> 'FTP password',
@@ -338,6 +346,7 @@ $lang = array_merge($lang, array(
 	'LOGOUT_USER'						=> 'Logout [ %s ]',
 	'LOG_ME_IN'							=> 'Log me on automatically each visit',
 
+	'MAPPING_FILE_STRUCTURE'	=> 'To ease the upload here are the file locations which map your phpBB installation.',
 	'MARK'					=> 'Mark',
 	'MARK_ALL'				=> 'Mark all',
 	'MARK_FORUMS_READ'		=> 'Mark forums read',
@@ -550,10 +559,12 @@ $lang = array_merge($lang, array(
 	'SELECT_ALL_CODE'			=> 'Select all',
 	'SELECT_DESTINATION_FORUM'	=> 'Please select a destination forum',
 	'SELECT_FORUM'				=> 'Select a forum',
+	'SELECT_FTP_SETTINGS'		=> 'Select FTP settings',
 	'SEND_EMAIL'				=> 'E-mail',				// Used for submit buttons
 	'SEND_EMAIL_USER'			=> 'E-mail',				// Used as: {L_SEND_EMAIL_USER} {USERNAME} -> E-mail UserX
 	'SEND_PRIVATE_MESSAGE'		=> 'Send private message',
 	'SETTINGS'					=> 'Settings',
+
 	'SIGNATURE'					=> 'Signature',
 	'SKIP'						=> 'Skip to content',
 	'SMTP_NO_AUTH_SUPPORT'		=> 'SMTP server does not support authentication.',
@@ -655,6 +666,9 @@ $lang = array_merge($lang, array(
 	),
 	'TRACKED_PHP_ERROR'	=> 'Tracked PHP errors: %s',
 
+	'TRY_DOWNLOAD_METHOD'		=> 'You may want to try the download modified files method.<br />This method always works and is also the recommended update path.',
+	'TRY_DOWNLOAD_METHOD_BUTTON'=> 'Try this method now',
+
 	'UNABLE_GET_IMAGE_SIZE'	=> 'It was not possible to determine the dimensions of the image.',
 	'UNABLE_TO_DELIVER_FILE'=> 'Unable to deliver file.',
 	'UNKNOWN_BROWSER'		=> 'Unknown browser',
@@ -669,7 +683,11 @@ $lang = array_merge($lang, array(
 	'UNWATCHED_TOPICS'			=> 'You are no longer subscribed to the selected topics.',
 	'UNWATCHED_FORUMS_TOPICS'	=> 'You are no longer subscribed to the selected entries.',
 	'UPDATE'				=> 'Update',
+	'UPDATE_FILES'					=> 'Update files',
+	'UPDATE_METHOD_EXPLAIN'			=> 'You are now able to choose your preferred update method. Using the FTP upload will present you with a form you need to enter your FTP account details into. With this method the files will be automatically moved to the new location and backups of the old files being created by appending .bak to the filename. If you choose to download the modified files you are able to unpack and upload them to their correct location manually later.',
 	'UPLOAD_IN_PROGRESS'	=> 'The upload is currently in progress.',
+	'UPDATE_SUCCESS'				=> 'Update was successful',
+	'UPDATE_SUCCESS_EXPLAIN'		=> 'Successfully updated all files. You should now check to see if everything is working fine.',
 	'URL_REDIRECT'			=> 'If your browser does not support meta redirection %splease click HERE to be redirected%s.',
 	'USERGROUPS'			=> 'Groups',
 	'USERNAME'				=> 'Username',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 087149e5aa..9feed02da6 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -384,7 +384,6 @@ $lang = array_merge($lang, array(
 
 	'CHANGE_CLEAN_NAMES'			=> 'The method used to make sure a username is not used by multiple users has been changed. There are some users which have the same name when compared with the new method. You have to delete or rename these users to make sure that each name is only used by one user before you can proceed.',
 	'CHECK_FILES'					=> 'Check files',
-	'CHECK_FILES_AGAIN'				=> 'Check files again',
 	'CHECK_FILES_EXPLAIN'			=> 'Within the next step all files will be checked against the update files - this can take a while if this is the first file check.',
 	'CHECK_FILES_UP_TO_DATE'		=> 'According to your database your version is up to date. You may want to proceed with the file check to make sure all files are really up to date with the latest phpBB version.',
 	'CHECK_UPDATE_DATABASE'			=> 'Continue update process',
@@ -392,6 +391,7 @@ $lang = array_merge($lang, array(
 	'COLLECTED_INFORMATION_EXPLAIN'	=> 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
 	'COLLECTING_FILE_DIFFS'			=> 'Collecting file differences',
 	'COMPLETE_LOGIN_TO_BOARD'		=> 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
+	'CONTINUE_UPDATE'				=> 'Check files again',
 	'CONTINUE_UPDATE_NOW'			=> 'Continue the update process now',
 	'CURRENT_FILE'					=> 'Begin of Conflict - Original File code before update',
 	'CURRENT_VERSION'				=> 'Current version',
@@ -410,11 +410,8 @@ $lang = array_merge($lang, array(
 	'DONE'								=> 'Done',
 	'DOWNLOAD'							=> 'Download',
 	'DOWNLOAD_AS'						=> 'Download as',
-	'DOWNLOAD_UPDATE_METHOD_BUTTON'		=> 'Download modified files archive (recommended)',
 	'DOWNLOAD_CONFLICTS'				=> 'Download conflicts for this file',
 	'DOWNLOAD_CONFLICTS_EXPLAIN'		=> 'Search for &lt;&lt;&lt; to spot conflicts',
-	'DOWNLOAD_UPDATE_METHOD'			=> 'Download modified files archive',
-	'DOWNLOAD_UPDATE_METHOD_EXPLAIN'	=> 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.',
 
 	'ERROR'			=> 'Error',
 	'EDIT_USERNAME'	=> 'Edit username',
@@ -434,8 +431,6 @@ $lang = array_merge($lang, array(
 	'FILES_NOT_MODIFIED_EXPLAIN'	=> 'The following files are not modified and represent the original phpBB files from the version you want to update from.',
 	'FILES_UP_TO_DATE'				=> 'Already updated files',
 	'FILES_UP_TO_DATE_EXPLAIN'		=> 'The following files are already up to date and do not need to be updated.',
-	'FTP_SETTINGS'					=> 'FTP settings',
-	'FTP_UPDATE_METHOD'				=> 'FTP upload',
 
 	'INCOMPATIBLE_UPDATE_FILES'		=> 'The update files found are incompatible with your installed version. Your installed version is %1$s and the update file is for updating phpBB %2$s to %3$s.',
 	'INCOMPLETE_UPDATE_FILES'		=> 'The update files are incomplete.',
@@ -451,8 +446,6 @@ $lang = array_merge($lang, array(
 	'LINE_UNMODIFIED'		=> 'Unmodified',
 	'LOGIN_UPDATE_EXPLAIN'	=> 'In order to update your installation you need to login first.',
 
-	'MAPPING_FILE_STRUCTURE'	=> 'To ease the upload here are the file locations which map your phpBB installation.',
-
 	'MERGE_MODIFICATIONS_OPTION'	=> 'Merge modifications',
 
 	'MERGE_NO_MERGE_NEW_OPTION'	=> 'Do not merge - use new file',
@@ -491,7 +484,6 @@ $lang = array_merge($lang, array(
 
 	'SELECT_DIFF_MODE'			=> 'Select diff mode',
 	'SELECT_DOWNLOAD_FORMAT'	=> 'Select download archive format',
-	'SELECT_FTP_SETTINGS'		=> 'Select FTP settings',
 	'SHOW_DIFF_CONFLICT'		=> 'Show differences/conflicts',
 	'SHOW_DIFF_FINAL'			=> 'Show resulting file',
 	'SHOW_DIFF_MODIFIED'		=> 'Show merged differences',
@@ -513,14 +505,11 @@ $lang = array_merge($lang, array(
 	'STATUS_UP_TO_DATE'			=> 'Already updated file',
 
 	'TOGGLE_DISPLAY'			=> 'View/Hide file list',
-	'TRY_DOWNLOAD_METHOD'		=> 'You may want to try the download modified files method.<br />This method always works and is also the recommended update path.',
-	'TRY_DOWNLOAD_METHOD_BUTTON'=> 'Try this method now',
 
 	'UPDATE_COMPLETED'				=> 'Update completed',
 	'UPDATE_DATABASE'				=> 'Update database',
 	'UPDATE_DATABASE_EXPLAIN'		=> 'Within the next step the database will be updated.',
 	'UPDATE_DATABASE_SCHEMA'		=> 'Updating database schema',
-	'UPDATE_FILES'					=> 'Update files',
 	'UPDATE_FILES_NOTICE'			=> 'Please make sure you have updated your board files too, this file is only updating your database.',
 	'UPDATE_INSTALLATION'			=> 'Update phpBB installation',
 	'UPDATE_INSTALLATION_EXPLAIN'	=> 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />',
@@ -555,9 +544,7 @@ $lang = array_merge($lang, array(
 		<p>phpBB detected an incomplete automatic update. Please make sure you followed every step within the automatic update tool. Below you will find the link again, or go directly to your install directory.</p>
 	',
 	'UPDATE_METHOD'					=> 'Update method',
-	'UPDATE_METHOD_EXPLAIN'			=> 'You are now able to choose your preferred update method. Using the FTP upload will present you with a form you need to enter your FTP account details into. With this method the files will be automatically moved to the new location and backups of the old files being created by appending .bak to the filename. If you choose to download the modified files you are able to unpack and upload them to their correct location manually later.',
 	'UPDATE_REQUIRES_FILE'			=> 'The updater requires that the following file is present: %s',
-	'UPDATE_SUCCESS'				=> 'Update was successful',
 	'UPDATE_SUCCESS_EXPLAIN'		=> 'Successfully updated all files. The next step involves checking all files again to make sure the files got updated correctly.',
 	'UPDATE_VERSION_OPTIMIZE'		=> 'Updating version and optimising tables',
 	'UPDATING_DATA'					=> 'Updating data',
-- 
cgit v1.2.1


From bf8ac19eaa8d74f9dfd6d597190f5664e7339382 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 4 Oct 2009 18:13:59 +0000
Subject: Move trunk/phpBB to old_trunk/phpBB

git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/attachments.php              | 164 ----
 phpBB/language/en/acp/ban.php                      |  82 --
 phpBB/language/en/acp/board.php                    | 487 -----------
 phpBB/language/en/acp/bots.php                     |  73 --
 phpBB/language/en/acp/common.php                   | 692 ----------------
 phpBB/language/en/acp/database.php                 |  75 --
 phpBB/language/en/acp/email.php                    |  67 --
 phpBB/language/en/acp/forums.php                   | 155 ----
 phpBB/language/en/acp/groups.php                   | 129 ---
 phpBB/language/en/acp/language.php                 | 102 ---
 phpBB/language/en/acp/modules.php                  |  84 --
 phpBB/language/en/acp/permissions.php              | 277 -------
 phpBB/language/en/acp/permissions_phpbb.php        | 241 ------
 phpBB/language/en/acp/posting.php                  | 273 ------
 phpBB/language/en/acp/profile.php                  | 154 ----
 phpBB/language/en/acp/prune.php                    |  91 --
 phpBB/language/en/acp/search.php                   | 103 ---
 phpBB/language/en/acp/styles.php                   | 421 ----------
 phpBB/language/en/acp/users.php                    | 132 ---
 phpBB/language/en/common.php                       | 913 ---------------------
 phpBB/language/en/email/admin_activate.txt         |  14 -
 phpBB/language/en/email/admin_send_email.txt       |  14 -
 .../language/en/email/admin_welcome_activated.txt  |   7 -
 phpBB/language/en/email/admin_welcome_inactive.txt |  20 -
 phpBB/language/en/email/coppa_resend_inactive.txt  |  42 -
 phpBB/language/en/email/coppa_welcome_inactive.txt |  43 -
 phpBB/language/en/email/email_notify.txt           |  17 -
 phpBB/language/en/email/forum_notify.txt           |  19 -
 phpBB/language/en/email/group_added.txt            |  11 -
 phpBB/language/en/email/group_approved.txt         |  10 -
 phpBB/language/en/email/group_request.txt          |  10 -
 phpBB/language/en/email/installed.txt              |  20 -
 phpBB/language/en/email/newtopic_notify.txt        |  13 -
 phpBB/language/en/email/post_approved.txt          |  14 -
 phpBB/language/en/email/post_disapproved.txt       |  12 -
 phpBB/language/en/email/privmsg_notify.txt         |  15 -
 phpBB/language/en/email/profile_send_email.txt     |  13 -
 phpBB/language/en/email/profile_send_im.txt        |  13 -
 phpBB/language/en/email/report_closed.txt          |   8 -
 phpBB/language/en/email/report_deleted.txt         |   8 -
 phpBB/language/en/email/topic_approved.txt         |  11 -
 phpBB/language/en/email/topic_disapproved.txt      |  12 -
 phpBB/language/en/email/topic_notify.txt           |  20 -
 phpBB/language/en/email/user_activate.txt          |   9 -
 phpBB/language/en/email/user_activate_inactive.txt |   7 -
 phpBB/language/en/email/user_activate_passwd.txt   |  17 -
 .../language/en/email/user_reactivate_account.txt  |  19 -
 phpBB/language/en/email/user_remind_inactive.txt   |  11 -
 phpBB/language/en/email/user_resend_inactive.txt   |  20 -
 phpBB/language/en/email/user_welcome.txt           |  18 -
 phpBB/language/en/email/user_welcome_inactive.txt  |  22 -
 phpBB/language/en/groups.php                       |  96 ---
 phpBB/language/en/help_bbcode.php                  | 111 ---
 phpBB/language/en/help_faq.php                     | 339 --------
 phpBB/language/en/install.php                      | 627 --------------
 phpBB/language/en/iso.txt                          |   3 -
 phpBB/language/en/mcp.php                          | 376 ---------
 phpBB/language/en/memberlist.php                   | 146 ----
 phpBB/language/en/posting.php                      | 222 -----
 phpBB/language/en/recaptcha.php                    |  51 --
 phpBB/language/en/search.php                       | 103 ---
 phpBB/language/en/search_ignore_words.php          | 272 ------
 phpBB/language/en/search_synonyms.php              | 191 -----
 phpBB/language/en/ucp.php                          | 547 ------------
 phpBB/language/en/viewforum.php                    |  66 --
 phpBB/language/en/viewtopic.php                    | 113 ---
 66 files changed, 8467 deletions(-)
 delete mode 100644 phpBB/language/en/acp/attachments.php
 delete mode 100644 phpBB/language/en/acp/ban.php
 delete mode 100644 phpBB/language/en/acp/board.php
 delete mode 100644 phpBB/language/en/acp/bots.php
 delete mode 100644 phpBB/language/en/acp/common.php
 delete mode 100644 phpBB/language/en/acp/database.php
 delete mode 100644 phpBB/language/en/acp/email.php
 delete mode 100644 phpBB/language/en/acp/forums.php
 delete mode 100644 phpBB/language/en/acp/groups.php
 delete mode 100644 phpBB/language/en/acp/language.php
 delete mode 100644 phpBB/language/en/acp/modules.php
 delete mode 100644 phpBB/language/en/acp/permissions.php
 delete mode 100644 phpBB/language/en/acp/permissions_phpbb.php
 delete mode 100644 phpBB/language/en/acp/posting.php
 delete mode 100644 phpBB/language/en/acp/profile.php
 delete mode 100644 phpBB/language/en/acp/prune.php
 delete mode 100644 phpBB/language/en/acp/search.php
 delete mode 100644 phpBB/language/en/acp/styles.php
 delete mode 100644 phpBB/language/en/acp/users.php
 delete mode 100644 phpBB/language/en/common.php
 delete mode 100644 phpBB/language/en/email/admin_activate.txt
 delete mode 100644 phpBB/language/en/email/admin_send_email.txt
 delete mode 100644 phpBB/language/en/email/admin_welcome_activated.txt
 delete mode 100644 phpBB/language/en/email/admin_welcome_inactive.txt
 delete mode 100644 phpBB/language/en/email/coppa_resend_inactive.txt
 delete mode 100644 phpBB/language/en/email/coppa_welcome_inactive.txt
 delete mode 100644 phpBB/language/en/email/email_notify.txt
 delete mode 100644 phpBB/language/en/email/forum_notify.txt
 delete mode 100644 phpBB/language/en/email/group_added.txt
 delete mode 100644 phpBB/language/en/email/group_approved.txt
 delete mode 100644 phpBB/language/en/email/group_request.txt
 delete mode 100644 phpBB/language/en/email/installed.txt
 delete mode 100644 phpBB/language/en/email/newtopic_notify.txt
 delete mode 100644 phpBB/language/en/email/post_approved.txt
 delete mode 100644 phpBB/language/en/email/post_disapproved.txt
 delete mode 100644 phpBB/language/en/email/privmsg_notify.txt
 delete mode 100644 phpBB/language/en/email/profile_send_email.txt
 delete mode 100644 phpBB/language/en/email/profile_send_im.txt
 delete mode 100644 phpBB/language/en/email/report_closed.txt
 delete mode 100644 phpBB/language/en/email/report_deleted.txt
 delete mode 100644 phpBB/language/en/email/topic_approved.txt
 delete mode 100644 phpBB/language/en/email/topic_disapproved.txt
 delete mode 100644 phpBB/language/en/email/topic_notify.txt
 delete mode 100644 phpBB/language/en/email/user_activate.txt
 delete mode 100644 phpBB/language/en/email/user_activate_inactive.txt
 delete mode 100644 phpBB/language/en/email/user_activate_passwd.txt
 delete mode 100644 phpBB/language/en/email/user_reactivate_account.txt
 delete mode 100644 phpBB/language/en/email/user_remind_inactive.txt
 delete mode 100644 phpBB/language/en/email/user_resend_inactive.txt
 delete mode 100644 phpBB/language/en/email/user_welcome.txt
 delete mode 100644 phpBB/language/en/email/user_welcome_inactive.txt
 delete mode 100644 phpBB/language/en/groups.php
 delete mode 100644 phpBB/language/en/help_bbcode.php
 delete mode 100644 phpBB/language/en/help_faq.php
 delete mode 100644 phpBB/language/en/install.php
 delete mode 100644 phpBB/language/en/iso.txt
 delete mode 100644 phpBB/language/en/mcp.php
 delete mode 100644 phpBB/language/en/memberlist.php
 delete mode 100644 phpBB/language/en/posting.php
 delete mode 100644 phpBB/language/en/recaptcha.php
 delete mode 100644 phpBB/language/en/search.php
 delete mode 100644 phpBB/language/en/search_ignore_words.php
 delete mode 100644 phpBB/language/en/search_synonyms.php
 delete mode 100644 phpBB/language/en/ucp.php
 delete mode 100644 phpBB/language/en/viewforum.php
 delete mode 100644 phpBB/language/en/viewtopic.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
deleted file mode 100644
index f6369b6739..0000000000
--- a/phpBB/language/en/acp/attachments.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
-*
-* acp_attachments [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ACP_ATTACHMENT_SETTINGS_EXPLAIN'	=> 'Here you can configure the main settings for attachments and the associated special categories.',
-	'ACP_EXTENSION_GROUPS_EXPLAIN'		=> 'Here you can add, delete, modify or disable your extension groups. Further options include the assignment of a special category to them, changing the download mechanism and defining an upload icon which will be displayed in front of the attachment which belongs to the group.',
-	'ACP_MANAGE_EXTENSIONS_EXPLAIN'		=> 'Here you can manage your allowed extensions. To activate your extensions, please refer to the extension groups management panel. We strongly recommend not to allow scripting extensions (such as <code>php</code>, <code>php3</code>, <code>php4</code>, <code>phtml</code>, <code>pl</code>, <code>cgi</code>, <code>py</code>, <code>rb</code>, <code>asp</code>, <code>aspx</code>, and so forth…).',
-	'ACP_ORPHAN_ATTACHMENTS_EXPLAIN'	=> 'Here you are able to see orphaned files. This happens mostly if users are attaching files but not submitting the post. You are able to delete the files or attach them to existing posts. Attaching to posts requires a valid post ID, you have to determine this ID by yourself. This will assign the already uploaded attachment to the post you entered.',
-	'ADD_EXTENSION'						=> 'Add extension',
-	'ADD_EXTENSION_GROUP'				=> 'Add extension group',
-	'ADMIN_UPLOAD_ERROR'				=> 'Errors while trying to attach file: “%s”.',
-	'ALLOWED_FORUMS'					=> 'Allowed forums',
-	'ALLOWED_FORUMS_EXPLAIN'			=> 'Able to post the assigned extensions at the selected (or all if selected) forums.',
-	'ALLOWED_IN_PM_POST'				=> 'Allowed',
-	'ALLOW_ATTACHMENTS'					=> 'Allow attachments',
-	'ALLOW_ALL_FORUMS'					=> 'Allow all forums',
-	'ALLOW_IN_PM'						=> 'Allowed in private messaging',
-	'ALLOW_PM_ATTACHMENTS'				=> 'Allow attachments in private messages',
-	'ALLOW_SELECTED_FORUMS'				=> 'Only forums selected below',
-	'ASSIGNED_EXTENSIONS'				=> 'Assigned extensions',
-	'ASSIGNED_GROUP'					=> 'Assigned extension group',
-	'ATTACH_EXTENSIONS_URL'				=> 'Extensions',
-	'ATTACH_EXT_GROUPS_URL'				=> 'Extension groups',
-	'ATTACH_ID'							=> 'ID',
-	'ATTACH_MAX_FILESIZE'				=> 'Maximum file size',
-	'ATTACH_MAX_FILESIZE_EXPLAIN'		=> 'Maximum size of each file, with 0 being unlimited.',
-	'ATTACH_MAX_PM_FILESIZE'			=> 'Maximum file size messaging',
-	'ATTACH_MAX_PM_FILESIZE_EXPLAIN'	=> 'Maximum size of each file, with 0 being unlimited, attached to a private message.',
-	'ATTACH_ORPHAN_URL'					=> 'Orphan attachments',
-	'ATTACH_POST_ID'					=> 'Post ID',
-	'ATTACH_QUOTA'						=> 'Total attachment quota',
-	'ATTACH_QUOTA_EXPLAIN'				=> 'Maximum drive space available for attachments for the whole board, with 0 being unlimited.',
-	'ATTACH_TO_POST'					=> 'Attach file to post',
-
-	'CAT_FLASH_FILES'			=> 'Flash files',
-	'CAT_IMAGES'				=> 'Images',
-	'CAT_QUICKTIME_FILES'		=> 'Quicktime media files',
-	'CAT_RM_FILES'				=> 'RealMedia media files',
-	'CAT_WM_FILES'				=> 'Windows Media media files',
-	'CHECK_CONTENT'				=> 'Check attachment files',
-	'CHECK_CONTENT_EXPLAIN'		=> 'Some browsers can be tricked to assume an incorrect mimetype for uploaded files. This option ensures that such files likely to cause this are rejected.',
-	'CREATE_GROUP'				=> 'Create new group',
-	'CREATE_THUMBNAIL'			=> 'Create thumbnail',
-	'CREATE_THUMBNAIL_EXPLAIN'	=> 'Create a thumbnail in all possible situations.',
-
-	'DEFINE_ALLOWED_IPS'			=> 'Define allowed IPs/hostnames',
-	'DEFINE_DISALLOWED_IPS'			=> 'Define disallowed IPs/hostnames',
-	'DOWNLOAD_ADD_IPS_EXPLAIN'		=> 'To specify several different IPs or hostnames enter each on a new line. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use “*”.',
-	'DOWNLOAD_REMOVE_IPS_EXPLAIN'	=> 'You can remove (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IPs have a blue background.',
-	'DISPLAY_INLINED'				=> 'Display images inline',
-	'DISPLAY_INLINED_EXPLAIN'		=> 'If set to No image attachments will show as a link.',
-	'DISPLAY_ORDER'					=> 'Attachment display order',
-	'DISPLAY_ORDER_EXPLAIN'			=> 'Display attachments ordered by time.',
-	
-	'EDIT_EXTENSION_GROUP'			=> 'Edit extension group',
-	'EXCLUDE_ENTERED_IP'			=> 'Enable this to exclude the entered IP/hostname.',
-	'EXCLUDE_FROM_ALLOWED_IP'		=> 'Exclude IP from allowed IPs/hostnames',
-	'EXCLUDE_FROM_DISALLOWED_IP'	=> 'Exclude IP from disallowed IPs/hostnames',
-	'EXTENSIONS_UPDATED'			=> 'Extensions successfully updated.',
-	'EXTENSION_EXIST'				=> 'The extension %s already exists.',
-	'EXTENSION_GROUP'				=> 'Extension group',
-	'EXTENSION_GROUPS'				=> 'Extension groups',
-	'EXTENSION_GROUP_DELETED'		=> 'Extension group successfully deleted.',
-	'EXTENSION_GROUP_EXIST'			=> 'The extension group %s already exists.',
-
-	'GO_TO_EXTENSIONS'		=> 'Go to extension management screen',
-	'GROUP_NAME'			=> 'Group name',
-
-	'IMAGE_LINK_SIZE'			=> 'Image link dimensions',
-	'IMAGE_LINK_SIZE_EXPLAIN'	=> 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.',
-	'IMAGICK_PATH'				=> 'Imagemagick path',
-	'IMAGICK_PATH_EXPLAIN'		=> 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>.',
-
-	'MAX_ATTACHMENTS'				=> 'Maximum number of attachments per post',
-	'MAX_ATTACHMENTS_PM'			=> 'Maximum number of attachments per private message',
-	'MAX_EXTGROUP_FILESIZE'			=> 'Maximum file size',
-	'MAX_IMAGE_SIZE'				=> 'Maximum image dimensions',
-	'MAX_IMAGE_SIZE_EXPLAIN'		=> 'Maximum size of image attachments. Set both values to 0px by 0px to disable dimension checking.',
-	'MAX_THUMB_WIDTH'				=> 'Maximum thumbnail width in pixel',
-	'MAX_THUMB_WIDTH_EXPLAIN'		=> 'A generated thumbnail will not exceed the width set here.',
-	'MIN_THUMB_FILESIZE'			=> 'Minimum thumbnail file size',
-	'MIN_THUMB_FILESIZE_EXPLAIN'	=> 'Do not create a thumbnail for images smaller than this.',
-	'MODE_INLINE'					=> 'Inline',
-	'MODE_PHYSICAL'					=> 'Physical',
-
-	'NOT_ALLOWED_IN_PM'			=> 'Only allowed in posts',
-	'NOT_ALLOWED_IN_PM_POST'	=> 'Not allowed',
-	'NOT_ASSIGNED'				=> 'Not assigned',
-	'NO_EXT_GROUP'				=> 'None',
-	'NO_EXT_GROUP_NAME'			=> 'No group name entered',
-	'NO_EXT_GROUP_SPECIFIED'	=> 'No extension group specified.',
-	'NO_FILE_CAT'				=> 'None',
-	'NO_IMAGE'					=> 'No image',
-	'NO_THUMBNAIL_SUPPORT'		=> 'Thumbnail support has been disabled. For proper functionality either the GD extension need to be available or imagemagick being installed. Both were not found.',
-	'NO_UPLOAD_DIR'				=> 'The upload directory you specified does not exist.',
-	'NO_WRITE_UPLOAD'			=> 'The upload directory you specified cannot be written to. Please alter the permissions to allow the webserver to write to it.',
-
-	'ONLY_ALLOWED_IN_PM'	=> 'Only allowed in private messages',
-	'ORDER_ALLOW_DENY'		=> 'Allow',
-	'ORDER_DENY_ALLOW'		=> 'Deny',
-
-	'REMOVE_ALLOWED_IPS'		=> 'Remove or un-exclude <em>allowed</em> IPs/hostnames',
-	'REMOVE_DISALLOWED_IPS'		=> 'Remove or un-exclude <em>disallowed</em> IPs/hostnames',
-
-	'SEARCH_IMAGICK'				=> 'Search for Imagemagick',
-	'SECURE_ALLOW_DENY'				=> 'Allow/Deny list',
-	'SECURE_ALLOW_DENY_EXPLAIN'		=> 'Change the default behaviour when secure downloads are enabled of the Allow/Deny list to that of a <strong>whitelist</strong> (Allow) or a <strong>blacklist</strong> (Deny).',
-	'SECURE_DOWNLOADS'				=> 'Enable secure downloads',
-	'SECURE_DOWNLOADS_EXPLAIN'		=> 'With this option enabled, downloads are limited to IP’s/hostnames you define.',
-	'SECURE_DOWNLOAD_NOTICE'		=> 'Secure Downloads are not enabled. The settings below will be applied after enabling secure downloads.',
-	'SECURE_DOWNLOAD_UPDATE_SUCCESS'=> 'The IP list has been updated successfully.',
-	'SECURE_EMPTY_REFERRER'			=> 'Allow empty referrer',
-	'SECURE_EMPTY_REFERRER_EXPLAIN'	=> 'Secure downloads are based on referrers. Do you want to allow downloads for those omitting the referrer?',
-	'SETTINGS_CAT_IMAGES'			=> 'Image category settings',
-	'SPECIAL_CATEGORY'				=> 'Special category',
-	'SPECIAL_CATEGORY_EXPLAIN'		=> 'Special categories differ between the way presented within posts.',
-	'SUCCESSFULLY_UPLOADED'			=> 'Successfully uploaded.',
-	'SUCCESS_EXTENSION_GROUP_ADD'	=> 'Extension group successfully added.',
-	'SUCCESS_EXTENSION_GROUP_EDIT'	=> 'Extension group successfully updated.',
-
-	'UPLOADING_FILES'				=> 'Uploading files',
-	'UPLOADING_FILE_TO'				=> 'Uploading file “%1$s” to post number %2$d…',
-	'UPLOAD_DENIED_FORUM'			=> 'You do not have the permission to upload files to forum “%s”.',
-	'UPLOAD_DIR'					=> 'Upload directory',
-	'UPLOAD_DIR_EXPLAIN'			=> 'Storage path for attachments. Please note that if you change this directory while already having uploaded attachments you need to manually copy the files to their new location.',
-	'UPLOAD_ICON'					=> 'Upload icon',
-	'UPLOAD_NOT_DIR'				=> 'The upload location you specified does not appear to be a directory.',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
deleted file mode 100644
index 5fcbb1fa69..0000000000
--- a/phpBB/language/en/acp/ban.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
-*
-* acp_ban [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-// Banning
-$lang = array_merge($lang, array(
-	'1_HOUR'		=> '1 hour',
-	'30_MINS'		=> '30 minutes',
-	'6_HOURS'		=> '6 hours',
-
-	'ACP_BAN_EXPLAIN'	=> 'Here you can control the banning of users by name, IP or e-mail address. These methods prevent a user reaching any part of the board. You can give a short (maximum 3000 characters) reason for the ban if you wish. This will be displayed in the admin log. The duration of a ban can also be specified. If you want the ban to end on a specific date rather than after a set time period select <span style="text-decoration: underline;">Until -&gt;</span> for the ban length and enter a date in <kbd>YYYY-MM-DD</kbd> format.',
-
-	'BAN_EXCLUDE'			=> 'Exclude from banning',
-	'BAN_LENGTH'			=> 'Length of ban',
-	'BAN_REASON'			=> 'Reason for ban',
-	'BAN_GIVE_REASON'		=> 'Reason shown to the banned',
-	'BAN_UPDATE_SUCCESSFUL'	=> 'The banlist has been updated successfully.',
-
-	'EMAIL_BAN'					=> 'Ban one or more e-mail addresses',
-	'EMAIL_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered e-mail address from all current bans.',
-	'EMAIL_BAN_EXPLAIN'			=> 'To specify more than one e-mail address enter each on a new line. To match partial addresses use * as the wildcard, e.g. <samp>*@hotmail.com</samp>, <samp>*@*.domain.tld</samp>, etc.',
-	'EMAIL_NO_BANNED'			=> 'No banned e-mail addresses',
-	'EMAIL_UNBAN'				=> 'Un-ban or un-exclude e-mails',
-	'EMAIL_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple e-mail addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded e-mail addresses are emphasised.',
-
-	'IP_BAN'					=> 'Ban one or more IPs',
-	'IP_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered IP from all current bans.',
-	'IP_BAN_EXPLAIN'			=> 'To specify several different IPs or hostnames enter each on a new line. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use “*”.',
-	'IP_HOSTNAME'				=> 'IP addresses or hostnames',
-	'IP_NO_BANNED'				=> 'No banned IP addresses',
-	'IP_UNBAN'					=> 'Un-ban or un-exclude IPs',
-	'IP_UNBAN_EXPLAIN'			=> 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IPs are emphasised.',
-
-	'LENGTH_BAN_INVALID'		=> 'The date has to be formatted <kbd>YYYY-MM-DD</kbd>.',
-
-	'PERMANENT'		=> 'Permanent',
-	
-	'UNTIL'						=> 'Until',
-	'USER_BAN'					=> 'Ban one or more usernames',
-	'USER_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered users from all current bans.',
-	'USER_BAN_EXPLAIN'			=> 'You can ban multiple users in one go by entering each name on a new line. Use the <span style="text-decoration: underline;">Find a member</span> facility to look up and add one or more users automatically.',
-	'USER_NO_BANNED'			=> 'No banned usernames',
-	'USER_UNBAN'				=> 'Un-ban or un-exclude usernames',
-	'USER_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users are emphasised.',
-	
-
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
deleted file mode 100644
index 3c96f239e8..0000000000
--- a/phpBB/language/en/acp/board.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-/**
-*
-* acp_board [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-// Board Settings
-$lang = array_merge($lang, array(
-	'ACP_BOARD_SETTINGS_EXPLAIN'	=> 'Here you can determine the basic operation of your board, give it a fitting name and description, and among other settings adjust the default values for timezone and language.',
-	'CUSTOM_DATEFORMAT'				=> 'Custom…',
-	'DEFAULT_DATE_FORMAT'			=> 'Date format',
-	'DEFAULT_DATE_FORMAT_EXPLAIN'	=> 'The date format is the same as the PHP <code>date</code> function.',
-	'DEFAULT_LANGUAGE'				=> 'Default language',
-	'DEFAULT_STYLE'					=> 'Default style',
-	'DISABLE_BOARD'					=> 'Disable board',
-	'DISABLE_BOARD_EXPLAIN'			=> 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
-	'OVERRIDE_STYLE'				=> 'Override user style',
-	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
-	'SITE_DESC'						=> 'Site description',
-	'SITE_NAME'						=> 'Site name',
-	'SYSTEM_DST'					=> 'Enable Summer Time/<abbr title="Daylight Saving Time">DST</abbr>',
-	'SYSTEM_TIMEZONE'				=> 'System timezone',
-	'WARNINGS_EXPIRE'				=> 'Warning duration',
-	'WARNINGS_EXPIRE_EXPLAIN'		=> 'Number of days that will elapse before the warning will automatically expire from a user’s record.',
-));
-
-// Board Features
-$lang = array_merge($lang, array(
-	'ACP_BOARD_FEATURES_EXPLAIN'	=> 'Here you can enable/disable several board features.',
-
-	'ALLOW_ATTACHMENTS'			=> 'Allow attachments',
-	'ALLOW_BIRTHDAYS'			=> 'Allow birthdays',
-	'ALLOW_BIRTHDAYS_EXPLAIN'	=> 'Allow birthdays to be entered and age being displayed in profiles. Please note the birthday list within the board index is controlled by a separate load setting.',
-	'ALLOW_BOOKMARKS'			=> 'Allow bookmarking topics',
-	'ALLOW_BOOKMARKS_EXPLAIN'	=> 'User is able to store personal bookmarks.',
-	'ALLOW_BBCODE'				=> 'Allow BBCode',
-	'ALLOW_FORUM_NOTIFY'		=> 'Allow subscribing to forums',
-	'ALLOW_NAME_CHANGE'			=> 'Allow username changes',
-	'ALLOW_NO_CENSORS'			=> 'Allow disabling of word censoring',
-	'ALLOW_NO_CENSORS_EXPLAIN'	=> 'Users can choose to disable the automatic word censoring of posts and private messages.',
-	'ALLOW_PM_ATTACHMENTS'		=> 'Allow attachments in private messages',
-	'ALLOW_SIG'					=> 'Allow signatures',
-	'ALLOW_SIG_BBCODE'			=> 'Allow BBCode in user signatures',
-	'ALLOW_SIG_FLASH'			=> 'Allow use of <code>[FLASH]</code> BBCode tag in user signatures',
-	'ALLOW_SIG_IMG'				=> 'Allow use of <code>[IMG]</code> BBCode tag in user signatures',
-	'ALLOW_SIG_LINKS'			=> 'Allow use of links in user signatures',
-	'ALLOW_SIG_LINKS_EXPLAIN'	=> 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.',
-	'ALLOW_SIG_SMILIES'			=> 'Allow use of smilies in user signatures',
-	'ALLOW_SMILIES'				=> 'Allow smilies',
-	'ALLOW_TOPIC_NOTIFY'		=> 'Allow subscribing to topics',
-	'BOARD_PM'					=> 'Private messaging',
-	'BOARD_PM_EXPLAIN'			=> 'Enable or disable private messaging for all users.',
-));
-
-// Avatar Settings
-$lang = array_merge($lang, array(
-	'ACP_AVATAR_SETTINGS_EXPLAIN'	=> 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
-
-	'ALLOW_LOCAL'					=> 'Enable gallery avatars',
-	'ALLOW_REMOTE'					=> 'Enable remote avatars',
-	'ALLOW_REMOTE_EXPLAIN'			=> 'Avatars linked to from another website.',
-	'ALLOW_UPLOAD'					=> 'Enable avatar uploading',
-	'AVATAR_GALLERY_PATH'			=> 'Avatar gallery path',
-	'AVATAR_GALLERY_PATH_EXPLAIN'	=> 'Path under your phpBB root directory for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>.',
-	'AVATAR_STORAGE_PATH'			=> 'Avatar storage path',
-	'AVATAR_STORAGE_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.',
-	'MAX_AVATAR_SIZE'				=> 'Maximum avatar dimensions',
-	'MAX_AVATAR_SIZE_EXPLAIN'		=> 'Width x Height in pixels.',
-	'MAX_FILESIZE'					=> 'Maximum avatar file size',
-	'MAX_FILESIZE_EXPLAIN'			=> 'For uploaded avatar files.',
-	'MIN_AVATAR_SIZE'				=> 'Minimum avatar dimensions',
-	'MIN_AVATAR_SIZE_EXPLAIN'		=> 'Width x Height in pixels.',
-));
-
-// Message Settings
-$lang = array_merge($lang, array(
-	'ACP_MESSAGE_SETTINGS_EXPLAIN'		=> 'Here you can set all default settings for private messaging.',
-
-	'ALLOW_BBCODE_PM'			=> 'Allow BBCode in private messages',
-	'ALLOW_FLASH_PM'			=> 'Allow use of <code>[FLASH]</code> BBCode tag',
-	'ALLOW_FLASH_PM_EXPLAIN'	=> 'Note that the ability to use flash in private messages, if enabled here, also depends on the permissions.',
-	'ALLOW_FORWARD_PM'			=> 'Allow forwarding of private messages',
-	'ALLOW_IMG_PM'				=> 'Allow use of <code>[IMG]</code> BBCode tag',
-	'ALLOW_MASS_PM'				=> 'Allow sending of private messages to multiple users and groups',
-	'ALLOW_MASS_PM_EXPLAIN'		=> 'Sending to groups can be adjusted per group within the group settings page.',
-	'ALLOW_PRINT_PM'			=> 'Allow print view in private messaging',
-	'ALLOW_QUOTE_PM'			=> 'Allow quotes in private messages',
-	'ALLOW_SIG_PM'				=> 'Allow signature in private messages',
-	'ALLOW_SMILIES_PM'			=> 'Allow smilies in private messages',
-	'BOXES_LIMIT'				=> 'Maximum private messages per box',
-	'BOXES_LIMIT_EXPLAIN'		=> 'Users may receive no more than this many messages in each of their private message boxes. Set this value to 0 to allow unlimited messages.',
-	'BOXES_MAX'					=> 'Maximum private message folders',
-	'BOXES_MAX_EXPLAIN'			=> 'By default users may create this many personal folders for private messages.',
-	'ENABLE_PM_ICONS'			=> 'Enable use of topic icons in private messages',
-	'FULL_FOLDER_ACTION'		=> 'Full folder default action',
-	'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default action to take if a user’s folder is full assuming the user’s folder action, if set at all, is not applicable. The only exception is for the “Sent messages” folder where the default action is always to delete old messages.',
-	'HOLD_NEW_MESSAGES'			=> 'Hold new messages',
-	'PM_EDIT_TIME'				=> 'Limit editing time',
-	'PM_EDIT_TIME_EXPLAIN'		=> 'Limits the time available to edit a private message not already delivered. Setting the value to 0 disables this behaviour.',
-	'PM_MAX_RECIPIENTS'			=> 'Maximum number of allowed recipients',
-	'PM_MAX_RECIPIENTS_EXPLAIN'	=> 'The maximum number of allowed recipients in a private message. If 0 is entered, an unlimited number is allowed. This setting can be adjusted for every group within the group settings page.',
-));
-
-// Post Settings
-$lang = array_merge($lang, array(
-	'ACP_POST_SETTINGS_EXPLAIN'			=> 'Here you can set all default settings for posting.',
-	'ALLOW_POST_LINKS'					=> 'Allow links in posts/private messages',
-	'ALLOW_POST_LINKS_EXPLAIN'			=> 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.',
-	'ALLOW_POST_FLASH'					=> 'Allow use of <code>[FLASH]</code> BBCode tag in posts',
-	'ALLOW_POST_FLASH_EXPLAIN'			=> 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.',
-
-	'ENABLE_QUEUE_TRIGGER'			=> 'Enable queued posts',
-	'ENABLE_QUEUE_TRIGGER_EXPLAIN'	=> 'Ability to put registered users posts to post approval if their post count is lower than the specified value below. This setting has no effect on the permission setting for post/topic approval.',
-	'QUEUE_TRIGGER_POSTS'			=> 'Maximum post count for queued posts',
-	'QUEUE_TRIGGER_POSTS_EXPLAIN'	=> 'If queued posts is enabled, this is the post count the user need to reach in order to post without post approval. If the users post count is below this number, the post is stored in the queue automatically.',
-
-	'BUMP_INTERVAL'					=> 'Bump interval',
-	'BUMP_INTERVAL_EXPLAIN'			=> 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.',
-	'CHAR_LIMIT'					=> 'Maximum characters per post',
-	'CHAR_LIMIT_EXPLAIN'			=> 'The number of characters allowed within a post. Set to 0 for unlimited characters.',
-	'DISPLAY_LAST_EDITED'			=> 'Display last edited time information',
-	'DISPLAY_LAST_EDITED_EXPLAIN'	=> 'Choose if the last edited by information to be displayed on posts.',
-	'EDIT_TIME'						=> 'Limit editing time',
-	'EDIT_TIME_EXPLAIN'				=> 'Limits the time available to edit a new post. Setting the value to 0 disables this behaviour.',
-	'FLOOD_INTERVAL'				=> 'Flood interval',
-	'FLOOD_INTERVAL_EXPLAIN'		=> 'Number of seconds a user must wait between posting new messages. To enable users to ignore this alter their permissions.',
-	'HOT_THRESHOLD'					=> 'Popular topic threshold',
-	'HOT_THRESHOLD_EXPLAIN'			=> 'Posts per topic threshold required for the popular topic annotation. Set to 0 to disable popular topics.',
-	'MAX_POLL_OPTIONS'				=> 'Maximum number of poll options',
-	'MAX_POST_FONT_SIZE'			=> 'Maximum font size per post',
-	'MAX_POST_FONT_SIZE_EXPLAIN'	=> 'Maximum font size allowed in a post. Set to 0 for unlimited font size.',
-	'MAX_POST_IMG_HEIGHT'			=> 'Maximum image height per post',
-	'MAX_POST_IMG_HEIGHT_EXPLAIN'	=> 'Maximum height of an image/flash file in postings. Set to 0 for unlimited size.',
-	'MAX_POST_IMG_WIDTH'			=> 'Maximum image width per post',
-	'MAX_POST_IMG_WIDTH_EXPLAIN'	=> 'Maximum width of an image/flash file in postings. Set to 0 for unlimited size.',
-	'MAX_POST_URLS'					=> 'Maximum links per post',
-	'MAX_POST_URLS_EXPLAIN'			=> 'Maximum number of URLs in a post. Set to 0 for unlimited links.',
-	'POSTING'						=> 'Posting',
-	'POSTS_PER_PAGE'				=> 'Posts per page',
-	'QUOTE_DEPTH_LIMIT'				=> 'Maximum nested quotes per post',
-	'QUOTE_DEPTH_LIMIT_EXPLAIN'		=> 'Maximum number of nested quotes in a post. Set to 0 for unlimited depth.',
-	'SMILIES_LIMIT'					=> 'Maximum smilies per post',
-	'SMILIES_LIMIT_EXPLAIN'			=> 'Maximum number of smilies in a post. Set to 0 for unlimited smilies.',
-	'TOPICS_PER_PAGE'				=> 'Topics per page',
-));
-
-// Signature Settings
-$lang = array_merge($lang, array(
-	'ACP_SIGNATURE_SETTINGS_EXPLAIN'	=> 'Here you can set all default settings for signatures.',
-
-	'MAX_SIG_FONT_SIZE'				=> 'Maximum signature font size',
-	'MAX_SIG_FONT_SIZE_EXPLAIN'		=> 'Maximum font size allowed in user signatures. Set to 0 for unlimited size.',
-	'MAX_SIG_IMG_HEIGHT'			=> 'Maximum signature image height',
-	'MAX_SIG_IMG_HEIGHT_EXPLAIN'	=> 'Maximum height of an image/flash file in user signatures. Set to 0 for unlimited height.',
-	'MAX_SIG_IMG_WIDTH'				=> 'Maximum signature image width',
-	'MAX_SIG_IMG_WIDTH_EXPLAIN'		=> 'Maximum width of an image/flash file in user signatures. Set to 0 for unlimited width.',
-	'MAX_SIG_LENGTH'				=> 'Maximum signature length',
-	'MAX_SIG_LENGTH_EXPLAIN'		=> 'Maximum number of characters in user signatures.',
-	'MAX_SIG_SMILIES'				=> 'Maximum smilies per signature',
-	'MAX_SIG_SMILIES_EXPLAIN'		=> 'Maximum smilies allowed in user signatures. Set to 0 for unlimited smilies.',
-	'MAX_SIG_URLS'					=> 'Maximum signature links',
-	'MAX_SIG_URLS_EXPLAIN'			=> 'Maximum number of links in user signatures. Set to 0 for unlimited links.',
-));
-
-// Registration Settings
-$lang = array_merge($lang, array(
-	'ACP_REGISTER_SETTINGS_EXPLAIN'		=> 'Here you are able to define registration and profile related settings.',
-
-	'ACC_ACTIVATION'			=> 'Account activation',
-	'ACC_ACTIVATION_EXPLAIN'	=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.',
-	'ACC_ADMIN'					=> 'By Admin',
-	'ACC_DISABLE'				=> 'Disable',
-	'ACC_NONE'					=> 'None',
-	'ACC_USER'					=> 'By User',
-//	'ACC_USER_ADMIN'			=> 'User + Admin',
-	'ALLOW_EMAIL_REUSE'			=> 'Allow e-mail address re-use',
-	'ALLOW_EMAIL_REUSE_EXPLAIN'	=> 'Different users can register with the same e-mail address.',
-	'COPPA'						=> 'COPPA',
-	'COPPA_FAX'					=> 'COPPA fax number',
-	'COPPA_MAIL'				=> 'COPPA mailing address',
-	'COPPA_MAIL_EXPLAIN'		=> 'This is the mailing address where parents will send COPPA registration forms.',
-	'ENABLE_COPPA'				=> 'Enable COPPA',
-	'ENABLE_COPPA_EXPLAIN'		=> 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA. If this is disabled the COPPA specific groups will no longer be displayed.',
-	'MAX_CHARS'					=> 'Max',
-	'MIN_CHARS'					=> 'Min',
-	'NO_AUTH_PLUGIN'			=> 'No suitable auth plugin found.',
-	'PASSWORD_LENGTH'			=> 'Password length',
-	'PASSWORD_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in passwords.',
-	'REG_LIMIT'					=> 'Registration attempts',
-	'REG_LIMIT_EXPLAIN'			=> 'Number of attempts users can make at the confirmation code before being locked out that session.',
-	'USERNAME_ALPHA_ONLY'		=> 'Alphanumeric only',
-	'USERNAME_ALPHA_SPACERS'	=> 'Alphanumeric and spacers',
-	'USERNAME_ASCII'			=> 'ASCII (no international unicode)',
-	'USERNAME_LETTER_NUM'		=> 'Any letter and number',
-	'USERNAME_LETTER_NUM_SPACERS'	=> 'Any letter, number, and spacer',
-	'USERNAME_CHARS'			=> 'Limit username chars',
-	'USERNAME_CHARS_ANY'		=> 'Any character',
-	'USERNAME_CHARS_EXPLAIN'	=> 'Restrict type of characters that may be used in usernames, spacers are: space, -, +, _, [ and ].',
-	'USERNAME_LENGTH'			=> 'Username length',
-	'USERNAME_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in usernames.',
-));
-
-// Visual Confirmation Settings
-$lang = array_merge($lang, array(
-	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you are able to define visual confirmation defaults and CAPTCHA settings.',
-	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
-	'CAPTCHA_UNAVAILABLE'					=> 'The CAPTCHA cannot be selected as its requirements are not met.',
-	'CAPTCHA_GD'							=> 'GD CAPTCHA',
-	'CAPTCHA_GD_WAVE'						=> 'GD Wave Captcha',
-	'CAPTCHA_GD_FOREGROUND_NOISE'			=> 'GD CAPTCHA foreground noise',
-	'CAPTCHA_GD_EXPLAIN'					=> 'Use GD to make a more advanced CAPTCHA.',
-	'CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN'	=> 'Use foreground noise to make the GD based CAPTCHA harder.',
-	'CAPTCHA_GD_X_GRID'						=> 'GD CAPTCHA background noise x-axis',
-	'CAPTCHA_GD_X_GRID_EXPLAIN'				=> 'Use lower settings of this to make the GD based CAPTCHA harder. 0 will disable x-axis background noise.',
-	'CAPTCHA_GD_Y_GRID'						=> 'GD CAPTCHA background noise y-axis',
-	'CAPTCHA_GD_Y_GRID_EXPLAIN'				=> 'Use lower settings of this to make the GD based CAPTCHA harder. 0 will disable y-axis background noise.',
-	'CAPTCHA_GD_WAVE'						=> 'GD CAPTCHA wave distortion',
-	'CAPTCHA_GD_WAVE_EXPLAIN'				=> 'This applies a wave distortion to the CAPTCHA.',
- 	'CAPTCHA_GD_3D_NOISE'					=> 'Add 3D-noise objects',
-	'CAPTCHA_GD_3D_NOISE_EXPLAIN'			=> 'This adds additional objects to the CAPTCHA, over the letters.',
-  	'CAPTCHA_GD_FONTS'						=> 'Use different fonts',
-	'CAPTCHA_GD_FONTS_EXPLAIN'				=> 'This setting controls how many different letter shapes are used. You can just use the default shapes or introduce altered letters. Adding lowercase letters is also possible.',
-	'CAPTCHA_FONT_DEFAULT'					=> 'Default',
-	'CAPTCHA_FONT_NEW'						=> 'New Shapes',
-	'CAPTCHA_FONT_LOWER'					=> 'Also use lowercase',
-
-
-	'CAPTCHA_PREVIEW_MSG'					=> 'Your changes to the visual confirmation setting were not saved. This is just a preview.',
-	'CAPTCHA_PREVIEW_EXPLAIN'				=> 'The CAPTCHA as it would look like using the current selection.',
-
-	'CAPTCHA_SELECT'						=> 'Installed CAPTCHA plugins',
-	'CAPTCHA_SELECT_EXPLAIN'				=> 'The dropdown holds the CAPTCHA plugins recognized by the board. Gray entries are not available right now and might need configuration prior to use.',
-	'CAPTCHA_CONFIGURE'						=> 'Configure CAPTCHAs',
-	'CAPTCHA_CONFIGURE_EXPLAIN'				=> 'Change the settings for the selected CAPTCHA.',
-	'CONFIGURE'								=> 'Configure',
-	'CAPTCHA_NO_OPTIONS'					=> 'This CAPTCHA has no configuration options.',
-	'VISUAL_CONFIRM_POST'					=> 'Enable visual confirmation for guest postings',
-	'VISUAL_CONFIRM_POST_EXPLAIN'			=> 'Requires anonymous users to enter a random code matching an image to help prevent mass postings.',
-	'VISUAL_CONFIRM_REG'					=> 'Enable visual confirmation for registrations',
-	'VISUAL_CONFIRM_REG_EXPLAIN'			=> 'Requires new users to enter a random code matching an image to help prevent mass registrations.',
-	'VISUAL_CONFIRM_REFRESH'				=> 'Enable users to refresh the confirmation image',
-	'VISUAL_CONFIRM_REFRESH_EXPLAIN'		=> 'Allows users to request new confirmation codes, if they are unable to solve the VC during registration.',
-));
-
-// Cookie Settings
-$lang = array_merge($lang, array(
-	'ACP_COOKIE_SETTINGS_EXPLAIN'		=> 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in.',
-
-	'COOKIE_DOMAIN'				=> 'Cookie domain',
-	'COOKIE_NAME'				=> 'Cookie name',
-	'COOKIE_PATH'				=> 'Cookie path',
-	'COOKIE_SECURE'				=> 'Cookie secure',
-	'COOKIE_SECURE_EXPLAIN'		=> 'If your server is running via SSL set this to enabled else leave as disabled. Having this enabled and not running via SSL will result in server errors during redirects.',
-	'ONLINE_LENGTH'				=> 'View online time span',
-	'ONLINE_LENGTH_EXPLAIN'		=> 'Number of minutes after which inactive users will not appear in “Who is online” listings. The higher this value the greater is the processing required to generate the listing.',
-	'SESSION_LENGTH'			=> 'Session length',
-	'SESSION_LENGTH_EXPLAIN'	=> 'Sessions will expire after this time, in seconds.',
-));
-
-// Load Settings
-$lang = array_merge($lang, array(
-	'ACP_LOAD_SETTINGS_EXPLAIN'	=> 'Here you can enable and disable certain board functions to reduce the amount of processing required. On most servers there is no need to disable any functions. However on certain systems or in shared hosting environments it may be beneficial to disable capabilities you do not really need. You can also specify limits for system load and active sessions beyond which the board will go offline.',
-
-	'CUSTOM_PROFILE_FIELDS'			=> 'Custom profile fields',
-	'LIMIT_LOAD'					=> 'Limit system load',
-	'LIMIT_LOAD_EXPLAIN'			=> 'If the system’s 1-minute load average exceeds this value the board will automatically go offline. A value of 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers and where this information is accessible. The value here resets itself to 0 if phpBB was unable to get the load limit.',
-	'LIMIT_SESSIONS'				=> 'Limit sessions',
-	'LIMIT_SESSIONS_EXPLAIN'		=> 'If the number of sessions exceeds this value within a one minute period the board will go offline. Set to 0 for unlimited sessions.',
-	'LOAD_CPF_MEMBERLIST'			=> 'Allow styles to display custom profile fields in memberlist',
-	'LOAD_CPF_VIEWPROFILE'			=> 'Display custom profile fields in user profiles',
-	'LOAD_CPF_VIEWTOPIC'			=> 'Display custom profile fields on topic pages',
-	'LOAD_USER_ACTIVITY'			=> 'Show user’s activity',
-	'LOAD_USER_ACTIVITY_EXPLAIN'	=> 'Displays active topic/forum in user profiles and user control panel. It is recommended to disable this on boards with more than one million posts.',
-	'RECOMPILE_STYLES'				=> 'Recompile stale style components',
-	'RECOMPILE_STYLES_EXPLAIN'		=> 'Check for updated style components on filesystem and recompile.',
-	'YES_ANON_READ_MARKING'			=> 'Enable topic marking for guests',
-	'YES_ANON_READ_MARKING_EXPLAIN'	=> 'Stores read/unread status information for guests. If disabled posts are always read for guests.',
-	'YES_BIRTHDAYS'					=> 'Enable birthday listing',
-	'YES_BIRTHDAYS_EXPLAIN'			=> 'If disabled the birthday listing is no longer displayed. To let this setting take effect the birthday feature needs to be enabled too.',
-	'YES_JUMPBOX'					=> 'Enable display of jumpbox',
-	'YES_MODERATORS'				=> 'Enable display of moderators',
-	'YES_ONLINE'					=> 'Enable online user listings',
-	'YES_ONLINE_EXPLAIN'			=> 'Display online user information on index, forum and topic pages.',
-	'YES_ONLINE_GUESTS'				=> 'Enable online guest listings in viewonline',
-	'YES_ONLINE_GUESTS_EXPLAIN'		=> 'Allow display of guest user information in viewonline.',
-	'YES_ONLINE_TRACK'				=> 'Enable display of user online/offline information',
-	'YES_ONLINE_TRACK_EXPLAIN'		=> 'Display online information for user in profiles and topic pages.',
-	'YES_POST_MARKING'				=> 'Enable dotted topics',
-	'YES_POST_MARKING_EXPLAIN'		=> 'Indicates whether user has posted to a topic.',
-	'YES_READ_MARKING'				=> 'Enable server-side topic marking',
-	'YES_READ_MARKING_EXPLAIN'		=> 'Stores read/unread status information in the database rather than a cookie.',
-));
-
-// Auth settings
-$lang = array_merge($lang, array(
-	'ACP_AUTH_SETTINGS_EXPLAIN'	=> 'phpBB supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default three plug-ins are provided; DB, LDAP and Apache. Not all methods require additional information so only fill out fields if they are relevant to the selected method.',
-
-	'AUTH_METHOD'				=> 'Select an authentication method',
-
-	'APACHE_SETUP_BEFORE_USE'	=> 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version) and safe_mode disabled.',
-
-	'LDAP_DN'						=> 'LDAP base <var>dn</var>',
-	'LDAP_DN_EXPLAIN'				=> 'This is the Distinguished Name, locating the user information, e.g. <samp>o=My Company,c=US</samp>.',
-	'LDAP_EMAIL'					=> 'LDAP e-mail attribute',
-	'LDAP_EMAIL_EXPLAIN'			=> 'Set this to the name of your user entry e-mail attribute (if one exists) in order to automatically set the e-mail address for new users. Leaving this empty results in empty e-mail address for users who log in for the first time.',
-	'LDAP_INCORRECT_USER_PASSWORD'	=> 'Binding to LDAP server failed with specified user/password.',
-	'LDAP_NO_EMAIL'					=> 'The specified e-mail attribute does not exist.',
-	'LDAP_NO_IDENTITY'				=> 'Could not find a login identity for %s.',
-	'LDAP_PASSWORD'					=> 'LDAP password',
-	'LDAP_PASSWORD_EXPLAIN'			=> 'Leave blank to use anonymous binding. Else fill in the password for the above user.  Required for Active Directory Servers. <strong>WARNING:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.',
-	'LDAP_PORT'						=> 'LDAP server port',
-	'LDAP_PORT_EXPLAIN'				=> 'Optionally you can specify a port which should be used to connect to the LDAP server instead of the default port 389.',
-	'LDAP_SERVER'					=> 'LDAP server name',
-	'LDAP_SERVER_EXPLAIN'			=> 'If using LDAP this is the hostname or IP address of the LDAP server. Alternatively you can specify an URL like ldap://hostname:port/',
-	'LDAP_UID'						=> 'LDAP <var>uid</var>',
-	'LDAP_UID_EXPLAIN'				=> 'This is the key under which to search for a given login identity, e.g. <var>uid</var>, <var>sn</var>, etc.',
-	'LDAP_USER'						=> 'LDAP user <var>dn</var>',
-	'LDAP_USER_EXPLAIN'				=> 'Leave blank to use anonymous binding. If filled in phpBB uses the specified distinguished name on login attempts to find the correct user, e.g. <samp>uid=Username,ou=MyUnit,o=MyCompany,c=US</samp>. Required for Active Directory Servers.',
-	'LDAP_USER_FILTER'				=> 'LDAP user filter',
-	'LDAP_USER_FILTER_EXPLAIN'		=> 'Optionally you can further limit the searched objects with additional filters. For example <samp>objectClass=posixGroup</samp> would result in the use of <samp>(&amp;(uid=$username)(objectClass=posixGroup))</samp>',
-));
-
-// Server Settings
-$lang = array_merge($lang, array(
-	'ACP_SERVER_SETTINGS_EXPLAIN'	=> 'Here you define server and domain dependant settings. Please ensure the data you enter is accurate, errors will result in e-mails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.',
-
-	'ENABLE_GZIP'				=> 'Enable GZip compression',
-	'ENABLE_GZIP_EXPLAIN'		=> 'Generated content will be compressed prior to sending it to the user. This can reduce network traffic but will also increase CPU usage on both server and client side.',
-	'FORCE_SERVER_VARS'			=> 'Force server URL settings',
-	'FORCE_SERVER_VARS_EXPLAIN'	=> 'If set to yes the server settings defined here will be used in favour of the automatically determined values.',
-	'ICONS_PATH'				=> 'Post icons storage path',
-	'ICONS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/icons</samp>.',
-	'PATH_SETTINGS'				=> 'Path settings',
-	'RANKS_PATH'				=> 'Rank image storage path',
-	'RANKS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/ranks</samp>.',
-	'SCRIPT_PATH'				=> 'Script path',
-	'SCRIPT_PATH_EXPLAIN'		=> 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>.',
-	'SERVER_NAME'				=> 'Domain name',
-	'SERVER_NAME_EXPLAIN'		=> 'The domain name this board runs from (for example: <samp>www.example.com</samp>).',
-	'SERVER_PORT'				=> 'Server port',
-	'SERVER_PORT_EXPLAIN'		=> 'The port your server is running on, usually 80, only change if different.',
-	'SERVER_PROTOCOL'			=> 'Server protocol',
-	'SERVER_PROTOCOL_EXPLAIN'	=> 'This is used as the server protocol if these settings are forced. If empty or not forced the protocol is determined by the cookie secure settings (<samp>http://</samp> or <samp>https://</samp>).',
-	'SERVER_URL_SETTINGS'		=> 'Server URL settings',
-	'SMILIES_PATH'				=> 'Smilies storage path',
-	'SMILIES_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/smilies</samp>.',
-	'UPLOAD_ICONS_PATH'			=> 'Extension group icons storage path',
-	'UPLOAD_ICONS_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/upload_icons</samp>.',
-));
-
-// Security Settings
-$lang = array_merge($lang, array(
-	'ACP_SECURITY_SETTINGS_EXPLAIN'		=> 'Here you are able to define session and login related settings.',
-
-	'ALL'							=> 'All',
-	'ALLOW_AUTOLOGIN'				=> 'Allow persistent logins',
-	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users can autologin when they visit the board.',
-	'AUTOLOGIN_LENGTH'				=> 'Persistent login key expiration length (in days)',
-	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which persistent login keys are removed or zero to disable.',
-	'BROWSER_VALID'					=> 'Validate browser',
-	'BROWSER_VALID_EXPLAIN'			=> 'Enables browser validation for each session improving security.',
-	'CHECK_DNSBL'					=> 'Check IP against DNS Blackhole List',
-	'CHECK_DNSBL_EXPLAIN'			=> 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: <a href="http://spamcop.net">spamcop.net</a> and <a href="http://www.spamhaus.org">www.spamhaus.org</a>. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.',
-	'CLASS_B'						=> 'A.B',
-	'CLASS_C'						=> 'A.B.C',
-	'EMAIL_CHECK_MX'				=> 'Check e-mail domain for valid MX record',
-	'EMAIL_CHECK_MX_EXPLAIN'		=> 'If enabled, the e-mail domain provided on registration and profile changes is checked for a valid MX record.',
-	'FORCE_PASS_CHANGE'				=> 'Force password change',
-	'FORCE_PASS_CHANGE_EXPLAIN'		=> 'Require user to change their password after a set number of days. Setting this value to 0 disables this behaviour.',
-	'FORM_TIME_MAX'					=> 'Maximum time to submit forms',
-	'FORM_TIME_MAX_EXPLAIN'			=> 'The time a user has to submit a form. Use -1 to disable. Note that a form might become invalid if the session expires, regardless of this setting.',
-	'FORM_SID_GUESTS'				=> 'Tie forms to guest sessions',
-	'FORM_SID_GUESTS_EXPLAIN'		=> 'If enabled, the form token issued to guests will be session-exclusive. This can cause problems with some ISPs.',
-	'FORWARDED_FOR_VALID'			=> 'Validated <var>X_FORWARDED_FOR</var> header',
-	'FORWARDED_FOR_VALID_EXPLAIN'	=> 'Sessions will only be continued if the sent <var>X_FORWARDED_FOR</var> header equals the one sent with the previous request. Bans will be checked against IPs in <var>X_FORWARDED_FOR</var> too.',
-	'IP_VALID'						=> 'Session IP validation',
-	'IP_VALID_EXPLAIN'				=> 'Determines how much of the users IP is used to validate a session; <samp>All</samp> compares the complete address, <samp>A.B.C</samp> the first x.x.x, <samp>A.B</samp> the first x.x, <samp>None</samp> disables checking. On IPv6 addresses <samp>A.B.C</samp> compares the first 4 blocks and <samp>A.B</samp> the first 3 blocks.',
-	'MAX_LOGIN_ATTEMPTS'			=> 'Maximum number of login attempts',
-	'MAX_LOGIN_ATTEMPTS_EXPLAIN'	=> 'After this number of failed logins the user needs to additionally confirm his login visually (visual confirmation).',
-	'NO_IP_VALIDATION'				=> 'None',
-	'NO_REF_VALIDATION'				=> 'None',
-	'PASSWORD_TYPE'					=> 'Password complexity',
-	'PASSWORD_TYPE_EXPLAIN'			=> 'Determines how complex a password needs to be when set or altered, subsequent options include the previous ones.',
-	'PASS_TYPE_ALPHA'				=> 'Must contain letters and numbers',
-	'PASS_TYPE_ANY'					=> 'No requirements',
-	'PASS_TYPE_CASE'				=> 'Must be mixed case',
-	'PASS_TYPE_SYMBOL'				=> 'Must contain symbols',
-	'REF_HOST'						=> 'Only validate host',
-	'REF_PATH'						=> 'Also validate path',
-	'REFERER_VALID'					=> 'Validate Referer',
-	'REFERER_VALID_EXPLAIN'			=> 'If enabled, the referer of POST requests will be checked against the host/script path settings. This may cause issues with boards using several domains and or external logins.',
-	'TPL_ALLOW_PHP'					=> 'Allow php in templates',
-	'TPL_ALLOW_PHP_EXPLAIN'			=> 'If this option is enabled, <code>PHP</code> and <code>INCLUDEPHP</code> statements will be recognised and parsed in templates.',
-));
-
-// Email Settings
-$lang = array_merge($lang, array(
-	'ACP_EMAIL_SETTINGS_EXPLAIN'	=> 'This information is used when the board sends e-mails to your users. Please ensure the e-mail address you specify is valid, any bounced or undeliverable messages will likely be sent to that address. If your host does not provide a native (PHP based) e-mail service you can instead send messages directly using SMTP. This requires the address of an appropriate server (ask your provider if necessary). If the server requires authentication (and only if it does) enter the necessary username, password and authentication method.',
-
-	'ADMIN_EMAIL'					=> 'Return e-mail address',
-	'ADMIN_EMAIL_EXPLAIN'			=> 'This will be used as the return address on all e-mails, the technical contact e-mail address. It will always be used as the <samp>Return-Path</samp> and <samp>Sender</samp> address in e-mails.',
-	'BOARD_EMAIL_FORM'				=> 'Users send e-mail via board',
-	'BOARD_EMAIL_FORM_EXPLAIN'		=> 'Instead of showing the users e-mail address users are able to send e-mails via the board.',
-	'BOARD_HIDE_EMAILS'				=> 'Hide e-mail addresses',
-	'BOARD_HIDE_EMAILS_EXPLAIN'		=> 'This function keeps e-mail addresses completely private.',
-	'CONTACT_EMAIL'					=> 'Contact e-mail address',
-	'CONTACT_EMAIL_EXPLAIN'			=> 'This address will be used whenever a specific contact point is needed, e.g. spam, error output, etc. It will always be used as the <samp>From</samp> and <samp>Reply-To</samp> address in e-mails.',
-	'EMAIL_FUNCTION_NAME'			=> 'E-mail function name',
-	'EMAIL_FUNCTION_NAME_EXPLAIN'	=> 'The e-mail function used to send mails through PHP.',
-	'EMAIL_PACKAGE_SIZE'			=> 'E-mail package size',
-	'EMAIL_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of maximum e-mails sent out in one package. This setting is applied to the internal message queue; set this value to 0 if you have problems with non-delivered notification e-mails.',
-	'EMAIL_SIG'						=> 'E-mail signature',
-	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all e-mails the board sends.',
-	'ENABLE_EMAIL'					=> 'Enable board-wide e-mails',
-	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no e-mails will be sent by the board at all.',
-	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
-	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
-	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',
-	'SMTP_DIGEST_MD5'				=> 'DIGEST-MD5',
-	'SMTP_LOGIN'					=> 'LOGIN',
-	'SMTP_PASSWORD'					=> 'SMTP password',
-	'SMTP_PASSWORD_EXPLAIN'			=> 'Only enter a password if your SMTP server requires it.',
-	'SMTP_PLAIN'					=> 'PLAIN',
-	'SMTP_POP_BEFORE_SMTP'			=> 'POP-BEFORE-SMTP',
-	'SMTP_PORT'						=> 'SMTP server port',
-	'SMTP_PORT_EXPLAIN'				=> 'Only change this if you know your SMTP server is on a different port.',
-	'SMTP_SERVER'					=> 'SMTP server address',
-	'SMTP_SETTINGS'					=> 'SMTP settings',
-	'SMTP_USERNAME'					=> 'SMTP username',
-	'SMTP_USERNAME_EXPLAIN'			=> 'Only enter a username if your SMTP server requires it.',
-	'USE_SMTP'						=> 'Use SMTP server for e-mail',
-	'USE_SMTP_EXPLAIN'				=> 'Select “Yes” if you want or have to send e-mail via a named server instead of the local mail function.',
-));
-
-// Jabber settings
-$lang = array_merge($lang, array(
-	'ACP_JABBER_SETTINGS_EXPLAIN'	=> 'Here you can enable and control the use of Jabber for instant messaging and board notifications. Jabber is an open source protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Please be sure to enter already registered account details - phpBB will use the details you enter here as is.',
-
-	'JAB_ENABLE'				=> 'Enable Jabber',
-	'JAB_ENABLE_EXPLAIN'		=> 'Enables use of Jabber messaging and notifications.',
-	'JAB_GTALK_NOTE'			=> 'Please note that GTalk will not work because the <samp>dns_get_record</samp> function could not be found. This function is not available in PHP4, and is not implemented on Windows platforms. It currently does not work on BSD-based systems, including Mac OS.',
-	'JAB_PACKAGE_SIZE'			=> 'Jabber package size',
-	'JAB_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.',
-	'JAB_PASSWORD'				=> 'Jabber password',
-	'JAB_PORT'					=> 'Jabber port',
-	'JAB_PORT_EXPLAIN'			=> 'Leave blank unless you know it is not port 5222.',
-	'JAB_SERVER'				=> 'Jabber server',
-	'JAB_SERVER_EXPLAIN'		=> 'See %sjabber.org%s for a list of servers.',
-	'JAB_SETTINGS_CHANGED'		=> 'Jabber settings changed successfully.',
-	'JAB_USE_SSL'				=> 'Use SSL to connect',
-	'JAB_USE_SSL_EXPLAIN'		=> 'If enabled a secure connection is tried to be established. The Jabber port will be modified to 5223 if port 5222 is specified.',
-	'JAB_USERNAME'				=> 'Jabber username or JID',
-	'JAB_USERNAME_EXPLAIN'		=> 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php
deleted file mode 100644
index 3b63f2ea2e..0000000000
--- a/phpBB/language/en/acp/bots.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
-*
-* acp_bots [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-// Bot settings
-$lang = array_merge($lang, array(
-	'BOTS'				=> 'Manage bots',
-	'BOTS_EXPLAIN'		=> '“Bots”, “spiders” or “crawlers” are automated agents most commonly used by search engines to update their databases. Since they rarely make proper use of sessions they can distort visitor counts, increase load and sometimes fail to index sites correctly. Here you can define a special type of user to overcome these problems.',
-	'BOT_ACTIVATE'		=> 'Activate',
-	'BOT_ACTIVE'		=> 'Bot active',
-	'BOT_ADD'			=> 'Add bot',
-	'BOT_ADDED'			=> 'New bot successfully added.',
-	'BOT_AGENT'			=> 'Agent match',
-	'BOT_AGENT_EXPLAIN'	=> 'A string matching the bots browser agent, partial matches are allowed.',
-	'BOT_DEACTIVATE'	=> 'Deactivate',
-	'BOT_DELETED'		=> 'Bot deleted successfully.',
-	'BOT_EDIT'			=> 'Edit bots',
-	'BOT_EDIT_EXPLAIN'	=> 'Here you can add or edit an existing bot entry. You may define an agent string and/or one or more IP addresses (or range of addresses) to match. Be careful when defining matching agent strings or addresses. You may also specify a style and language that the bot will view the board using. This may allow you to reduce bandwidth use by setting a simple style for bots. Remember to set appropriate permissions for the special Bot usergroup.',
-	'BOT_LANG'			=> 'Bot language',
-	'BOT_LANG_EXPLAIN'	=> 'The language presented to the bot as it browses.',
-	'BOT_LAST_VISIT'	=> 'Last visit',
-	'BOT_IP'			=> 'Bot IP address',
-	'BOT_IP_EXPLAIN'	=> 'Partial matches are allowed, separate addresses with a comma.',
-	'BOT_NAME'			=> 'Bot name',
-	'BOT_NAME_EXPLAIN'	=> 'Used only for your own information.',
-	'BOT_NAME_TAKEN'	=> 'The name is already in use on your board and can’t be used for the Bot.',
-	'BOT_NEVER'			=> 'Never',
-	'BOT_STYLE'			=> 'Bot style',
-	'BOT_STYLE_EXPLAIN'	=> 'The style used for the board by the bot.',
-	'BOT_UPDATED'		=> 'Existing bot updated successfully.',
-
-	'ERR_BOT_AGENT_MATCHES_UA'	=> 'The bot agent you supplied is similar to the one you are currently using. Please adjust the agent for this bot.',
-	'ERR_BOT_NO_IP'				=> 'The IP addresses you supplied were invalid or the hostname could not be resolved.',
-	'ERR_BOT_NO_MATCHES'		=> 'You must supply at least one of an agent or IP for this bot match.',
-
-	'NO_BOT'		=> 'Found no bot with the specified ID.',
-	'NO_BOT_GROUP'	=> 'Unable to find special bot group.',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
deleted file mode 100644
index d1157b4dc4..0000000000
--- a/phpBB/language/en/acp/common.php
+++ /dev/null
@@ -1,692 +0,0 @@
-<?php
-/**
-*
-* acp_common [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-// Common
-$lang = array_merge($lang, array(
-	'ACP_ADMINISTRATORS'		=> 'Administrators',
-	'ACP_ADMIN_LOGS'			=> 'Admin log',
-	'ACP_ADMIN_ROLES'			=> 'Admin roles',
-	'ACP_ATTACHMENTS'			=> 'Attachments',
-	'ACP_ATTACHMENT_SETTINGS'	=> 'Attachment settings',
-	'ACP_AUTH_SETTINGS'			=> 'Authentication',
-	'ACP_AUTOMATION'			=> 'Automation',
-	'ACP_AVATAR_SETTINGS'		=> 'Avatar settings',
-
-	'ACP_BACKUP'				=> 'Backup',
-	'ACP_BAN'					=> 'Banning',
-	'ACP_BAN_EMAILS'			=> 'Ban e-mails',
-	'ACP_BAN_IPS'				=> 'Ban IPs',
-	'ACP_BAN_USERNAMES'			=> 'Ban usernames',
-	'ACP_BBCODES'				=> 'BBCodes',
-	'ACP_BOARD_CONFIGURATION'	=> 'Board configuration',
-	'ACP_BOARD_FEATURES'		=> 'Board features',
-	'ACP_BOARD_MANAGEMENT'		=> 'Board management',
-	'ACP_BOARD_SETTINGS'		=> 'Board settings',
-	'ACP_BOTS'					=> 'Spiders/Robots',
-
-	'ACP_CAPTCHA'				=> 'CAPTCHA',
-
-	'ACP_CAT_DATABASE'			=> 'Database',
-	'ACP_CAT_DOT_MODS'			=> '.MODs',
-	'ACP_CAT_FORUMS'			=> 'Forums',
-	'ACP_CAT_GENERAL'			=> 'General',
-	'ACP_CAT_MAINTENANCE'		=> 'Maintenance',
-	'ACP_CAT_PERMISSIONS'		=> 'Permissions',
-	'ACP_CAT_POSTING'			=> 'Posting',
-	'ACP_CAT_STYLES'			=> 'Styles',
-	'ACP_CAT_SYSTEM'			=> 'System',
-	'ACP_CAT_USERGROUP'			=> 'Users and Groups',
-	'ACP_CAT_USERS'				=> 'Users',
-	'ACP_CLIENT_COMMUNICATION'	=> 'Client communication',
-	'ACP_COOKIE_SETTINGS'		=> 'Cookie settings',
-	'ACP_CRITICAL_LOGS'			=> 'Error log',
-	'ACP_CUSTOM_PROFILE_FIELDS'	=> 'Custom profile fields',
-
-	'ACP_DATABASE'				=> 'Database management',
-	'ACP_DISALLOW'				=> 'Disallow',
-	'ACP_DISALLOW_USERNAMES'	=> 'Disallow usernames',
-
-	'ACP_EMAIL_SETTINGS'		=> 'E-mail settings',
-	'ACP_EXTENSION_GROUPS'		=> 'Manage extension groups',
-
-	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
-	'ACP_FORUM_LOGS'				=> 'Forum logs',
-	'ACP_FORUM_MANAGEMENT'			=> 'Forum management',
-	'ACP_FORUM_MODERATORS'			=> 'Forum moderators',
-	'ACP_FORUM_PERMISSIONS'			=> 'Forum permissions',
-	'ACP_FORUM_ROLES'				=> 'Forum roles',
-
-	'ACP_GENERAL_CONFIGURATION'		=> 'General configuration',
-	'ACP_GENERAL_TASKS'				=> 'General tasks',
-	'ACP_GLOBAL_MODERATORS'			=> 'Global moderators',
-	'ACP_GLOBAL_PERMISSIONS'		=> 'Global permissions',
-	'ACP_GROUPS'					=> 'Groups',
-	'ACP_GROUPS_FORUM_PERMISSIONS'	=> 'Groups’ forum permissions',
-	'ACP_GROUPS_MANAGE'				=> 'Manage groups',
-	'ACP_GROUPS_MANAGEMENT'			=> 'Group management',
-	'ACP_GROUPS_PERMISSIONS'		=> 'Groups’ permissions',
-
-	'ACP_ICONS'					=> 'Topic icons',
-	'ACP_ICONS_SMILIES'			=> 'Topic icons/smilies',
-	'ACP_IMAGESETS'				=> 'Imagesets',
-	'ACP_INACTIVE_USERS'		=> 'Inactive users',
-	'ACP_INDEX'					=> 'ACP 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'					=> 'ACP index',
-	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions',
-	'ACP_MANAGE_FORUMS'			=> 'Manage forums',
-	'ACP_MANAGE_RANKS'			=> 'Manage ranks',
-	'ACP_MANAGE_REASONS'		=> 'Manage report/denial reasons',
-	'ACP_MANAGE_USERS'			=> 'Manage users',
-	'ACP_MASS_EMAIL'			=> 'Mass e-mail',
-	'ACP_MESSAGES'				=> 'Messages',
-	'ACP_MESSAGE_SETTINGS'		=> 'Private message settings',
-	'ACP_MODULE_MANAGEMENT'		=> 'Module management',
-	'ACP_MOD_LOGS'				=> 'Moderator log',
-	'ACP_MOD_ROLES'				=> 'Moderator roles',
-
-	'ACP_NO_ITEMS'				=> 'There are no items yet.',
-
-	'ACP_ORPHAN_ATTACHMENTS'	=> 'Orphaned attachments',
-
-	'ACP_PERMISSIONS'			=> 'Permissions',
-	'ACP_PERMISSION_MASKS'		=> 'Permission masks',
-	'ACP_PERMISSION_ROLES'		=> 'Permission roles',
-	'ACP_PERMISSION_TRACE'		=> 'Permission trace',
-	'ACP_PHP_INFO'				=> 'PHP information',
-	'ACP_POST_SETTINGS'			=> 'Post settings',
-	'ACP_PRUNE_FORUMS'			=> 'Prune forums',
-	'ACP_PRUNE_USERS'			=> 'Prune users',
-	'ACP_PRUNING'				=> 'Pruning',
-
-	'ACP_QUICK_ACCESS'			=> 'Quick access',
-
-	'ACP_RANKS'					=> 'Ranks',
-	'ACP_REASONS'				=> 'Report/denial reasons',
-	'ACP_REGISTER_SETTINGS'		=> 'User registration settings',
-
-	'ACP_RESTORE'				=> 'Restore',
-
-	'ACP_SEARCH'				=> 'Search configuration',
-	'ACP_SEARCH_INDEX'			=> 'Search index',
-	'ACP_SEARCH_SETTINGS'		=> 'Search settings',
-
-	'ACP_SECURITY_SETTINGS'		=> 'Security settings',
-	'ACP_SERVER_CONFIGURATION'	=> 'Server configuration',
-	'ACP_SERVER_SETTINGS'		=> 'Server settings',
-	'ACP_SIGNATURE_SETTINGS'	=> 'Signature settings',
-	'ACP_SMILIES'				=> 'Smilies',
-	'ACP_STYLE_COMPONENTS'		=> 'Style components',
-	'ACP_STYLE_MANAGEMENT'		=> 'Style management',
-	'ACP_STYLES'				=> 'Styles',
-
-	'ACP_TEMPLATES'				=> 'Templates',
-	'ACP_THEMES'				=> 'Themes',
-
-	'ACP_UPDATE'					=> 'Updating',
-	'ACP_USERS_FORUM_PERMISSIONS'	=> 'Users’ forum permissions',
-	'ACP_USERS_LOGS'				=> 'User logs',
-	'ACP_USERS_PERMISSIONS'			=> 'Users’ permissions',
-	'ACP_USER_ATTACH'				=> 'Attachments',
-	'ACP_USER_AVATAR'				=> 'Avatar',
-	'ACP_USER_FEEDBACK'				=> 'Feedback',
-	'ACP_USER_GROUPS'				=> 'Groups',
-	'ACP_USER_MANAGEMENT'			=> 'User management',
-	'ACP_USER_OVERVIEW'				=> 'Overview',
-	'ACP_USER_PERM'					=> 'Permissions',
-	'ACP_USER_PREFS'				=> 'Preferences',
-	'ACP_USER_PROFILE'				=> 'Profile',
-	'ACP_USER_RANK'					=> 'Rank',
-	'ACP_USER_ROLES'				=> 'User roles',
-	'ACP_USER_SECURITY'				=> 'User security',
-	'ACP_USER_SIG'					=> 'Signature',
-
-	'ACP_VC_SETTINGS'					=> 'Visual confirmation settings',
-	'ACP_VC_CAPTCHA_DISPLAY'			=> 'CAPTCHA image preview',
-	'ACP_VERSION_CHECK'					=> 'Check for updates',
-	'ACP_VIEW_ADMIN_PERMISSIONS'		=> 'View administrative permissions',
-	'ACP_VIEW_FORUM_MOD_PERMISSIONS'	=> 'View forum moderation permissions',
-	'ACP_VIEW_FORUM_PERMISSIONS'		=> 'View forum-based permissions',
-	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS'	=> 'View global moderation permissions',
-	'ACP_VIEW_USER_PERMISSIONS'			=> 'View user-based permissions',
-
-	'ACP_WORDS'					=> 'Word censoring',
-
-	'ACTION'				=> 'Action',
-	'ACTIONS'				=> 'Actions',
-	'ACTIVATE'				=> 'Activate',
-	'ADD'					=> 'Add',
-	'ADMIN'					=> 'Administration',
-	'ADMIN_INDEX'			=> 'Admin index',
-	'ADMIN_PANEL'			=> 'Administration Control Panel',
-
-	'ADM_LOGOUT'			=> 'ACP&nbsp;Logout',
-	'ADM_LOGGED_OUT'		=> 'Successfully logged out from Administration Control Panel',
-
-	'BACK'					=> 'Back',
-
-	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
-	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
-
-	'DEACTIVATE'				=> 'Deactivate',
-	'DIRECTORY_DOES_NOT_EXIST'	=> 'The entered path “%s” does not exist.',
-	'DIRECTORY_NOT_DIR'			=> 'The entered path “%s” is not a directory.',
-	'DIRECTORY_NOT_WRITABLE'	=> 'The entered path “%s” is not writable.',
-	'DISABLE'					=> 'Disable',
-	'DOWNLOAD'					=> 'Download',
-	'DOWNLOAD_AS'				=> 'Download as',
-	'DOWNLOAD_STORE'			=> 'Download or store file',
-	'DOWNLOAD_STORE_EXPLAIN'	=> 'You may directly download the file or save it in your <samp>store/</samp> folder.',
-
-	'EDIT'					=> 'Edit',
-	'ENABLE'				=> 'Enable',
-	'EXPORT_DOWNLOAD'		=> 'Download',
-	'EXPORT_STORE'			=> 'Store',
-
-	'GENERAL_OPTIONS'		=> 'General options',
-	'GENERAL_SETTINGS'		=> 'General settings',
-	'GLOBAL_MASK'			=> 'Global permission mask',
-
-	'INSTALL'				=> 'Install',
-	'IP'					=> 'User IP',
-	'IP_HOSTNAME'			=> 'IP addresses or hostnames',
-
-	'LOGGED_IN_AS'			=> 'You are logged in as:',
-	'LOGIN_ADMIN'			=> 'To administer the board you must be an authenticated user.',
-	'LOGIN_ADMIN_CONFIRM'	=> 'To administer the board you must re-authenticate yourself.',
-	'LOGIN_ADMIN_SUCCESS'	=> 'You have successfully authenticated and will now be redirected to the Administration Control Panel.',
-	'LOOK_UP_FORUM'			=> 'Select a forum',
-	'LOOK_UP_FORUMS_EXPLAIN'=> 'You are able to select more than one forum.',
-
-	'LOGIN_REDIRECT'		=> 'You have been successfully logged in.',
-	'MANAGE'				=> 'Manage',
-	'MENU_TOGGLE'			=> 'Hide or display the side menu',
-	'MOVE_DOWN'				=> 'Move down',
-	'MOVE_UP'				=> 'Move up',
-
-	'NOTIFY'				=> 'Notification',
-	'NO_ADMIN'				=> 'You are not authorised to administrate this board.',
-	'NO_EMAILS_DEFINED'		=> 'No valid e-mail addresses found.',
-	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',
-
-	'OFF'					=> 'Off',
-	'ON'					=> 'On',
-
-	'PARSE_BBCODE'						=> 'Parse BBCode',
-	'PARSE_SMILIES'						=> 'Parse smilies',
-	'PARSE_URLS'						=> 'Parse links',
-	'PERMISSIONS_TRANSFERRED'			=> 'Permissions transferred',
-	'PERMISSIONS_TRANSFERRED_EXPLAIN'	=> 'You currently have the permissions from %1$s. You are able to browse the board with this user’s permissions, but not access the administration control panel since admin permissions were not transferred. You can <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.',
-	'PIXEL'								=> 'px',
-	'PROCEED_TO_ACP'					=> '%sProceed to the ACP%s',
-
-	'REMIND'							=> 'Remind',
-	'RESYNC'							=> 'Resynchronise',
-	'RETURN_TO'							=> 'Return to…',
-
-	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
-	'SELECT_OPTION'			=> 'Select option',
-
-	'SETTING_TOO_LOW'		=> 'The entered value for the setting “%1$s” is too low. The minimal allowed value is %2$d.',
-	'SETTING_TOO_BIG'		=> 'The entered value for the setting “%1$s” is too big. The maximal allowed value is %2$d.',
-	'SETTING_TOO_LONG'		=> 'The entered value for the setting “%1$s” is too long. The maximal allowed length is %2$d.',
-	'SETTING_TOO_SHORT'		=> 'The entered value for the setting “%1$s” is not long enough. The minimal allowed length is %2$d.',
-
-	'UCP'					=> 'User Control Panel',
-	'USERNAMES_EXPLAIN'		=> 'Place each username on a separate line.',
-	'USER_CONTROL_PANEL'	=> 'User Control Panel',
-
-	'WARNING'				=> 'Warning',
-));
-
-// PHP info
-$lang = array_merge($lang, array(
-	'ACP_PHP_INFO_EXPLAIN'	=> 'This page lists information on the version of PHP installed on this server. It includes details of loaded modules, available variables and default settings. This information may be useful when diagnosing problems. Please be aware that some hosting companies will limit what information is displayed here for security reasons. You are advised to not give out any details on this page except when asked by <a href="http://www.phpbb.com/about/team/">official team members</a> on the support forums.',
-
-	'NO_PHPINFO_AVAILABLE'	=> 'Information about your PHP configuration is unable to be determined. Phpinfo() has been disabled for security reasons.',
-));
-
-// Logs
-$lang = array_merge($lang, array(
-	'ACP_ADMIN_LOGS_EXPLAIN'	=> 'This lists all the actions carried out by board administrators. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
-	'ACP_CRITICAL_LOGS_EXPLAIN'	=> 'This lists the actions carried out by the board itself. This log provides you with information you are able to use for solving specific problems, for example non-delivery of e-mails. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
-	'ACP_MOD_LOGS_EXPLAIN'		=> 'This lists all actions done on forums, topics and posts as well as actions carried out on users by moderators, including banning. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
-	'ACP_USERS_LOGS_EXPLAIN'	=> 'This lists all actions carried out by users or on users (reports, warnings and user notes).',
-	'ALL_ENTRIES'				=> 'All entries',
-
-	'DISPLAY_LOG'	=> 'Display entries from previous',
-
-	'NO_ENTRIES'	=> 'No log entries for this period.',
-
-	'SORT_IP'		=> 'IP address',
-	'SORT_DATE'		=> 'Date',
-	'SORT_ACTION'	=> 'Log action',
-));
-
-// Index page
-$lang = array_merge($lang, array(
-	'ADMIN_INTRO'				=> 'Thank you for choosing phpBB as your board solution. This screen will give you a quick overview of all the various statistics of your board. The links on the left hand side of this screen allow you to control every aspect of your board experience. Each page will have instructions on how to use the tools.',
-	'ADMIN_LOG'					=> 'Logged administrator actions',
-	'ADMIN_LOG_INDEX_EXPLAIN'	=> 'This gives an overview of the last five actions carried out by board administrators. A full copy of the log can be viewed from the appropriate menu item or following the link below.',
-	'AVATAR_DIR_SIZE'			=> 'Avatar directory size',
-
-	'BOARD_STARTED'		=> 'Board started',
-	'BOARD_VERSION'		=> 'Board version',
-
-	'DATABASE_SERVER_INFO'	=> 'Database server',
-	'DATABASE_SIZE'			=> 'Database size',
-
-	'FILES_PER_DAY'		=> 'Attachments per day',
-	'FORUM_STATS'		=> 'Board statistics',
-
-	'GZIP_COMPRESSION'	=> 'GZip compression',
-
-	'NOT_AVAILABLE'		=> 'Not available',
-	'NUMBER_FILES'		=> 'Number of attachments',
-	'NUMBER_POSTS'		=> 'Number of posts',
-	'NUMBER_TOPICS'		=> 'Number of topics',
-	'NUMBER_USERS'		=> 'Number of users',
-	'NUMBER_ORPHAN'		=> 'Orphan attachments',
-
-	'POSTS_PER_DAY'		=> 'Posts per day',
-
-	'PURGE_CACHE'			=> 'Purge the cache',
-	'PURGE_CACHE_CONFIRM'	=> 'Are you sure you wish to purge the cache?',
-	'PURGE_CACHE_EXPLAIN'	=> 'Purge all cache related items, this includes any cached template files or queries.',
-
-	'RESET_DATE'					=> 'Reset board’s start date',
-	'RESET_DATE_CONFIRM'			=> 'Are you sure you wish to reset the board’s start date?',
-	'RESET_ONLINE'					=> 'Reset most users ever online',
-	'RESET_ONLINE_CONFIRM'			=> 'Are you sure you wish to reset the most users ever online counter?',
-	'RESYNC_POSTCOUNTS'				=> 'Resynchronise post counts',
-	'RESYNC_POSTCOUNTS_EXPLAIN'		=> 'Only existing posts will be taken into consideration. Pruned posts will not be counted.',
-	'RESYNC_POSTCOUNTS_CONFIRM'		=> 'Are you sure you wish to resynchronise post counts?',
-	'RESYNC_POST_MARKING'			=> 'Resynchronise dotted topics',
-	'RESYNC_POST_MARKING_CONFIRM'	=> 'Are you sure you wish to resynchronise dotted topics?',
-	'RESYNC_POST_MARKING_EXPLAIN'	=> 'First unmarks all topics and then correctly marks topics that have seen any activity during the past six months.',
-	'RESYNC_STATS'					=> 'Resynchronise statistics',
-	'RESYNC_STATS_CONFIRM'			=> 'Are you sure you wish to resynchronise statistics?',
-	'RESYNC_STATS_EXPLAIN'			=> 'Recalculates the total number of posts, topics, users and files.',
-	'RUN'							=> 'Run now',
-
-	'STATISTIC'					=> 'Statistic',
-	'STATISTIC_RESYNC_OPTIONS'	=> 'Resynchronise or reset statistics',
-
-	'TOPICS_PER_DAY'	=> 'Topics per day',
-
-	'UPLOAD_DIR_SIZE'	=> 'Size of posted attachments',
-	'USERS_PER_DAY'		=> 'Users per day',
-
-	'VALUE'					=> 'Value',
-	'VIEW_ADMIN_LOG'		=> 'View administrator log',
-	'VIEW_INACTIVE_USERS'	=> 'View inactive users',
-
-	'WELCOME_PHPBB'			=> 'Welcome to phpBB',
-	'WRITABLE_CONFIG'		=> 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
-));
-
-// Inactive Users
-$lang = array_merge($lang, array(
-	'INACTIVE_DATE'					=> 'Inactive date',
-	'INACTIVE_REASON'				=> 'Reason',
-	'INACTIVE_REASON_MANUAL'		=> 'Account deactivated by administrator',
-	'INACTIVE_REASON_PROFILE'		=> 'Profile details changed',
-	'INACTIVE_REASON_REGISTER'		=> 'Newly registered account',
-	'INACTIVE_REASON_REMIND'		=> 'Forced user account reactivation',
-	'INACTIVE_REASON_UNKNOWN'		=> 'Unknown',
-	'INACTIVE_USERS'				=> 'Inactive users',
-	'INACTIVE_USERS_EXPLAIN'		=> 'This is a list of users who have registered but whose accounts are inactive. You can activate, delete or remind (by sending an e-mail) these users if you wish.',
-	'INACTIVE_USERS_EXPLAIN_INDEX'	=> 'This is a list of the last 10 registered users who have inactive accounts. A full list is available from the appropriate menu item or by following the link below from where you can activate, delete or remind (by sending an e-mail) these users if you wish.',
-
-	'NO_INACTIVE_USERS'	=> 'No inactive users',
-
-	'SORT_INACTIVE'		=> 'Inactive date',
-	'SORT_LAST_VISIT'	=> 'Last visit',
-	'SORT_REASON'		=> 'Reason',
-	'SORT_REG_DATE'		=> 'Registration date',
-
-	'USER_IS_INACTIVE'		=> 'User is inactive',
-));
-
-// Log Entries
-$lang = array_merge($lang, array(
-	'LOG_ACL_ADD_USER_GLOBAL_U_'		=> '<strong>Added or edited users’ user permissions</strong><br />» %s',
-	'LOG_ACL_ADD_GROUP_GLOBAL_U_'		=> '<strong>Added or edited groups’ user permissions</strong><br />» %s',
-	'LOG_ACL_ADD_USER_GLOBAL_M_'		=> '<strong>Added or edited users’ global moderator permissions</strong><br />» %s',
-	'LOG_ACL_ADD_GROUP_GLOBAL_M_'		=> '<strong>Added or edited groups’ global moderator permissions</strong><br />» %s',
-	'LOG_ACL_ADD_USER_GLOBAL_A_'		=> '<strong>Added or edited users’ administrator permissions</strong><br />» %s',
-	'LOG_ACL_ADD_GROUP_GLOBAL_A_'		=> '<strong>Added or edited groups’ administrator permissions</strong><br />» %s',
-
-	'LOG_ACL_ADD_ADMIN_GLOBAL_A_'		=> '<strong>Added or edited Administrators</strong><br />» %s',
-	'LOG_ACL_ADD_MOD_GLOBAL_M_'			=> '<strong>Added or edited Global Moderators</strong><br />» %s',
-
-	'LOG_ACL_ADD_USER_LOCAL_F_'			=> '<strong>Added or edited users’ forum access</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_ADD_USER_LOCAL_M_'			=> '<strong>Added or edited users’ forum moderator access</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_ADD_GROUP_LOCAL_F_'		=> '<strong>Added or edited groups’ forum access</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_ADD_GROUP_LOCAL_M_'		=> '<strong>Added or edited groups’ forum moderator access</strong> from %1$s<br />» %2$s',
-
-	'LOG_ACL_ADD_MOD_LOCAL_M_'			=> '<strong>Added or edited Moderators</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_ADD_FORUM_LOCAL_F_'		=> '<strong>Added or edited forum permissions</strong> from %1$s<br />» %2$s',
-
-	'LOG_ACL_DEL_ADMIN_GLOBAL_A_'		=> '<strong>Removed Administrators</strong><br />» %s',
-	'LOG_ACL_DEL_MOD_GLOBAL_M_'			=> '<strong>Removed Global Moderators</strong><br />» %s',
-	'LOG_ACL_DEL_MOD_LOCAL_M_'			=> '<strong>Removed Moderators</strong> from %1$s<br />» %2$s',
-	'LOG_ACL_DEL_FORUM_LOCAL_F_'		=> '<strong>Removed User/Group forum permissions</strong> from %1$s<br />» %2$s',
-
-	'LOG_ACL_TRANSFER_PERMISSIONS'		=> '<strong>Permissions transferred from</strong><br />» %s',
-	'LOG_ACL_RESTORE_PERMISSIONS'		=> '<strong>Own permissions restored after using permissions from</strong><br />» %s',
-
-	'LOG_ADMIN_AUTH_FAIL'		=> '<strong>Failed administration login attempt</strong>',
-	'LOG_ADMIN_AUTH_SUCCESS'	=> '<strong>Successful administration login</strong>',
-
-	'LOG_ATTACHMENTS_DELETED'	=> '<strong>Removed user attachments</strong><br />» %s',
-
-	'LOG_ATTACH_EXT_ADD'		=> '<strong>Added or edited attachment extension</strong><br />» %s',
-	'LOG_ATTACH_EXT_DEL'		=> '<strong>Removed attachment extension</strong><br />» %s',
-	'LOG_ATTACH_EXT_UPDATE'		=> '<strong>Updated attachment extension</strong><br />» %s',
-	'LOG_ATTACH_EXTGROUP_ADD'	=> '<strong>Added extension group</strong><br />» %s',
-	'LOG_ATTACH_EXTGROUP_EDIT'	=> '<strong>Edited extension group</strong><br />» %s',
-	'LOG_ATTACH_EXTGROUP_DEL'	=> '<strong>Removed extension group</strong><br />» %s',
-	'LOG_ATTACH_FILEUPLOAD'		=> '<strong>Orphan File uploaded to Post</strong><br />» ID %1$d - %2$s',
-	'LOG_ATTACH_ORPHAN_DEL'		=> '<strong>Orphan Files deleted</strong><br />» %s',
-
-	'LOG_BAN_EXCLUDE_USER'	=> '<strong>Excluded user from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_EXCLUDE_IP'	=> '<strong>Excluded IP from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_EXCLUDE_EMAIL' => '<strong>Excluded e-mail from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_USER'			=> '<strong>Banned user</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_IP'			=> '<strong>Banned IP</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_EMAIL'			=> '<strong>Banned e-mail</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_UNBAN_USER'		=> '<strong>Unbanned user</strong><br />» %s',
-	'LOG_UNBAN_IP'			=> '<strong>Unbanned IP</strong><br />» %s',
-	'LOG_UNBAN_EMAIL'		=> '<strong>Unbanned e-mail</strong><br />» %s',
-
-	'LOG_BBCODE_ADD'		=> '<strong>Added new BBCode</strong><br />» %s',
-	'LOG_BBCODE_EDIT'		=> '<strong>Edited BBCode</strong><br />» %s',
-	'LOG_BBCODE_DELETE'		=> '<strong>Deleted BBCode</strong><br />» %s',
-
-	'LOG_BOT_ADDED'		=> '<strong>New bot added</strong><br />» %s',
-	'LOG_BOT_DELETE'	=> '<strong>Deleted bot</strong><br />» %s',
-	'LOG_BOT_UPDATED'	=> '<strong>Existing bot updated</strong><br />» %s',
-
-	'LOG_CLEAR_ADMIN'		=> '<strong>Cleared admin log</strong>',
-	'LOG_CLEAR_CRITICAL'	=> '<strong>Cleared error log</strong>',
-	'LOG_CLEAR_MOD'			=> '<strong>Cleared moderator log</strong>',
-	'LOG_CLEAR_USER'		=> '<strong>Cleared user log</strong><br />» %s',
-	'LOG_CLEAR_USERS'		=> '<strong>Cleared user logs</strong>',
-
-	'LOG_CONFIG_ATTACH'			=> '<strong>Altered attachment settings</strong>',
-	'LOG_CONFIG_AUTH'			=> '<strong>Altered authentication settings</strong>',
-	'LOG_CONFIG_AVATAR'			=> '<strong>Altered avatar settings</strong>',
-	'LOG_CONFIG_COOKIE'			=> '<strong>Altered cookie settings</strong>',
-	'LOG_CONFIG_EMAIL'			=> '<strong>Altered e-mail settings</strong>',
-	'LOG_CONFIG_FEATURES'		=> '<strong>Altered board features</strong>',
-	'LOG_CONFIG_LOAD'			=> '<strong>Altered load settings</strong>',
-	'LOG_CONFIG_MESSAGE'		=> '<strong>Altered private message settings</strong>',
-	'LOG_CONFIG_POST'			=> '<strong>Altered post settings</strong>',
-	'LOG_CONFIG_REGISTRATION'	=> '<strong>Altered user registration settings</strong>',
-	'LOG_CONFIG_SEARCH'			=> '<strong>Altered search settings</strong>',
-	'LOG_CONFIG_SECURITY'		=> '<strong>Altered security settings</strong>',
-	'LOG_CONFIG_SERVER'			=> '<strong>Altered server settings</strong>',
-	'LOG_CONFIG_SETTINGS'		=> '<strong>Altered board settings</strong>',
-	'LOG_CONFIG_SIGNATURE'		=> '<strong>Altered signature settings</strong>',
-	'LOG_CONFIG_VISUAL'			=> '<strong>Altered visual confirmation settings</strong>',
-
-	'LOG_APPROVE_TOPIC'			=> '<strong>Approved topic</strong><br />» %s',
-	'LOG_BUMP_TOPIC'			=> '<strong>User bumped topic</strong><br />» %s',
-	'LOG_DELETE_POST'			=> '<strong>Deleted post</strong><br />» %s',
-	'LOG_DELETE_SHADOW_TOPIC'	=> '<strong>Deleted shadow topic</strong><br />» %s',
-	'LOG_DELETE_TOPIC'			=> '<strong>Deleted topic</strong><br />» %s',
-	'LOG_FORK'					=> '<strong>Copied topic</strong><br />» from %s',
-	'LOG_LOCK'					=> '<strong>Locked topic</strong><br />» %s',
-	'LOG_LOCK_POST'				=> '<strong>Locked post</strong><br />» %s',
-	'LOG_MERGE'					=> '<strong>Merged posts</strong> into topic<br />» %s',
-	'LOG_MOVE'					=> '<strong>Moved topic</strong><br />» from %1$s to %2$s',
-	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br />» %s',
-	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” with the following reason</strong><br />» %2$s',
-	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
-	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
-	'LOG_REPORT_DELETED'		=> '<strong>Deleted report</strong><br />» %s',
-	'LOG_SPLIT_DESTINATION'		=> '<strong>Moved split posts</strong><br />» to %s',
-	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br />» from %s',
-
-	'LOG_TOPIC_APPROVED'		=> '<strong>Approved topic</strong><br />» %s',
-	'LOG_TOPIC_DISAPPROVED'		=> '<strong>Disapproved topic “%1$s” with the following reason</strong><br />%2$s',
-	'LOG_TOPIC_RESYNC'			=> '<strong>Resynchronised topic counters</strong><br />» %s',
-	'LOG_TOPIC_TYPE_CHANGED'	=> '<strong>Changed topic type</strong><br />» %s',
-	'LOG_UNLOCK'				=> '<strong>Unlocked topic</strong><br />» %s',
-	'LOG_UNLOCK_POST'			=> '<strong>Unlocked post</strong><br />» %s',
-
-	'LOG_DISALLOW_ADD'		=> '<strong>Added disallowed username</strong><br />» %s',
-	'LOG_DISALLOW_DELETE'	=> '<strong>Deleted disallowed username</strong>',
-
-	'LOG_DB_BACKUP'			=> '<strong>Database backup</strong>',
-	'LOG_DB_DELETE'			=> '<strong>Deleted database backup</strong>',
-	'LOG_DB_RESTORE'		=> '<strong>Restored database backup</strong>',
-
-	'LOG_DOWNLOAD_EXCLUDE_IP'	=> '<strong>Excluded IP/hostname from download list</strong><br />» %s',
-	'LOG_DOWNLOAD_IP'			=> '<strong>Added IP/hostname to download list</strong><br />» %s',
-	'LOG_DOWNLOAD_REMOVE_IP'	=> '<strong>Removed IP/hostname from download list</strong><br />» %s',
-
-	'LOG_ERROR_JABBER'		=> '<strong>Jabber error</strong><br />» %s',
-	'LOG_ERROR_EMAIL'		=> '<strong>E-mail error</strong><br />» %s',
-
-	'LOG_FORUM_ADD'							=> '<strong>Created new forum</strong><br />» %s',
-	'LOG_FORUM_DEL_FORUM'					=> '<strong>Deleted forum</strong><br />» %s',
-	'LOG_FORUM_DEL_FORUMS'					=> '<strong>Deleted forum and its subforums</strong><br />» %s',
-	'LOG_FORUM_DEL_MOVE_FORUMS'				=> '<strong>Deleted forum and moved subforums</strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_DEL_MOVE_POSTS'				=> '<strong>Deleted forum and moved posts </strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_DEL_MOVE_POSTS_FORUMS'		=> '<strong>Deleted forum and its subforums, moved posts</strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS'	=> '<strong>Deleted forum, moved posts</strong> to %1$s <strong>and subforums</strong> to %2$s<br />» %3$s',
-	'LOG_FORUM_DEL_POSTS'					=> '<strong>Deleted forum and its posts</strong><br />» %s',
-	'LOG_FORUM_DEL_POSTS_FORUMS'			=> '<strong>Deleted forum, its posts and subforums</strong><br />» %s',
-	'LOG_FORUM_DEL_POSTS_MOVE_FORUMS'		=> '<strong>Deleted forum and its posts, moved subforums</strong> to %1$s<br />» %2$s',
-	'LOG_FORUM_EDIT'						=> '<strong>Edited forum details</strong><br />» %s',
-	'LOG_FORUM_MOVE_DOWN'					=> '<strong>Moved forum</strong> %1$s <strong>below</strong> %2$s',
-	'LOG_FORUM_MOVE_UP'						=> '<strong>Moved forum</strong> %1$s <strong>above</strong> %2$s',
-	'LOG_FORUM_SYNC'						=> '<strong>Re-synchronised forum</strong><br />» %s',
-
-	'LOG_GROUP_CREATED'		=> '<strong>New usergroup created</strong><br />» %s',
-	'LOG_GROUP_DEFAULTS'	=> '<strong>Group “%1$s” made default for members</strong><br />» %2$s',
-	'LOG_GROUP_DELETE'		=> '<strong>Usergroup deleted</strong><br />» %s',
-	'LOG_GROUP_DEMOTED'		=> '<strong>Leaders demoted in usergroup</strong> %1$s<br />» %2$s',
-	'LOG_GROUP_PROMOTED'	=> '<strong>Members promoted to leader in usergroup</strong> %1$s<br />» %2$s',
-	'LOG_GROUP_REMOVE'		=> '<strong>Members removed from usergroup</strong> %1$s<br />» %2$s',
-	'LOG_GROUP_UPDATED'		=> '<strong>Usergroup details updated</strong><br />» %s',
-	'LOG_MODS_ADDED'		=> '<strong>Added new leaders to usergroup</strong> %1$s<br />» %2$s',
-	'LOG_USERS_APPROVED'	=> '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s',
-	'LOG_USERS_ADDED'		=> '<strong>Added new members to usergroup</strong> %1$s<br />» %2$s',
-
-	'LOG_IMAGESET_ADD_DB'			=> '<strong>Added new imageset to database</strong><br />» %s',
-	'LOG_IMAGESET_ADD_FS'			=> '<strong>Add new imageset on filesystem</strong><br />» %s',
-	'LOG_IMAGESET_DELETE'			=> '<strong>Deleted imageset</strong><br />» %s',
-	'LOG_IMAGESET_EDIT_DETAILS'		=> '<strong>Edited imageset details</strong><br />» %s',
-	'LOG_IMAGESET_EDIT'				=> '<strong>Edited imageset</strong><br />» %s',
-	'LOG_IMAGESET_EXPORT'			=> '<strong>Exported imageset</strong><br />» %s',
-	'LOG_IMAGESET_LANG_MISSING'		=> '<strong>Imageset misses “%2$s” localisation</strong><br />» %1$s',
-	'LOG_IMAGESET_LANG_REFRESHED'	=> '<strong>Refreshed “%2$s” localisation of imageset</strong><br />» %1$s',
-	'LOG_IMAGESET_REFRESHED'		=> '<strong>Refreshed imageset</strong><br />» %s',
-
-	'LOG_INACTIVE_ACTIVATE'	=> '<strong>Activated inactive users</strong><br />» %s',
-	'LOG_INACTIVE_DELETE'	=> '<strong>Deleted inactive users</strong><br />» %s',
-	'LOG_INACTIVE_REMIND'	=> '<strong>Sent reminder e-mails to inactive users</strong><br />» %s',
-	'LOG_INSTALL_CONVERTED'	=> '<strong>Converted from %1$s to phpBB %2$s</strong>',
-	'LOG_INSTALL_INSTALLED'	=> '<strong>Installed phpBB %s</strong>',
-
-	'LOG_IP_BROWSER_FORWARDED_CHECK'	=> '<strong>Session IP/browser/X_FORWARDED_FOR check failed</strong><br />»User IP “<em>%1$s</em>” checked against session IP “<em>%2$s</em>”, user browser string “<em>%3$s</em>” checked against session browser string “<em>%4$s</em>” and user X_FORWARDED_FOR string “<em>%5$s</em>” checked against session X_FORWARDED_FOR string “<em>%6$s</em>”.',
-
-	'LOG_JAB_CHANGED'			=> '<strong>Jabber account changed</strong>',
-	'LOG_JAB_PASSCHG'			=> '<strong>Jabber password changed</strong>',
-	'LOG_JAB_REGISTER'			=> '<strong>Jabber account registered</strong>',
-	'LOG_JAB_SETTINGS_CHANGED'	=> '<strong>Jabber settings changed</strong>',
-
-	'LOG_LANGUAGE_PACK_DELETED'		=> '<strong>Deleted language pack</strong><br />» %s',
-	'LOG_LANGUAGE_PACK_INSTALLED'	=> '<strong>Installed language pack</strong><br />» %s',
-	'LOG_LANGUAGE_PACK_UPDATED'		=> '<strong>Updated language pack details</strong><br />» %s',
-	'LOG_LANGUAGE_FILE_REPLACED'	=> '<strong>Replaced language file</strong><br />» %s',
-	'LOG_LANGUAGE_FILE_SUBMITTED'	=> '<strong>Submitted language file and placed in store folder</strong><br />» %s',
-
-	'LOG_MASS_EMAIL'		=> '<strong>Sent mass e-mail</strong><br />» %s',
-
-	'LOG_MCP_CHANGE_POSTER'	=> '<strong>Changed poster in topic “%1$s”</strong><br />» from %2$s to %3$s',
-
-	'LOG_MODULE_DISABLE'	=> '<strong>Module disabled</strong><br />» %s',
-	'LOG_MODULE_ENABLE'		=> '<strong>Module enabled</strong><br />» %s',
-	'LOG_MODULE_MOVE_DOWN'	=> '<strong>Module moved down</strong><br />» %1$s below %2$s',
-	'LOG_MODULE_MOVE_UP'	=> '<strong>Module moved up</strong><br />» %1$s above %2$s',
-	'LOG_MODULE_REMOVED'	=> '<strong>Module removed</strong><br />» %s',
-	'LOG_MODULE_ADD'		=> '<strong>Module added</strong><br />» %s',
-	'LOG_MODULE_EDIT'		=> '<strong>Module edited</strong><br />» %s',
-
-	'LOG_A_ROLE_ADD'		=> '<strong>Admin role added</strong><br />» %s',
-	'LOG_A_ROLE_EDIT'		=> '<strong>Admin role edited</strong><br />» %s',
-	'LOG_A_ROLE_REMOVED'	=> '<strong>Admin role removed</strong><br />» %s',
-	'LOG_F_ROLE_ADD'		=> '<strong>Forum role added</strong><br />» %s',
-	'LOG_F_ROLE_EDIT'		=> '<strong>Forum role edited</strong><br />» %s',
-	'LOG_F_ROLE_REMOVED'	=> '<strong>Forum role removed</strong><br />» %s',
-	'LOG_M_ROLE_ADD'		=> '<strong>Moderator role added</strong><br />» %s',
-	'LOG_M_ROLE_EDIT'		=> '<strong>Moderator role edited</strong><br />» %s',
-	'LOG_M_ROLE_REMOVED'	=> '<strong>Moderator role removed</strong><br />» %s',
-	'LOG_U_ROLE_ADD'		=> '<strong>User role added</strong><br />» %s',
-	'LOG_U_ROLE_EDIT'		=> '<strong>User role edited</strong><br />» %s',
-	'LOG_U_ROLE_REMOVED'	=> '<strong>User role removed</strong><br />» %s',
-
-	'LOG_PROFILE_FIELD_ACTIVATE'	=> '<strong>Profile field activated</strong><br />» %s',
-	'LOG_PROFILE_FIELD_CREATE'		=> '<strong>Profile field added</strong><br />» %s',
-	'LOG_PROFILE_FIELD_DEACTIVATE'	=> '<strong>Profile field deactivated</strong><br />» %s',
-	'LOG_PROFILE_FIELD_EDIT'		=> '<strong>Profile field changed</strong><br />» %s',
-	'LOG_PROFILE_FIELD_REMOVED'		=> '<strong>Profile field removed</strong><br />» %s',
-
-	'LOG_PRUNE'					=> '<strong>Pruned forums</strong><br />» %s',
-	'LOG_AUTO_PRUNE'			=> '<strong>Auto-pruned forums</strong><br />» %s',
-	'LOG_PRUNE_USER_DEAC'		=> '<strong>Users deactivated</strong><br />» %s',
-	'LOG_PRUNE_USER_DEL_DEL'	=> '<strong>Users pruned and posts deleted</strong><br />» %s',
-	'LOG_PRUNE_USER_DEL_ANON'	=> '<strong>Users pruned and posts retained</strong><br />» %s',
-
-	'LOG_PURGE_CACHE'			=> '<strong>Purged cache</strong>',
-
-	'LOG_RANK_ADDED'		=> '<strong>Added new rank</strong><br />» %s',
-	'LOG_RANK_REMOVED'		=> '<strong>Removed rank</strong><br />» %s',
-	'LOG_RANK_UPDATED'		=> '<strong>Updated rank</strong><br />» %s',
-
-	'LOG_REASON_ADDED'		=> '<strong>Added report/denial reason</strong><br />» %s',
-	'LOG_REASON_REMOVED'	=> '<strong>Removed report/denial reason</strong><br />» %s',
-	'LOG_REASON_UPDATED'	=> '<strong>Updated report/denial reason</strong><br />» %s',
-
-	'LOG_REFERER_INVALID'		=> '<strong>Referer validation failed</strong><br />»Referer was “<em>%1$s</em>”. The request was rejected and the session killed.',
-	'LOG_RESET_DATE'			=> '<strong>Board start date reset</strong>',
-	'LOG_RESET_ONLINE'			=> '<strong>Most users online reset</strong>',
-	'LOG_RESYNC_POSTCOUNTS'		=> '<strong>User post counts resynchronised</strong>',
-	'LOG_RESYNC_POST_MARKING'	=> '<strong>Dotted topics resynchronised</strong>',
-	'LOG_RESYNC_STATS'			=> '<strong>Post, topic and user statistics resynchronised</strong>',
-
-	'LOG_SEARCH_INDEX_CREATED'	=> '<strong>Created search index for</strong><br />» %s',
-	'LOG_SEARCH_INDEX_REMOVED'	=> '<strong>Removed search index for</strong><br />» %s',
-	'LOG_STYLE_ADD'				=> '<strong>Added new style</strong><br />» %s',
-	'LOG_STYLE_DELETE'			=> '<strong>Deleted style</strong><br />» %s',
-	'LOG_STYLE_EDIT_DETAILS'	=> '<strong>Edited style</strong><br />» %s',
-	'LOG_STYLE_EXPORT'			=> '<strong>Exported style</strong><br />» %s',
-
-	'LOG_TEMPLATE_ADD_DB'			=> '<strong>Added new template set to database</strong><br />» %s',
-	'LOG_TEMPLATE_ADD_FS'			=> '<strong>Add new template set on filesystem</strong><br />» %s',
-	'LOG_TEMPLATE_CACHE_CLEARED'	=> '<strong>Deleted cached versions of template files in template set <em>%1$s</em></strong><br />» %2$s',
-	'LOG_TEMPLATE_DELETE'			=> '<strong>Deleted template set</strong><br />» %s',
-	'LOG_TEMPLATE_EDIT'				=> '<strong>Edited template set <em>%1$s</em></strong><br />» %2$s',
-	'LOG_TEMPLATE_EDIT_DETAILS'		=> '<strong>Edited template details</strong><br />» %s',
-	'LOG_TEMPLATE_EXPORT'			=> '<strong>Exported template set</strong><br />» %s',
-	'LOG_TEMPLATE_REFRESHED'		=> '<strong>Refreshed template set</strong><br />» %s',
-
-	'LOG_THEME_ADD_DB'			=> '<strong>Added new theme to database</strong><br />» %s',
-	'LOG_THEME_ADD_FS'			=> '<strong>Add new theme on filesystem</strong><br />» %s',
-	'LOG_THEME_DELETE'			=> '<strong>Theme deleted</strong><br />» %s',
-	'LOG_THEME_EDIT_DETAILS'	=> '<strong>Edited theme details</strong><br />» %s',
-	'LOG_THEME_EDIT'			=> '<strong>Edited theme <em>%1$s</em></strong>',
-	'LOG_THEME_EDIT_FILE'		=> '<strong>Edited theme <em>%1$s</em></strong><br />» Modified file <em>%2$s</em>',
-	'LOG_THEME_EXPORT'			=> '<strong>Exported theme</strong><br />» %s',
-	'LOG_THEME_REFRESHED'		=> '<strong>Refreshed theme</strong><br />» %s',
-
-	'LOG_UPDATE_DATABASE'	=> '<strong>Updated Database from version %1$s to version %2$s</strong>',
-	'LOG_UPDATE_PHPBB'		=> '<strong>Updated phpBB from version %1$s to version %2$s</strong>',
-
-	'LOG_USER_ACTIVE'		=> '<strong>User activated</strong><br />» %s',
-	'LOG_USER_BAN_USER'		=> '<strong>Banned User via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_USER_BAN_IP'		=> '<strong>Banned IP via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_USER_BAN_EMAIL'	=> '<strong>Banned e-mail via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_USER_DELETED'		=> '<strong>Deleted user</strong><br />» %s',
-	'LOG_USER_DEL_ATTACH'	=> '<strong>Removed all attachments made by the user</strong><br />» %s',
-	'LOG_USER_DEL_AVATAR'	=> '<strong>Removed user avatar</strong><br />» %s',
-	'LOG_USER_DEL_POSTS'	=> '<strong>Removed all posts made by the user</strong><br />» %s',
-	'LOG_USER_DEL_SIG'		=> '<strong>Removed user signature</strong><br />» %s',
-	'LOG_USER_INACTIVE'		=> '<strong>User deactivated</strong><br />» %s',
-	'LOG_USER_MOVE_POSTS'	=> '<strong>Moved user posts</strong><br />» posts by “%1$s” to forum “%2$s”',
-	'LOG_USER_NEW_PASSWORD'	=> '<strong>Changed user password</strong><br />» %s',
-	'LOG_USER_REACTIVATE'	=> '<strong>Forced user account reactivation</strong><br />» %s',
-	'LOG_USER_UPDATE_EMAIL'	=> '<strong>User “%1$s” changed e-mail</strong><br />» from “%2$s” to “%3$s”',
-	'LOG_USER_UPDATE_NAME'	=> '<strong>Changed username</strong><br />» from “%1$s” to “%2$s”',
-	'LOG_USER_USER_UPDATE'	=> '<strong>Updated user details</strong><br />» %s',
-
-	'LOG_USER_ACTIVE_USER'		=> '<strong>User account activated</strong>',
-	'LOG_USER_DEL_AVATAR_USER'	=> '<strong>User avatar removed</strong>',
-	'LOG_USER_DEL_SIG_USER'		=> '<strong>User signature removed</strong>',
-	'LOG_USER_FEEDBACK'			=> '<strong>Added user feedback</strong><br />» %s',
-	'LOG_USER_GENERAL'			=> '<strong>Entry added:</strong><br />» %s',
-	'LOG_USER_INACTIVE_USER'	=> '<strong>User account de-activated</strong>',
-	'LOG_USER_LOCK'				=> '<strong>User locked own topic</strong><br />» %s',
-	'LOG_USER_MOVE_POSTS_USER'	=> '<strong>Moved all posts to forum</strong>» %s',
-	'LOG_USER_REACTIVATE_USER'	=> '<strong>Forced user account reactivation</strong>',
-	'LOG_USER_UNLOCK'			=> '<strong>User unlocked own topic</strong><br />» %s',
-	'LOG_USER_WARNING'			=> '<strong>Added user warning</strong><br />» %s',
-	'LOG_USER_WARNING_BODY'		=> '<strong>The following warning was issued to this user</strong><br />» %s',
-
-	'LOG_USER_GROUP_CHANGE'			=> '<strong>User changed default group</strong><br />» %s',
-	'LOG_USER_GROUP_DEMOTE'			=> '<strong>User demoted as leaders from usergroup</strong><br />» %s',
-	'LOG_USER_GROUP_JOIN'			=> '<strong>User joined group</strong><br />» %s',
-	'LOG_USER_GROUP_JOIN_PENDING'	=> '<strong>User joined group and needs to be approved</strong><br />» %s',
-	'LOG_USER_GROUP_RESIGN'			=> '<strong>User resigned membership from group</strong><br />» %s',
-
-	'LOG_WORD_ADD'			=> '<strong>Added word censor</strong><br />» %s',
-	'LOG_WORD_DELETE'		=> '<strong>Deleted word censor</strong><br />» %s',
-	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br />» %s',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
deleted file mode 100644
index 7100fcb1e3..0000000000
--- a/phpBB/language/en/acp/database.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
-*
-* acp_database [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-// Database Backup/Restore
-$lang = array_merge($lang, array(
-	'ACP_BACKUP_EXPLAIN'	=> 'Here you can backup all your phpBB related data. You may store the resulting archive in your <samp>store/</samp> folder or download it directly. Depending on your server configuration you may be able to compress the file in a number of formats.',
-	'ACP_RESTORE_EXPLAIN'	=> 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. <strong>WARNING</strong> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete. Backups are stored in the <samp>store/</samp> folder and are assumed to be generated by phpBB’s backup functionality. Restoring backups that were not created by the built in system may or may not work.',
-
-	'BACKUP_DELETE'		=> 'The backup file has been deleted successfully.',
-	'BACKUP_INVALID'	=> 'The selected file to backup is invalid.',
-	'BACKUP_OPTIONS'	=> 'Backup options',
-	'BACKUP_SUCCESS'	=> 'The backup file has been created successfully.',
-	'BACKUP_TYPE'		=> 'Backup type',
-
-	'DATABASE'			=> 'Database utilities',
-	'DATA_ONLY'			=> 'Data only',
-	'DELETE_BACKUP'		=> 'Delete backup',
-	'DELETE_SELECTED_BACKUP'	=> 'Are you sure you want to delete the selected backup?',
-	'DESELECT_ALL'		=> 'Deselect all',
-	'DOWNLOAD_BACKUP'	=> 'Download backup',
-
-	'FILE_TYPE'			=> 'File type',
-	'FULL_BACKUP'		=> 'Full',
-
-	'RESTORE_FAILURE'		=> 'The backup file may be corrupt.',
-	'RESTORE_OPTIONS'		=> 'Restore options',
-	'RESTORE_SUCCESS'		=> 'The database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.',
-
-	'SELECT_ALL'			=> 'Select all',
-	'SELECT_FILE'			=> 'Select a file',
-	'START_BACKUP'			=> 'Start backup',
-	'START_RESTORE'			=> 'Start restore',
-	'STORE_AND_DOWNLOAD'	=> 'Store and download',
-	'STORE_LOCAL'			=> 'Store file locally',
-	'STRUCTURE_ONLY'		=> 'Structure only',
-
-	'TABLE_SELECT'		=> 'Table select',
-	'TABLE_SELECT_ERROR'=> 'You must select at least one table.',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
deleted file mode 100644
index 4427bfff01..0000000000
--- a/phpBB/language/en/acp/email.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
-*
-* acp_email [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-// Email settings
-$lang = array_merge($lang, array(
-	'ACP_MASS_EMAIL_EXPLAIN'		=> 'Here you can e-mail a message to either all of your users or all users of a specific group <strong>having the option to receive mass e-mails enabled</strong>. To achieve this an e-mail will be sent out to the administrative e-mail address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an e-mail, for more recipients more e-mails will be sent. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed.',
-	'ALL_USERS'						=> 'All users',
-
-	'COMPOSE'				=> 'Compose',
-
-	'EMAIL_SEND_ERROR'		=> 'There were one or more errors while sending the e-mail. Please check the %sError log%s for detailed error messages.',
-	'EMAIL_SENT'			=> 'This message has been sent.',
-	'EMAIL_SENT_QUEUE'		=> 'This message has been queued for sending.',
-
-	'LOG_SESSION'			=> 'Log mail session to critical log',
-
-	'SEND_IMMEDIATELY'		=> 'Send immediately',
-	'SEND_TO_GROUP'			=> 'Send to group',
-	'SEND_TO_USERS'			=> 'Send to users',
-	'SEND_TO_USERS_EXPLAIN'	=> 'Entering names here will override any group selected above. Enter each username on a new line.',
-	
-	'MAIL_HIGH_PRIORITY'	=> 'High',
-	'MAIL_LOW_PRIORITY'		=> 'Low',
-	'MAIL_NORMAL_PRIORITY'	=> 'Normal',
-	'MAIL_PRIORITY'			=> 'Mail priority',
-	'MASS_MESSAGE'			=> 'Your message',
-	'MASS_MESSAGE_EXPLAIN'	=> 'Please note that you may enter only plain text. All markup will be removed before sending.',
-	
-	'NO_EMAIL_MESSAGE'		=> 'You must enter a message.',
-	'NO_EMAIL_SUBJECT'		=> 'You must specify a subject for your message.',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
deleted file mode 100644
index 52919f4f40..0000000000
--- a/phpBB/language/en/acp/forums.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
-*
-* acp_forums [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-// Forum Admin
-$lang = array_merge($lang, array(
-	'AUTO_PRUNE_DAYS'			=> 'Auto-prune post age',
-	'AUTO_PRUNE_DAYS_EXPLAIN'	=> 'Number of days since last post after which topic is removed.',
-	'AUTO_PRUNE_FREQ'			=> 'Auto-prune frequency',
-	'AUTO_PRUNE_FREQ_EXPLAIN'	=> 'Time in days between pruning events.',
-	'AUTO_PRUNE_VIEWED'			=> 'Auto-prune post viewed age',
-	'AUTO_PRUNE_VIEWED_EXPLAIN'	=> 'Number of days since topic was viewed after which topic is removed.',
-
-	'COPY_PERMISSIONS'				=> 'Copy permissions from',
-	'COPY_PERMISSIONS_ADD_EXPLAIN'	=> 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.',
-	'COPY_PERMISSIONS_EDIT_EXPLAIN'	=> 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.',
-	'CREATE_FORUM'					=> 'Create new forum',
-
-	'DECIDE_MOVE_DELETE_CONTENT'		=> 'Delete content or move to forum',
-	'DECIDE_MOVE_DELETE_SUBFORUMS'		=> 'Delete subforums or move to forum',
-	'DEFAULT_STYLE'						=> 'Default style',
-	'DELETE_ALL_POSTS'					=> 'Delete posts',
-	'DELETE_SUBFORUMS'					=> 'Delete subforums and posts',
-	'DISPLAY_ACTIVE_TOPICS'				=> 'Enable active topics',
-	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'		=> 'If set to yes active topics in selected subforums will be displayed under this category.',
-
-	'EDIT_FORUM'					=> 'Edit forum',
-	'ENABLE_INDEXING'				=> 'Enable search indexing',
-	'ENABLE_INDEXING_EXPLAIN'		=> 'If set to yes posts made to this forum will be indexed for searching.',
-	'ENABLE_POST_REVIEW'			=> 'Enable post review',
-	'ENABLE_POST_REVIEW_EXPLAIN'	=> 'If set to yes users are able to review their post if new posts were made to the topic while users wrote theirs. This should be disabled for chat forums.',
-	'ENABLE_RECENT'					=> 'Display active topics',
-	'ENABLE_RECENT_EXPLAIN'			=> 'If set to yes topics made to this forum will be shown in the active topics list.',
-	'ENABLE_TOPIC_ICONS'			=> 'Enable topic icons',
-
-	'FORUM_ADMIN'						=> 'Forum administration',
-	'FORUM_ADMIN_EXPLAIN'				=> 'In phpBB3 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. <strong>You need to copy or set appropriate permissions for newly created forums to have them displayed.</strong>',
-	'FORUM_AUTO_PRUNE'					=> 'Enable auto-pruning',
-	'FORUM_AUTO_PRUNE_EXPLAIN'			=> 'Prunes the forum of topics, set the frequency/age parameters below.',
-	'FORUM_CREATED'						=> 'Forum created successfully.',
-	'FORUM_DATA_NEGATIVE'				=> 'Pruning parameters cannot be negative.',
-	'FORUM_DESC_TOO_LONG'				=> 'The forum description is too long, it must be less than 4000 characters.',
-	'FORUM_DELETE'						=> 'Delete forum',
-	'FORUM_DELETE_EXPLAIN'				=> 'The form below will allow you to delete a forum. If the forum is postable you are able to decide where you want to put all topics (or forums) it contained.',
-	'FORUM_DELETED'						=> 'Forum successfully deleted.',
-	'FORUM_DESC'						=> 'Description',
-	'FORUM_DESC_EXPLAIN'				=> 'Any HTML markup entered here will be displayed as is.',
-	'FORUM_EDIT_EXPLAIN'				=> 'The form below will allow you to customise this forum. Please note that moderation and post count controls are set via forum permissions for each user or usergroup.',
-	'FORUM_IMAGE'						=> 'Forum image',
-	'FORUM_IMAGE_EXPLAIN'				=> 'Location, relative to the phpBB root directory, of an additional image to associate with this forum.',
-	'FORUM_IMAGE_NO_EXIST'				=> 'The specified forum image does not exist',
-	'FORUM_LINK_EXPLAIN'				=> 'Full URL (including the protocol, i.e.: <samp>http://</samp>) to the destination location that clicking this forum will take the user, e.g.: <samp>http://www.phpbb.com/</samp>.',
-	'FORUM_LINK_TRACK'					=> 'Track link redirects',
-	'FORUM_LINK_TRACK_EXPLAIN'			=> 'Records the number of times a forum link was clicked.',
-	'FORUM_NAME'						=> 'Forum name',
-	'FORUM_NAME_EMPTY'					=> 'You must enter a name for this forum.',
-	'FORUM_PARENT'						=> 'Parent forum',
-	'FORUM_PASSWORD'					=> 'Forum password',
-	'FORUM_PASSWORD_CONFIRM'			=> 'Confirm forum password',
-	'FORUM_PASSWORD_CONFIRM_EXPLAIN'	=> 'Only needs to be set if a forum password is entered.',
-	'FORUM_PASSWORD_EXPLAIN'			=> 'Defines a password for this forum, use the permission system in preference.',
-	'FORUM_PASSWORD_UNSET'				=> 'Remove forum password',
-	'FORUM_PASSWORD_UNSET_EXPLAIN'		=> 'Check here if you want to remove the forum password.',
-	'FORUM_PASSWORD_OLD'				=> 'The forum password is using an old encryption and should be changed.',
-	'FORUM_PASSWORD_MISMATCH'			=> 'The passwords you entered did not match.',
-	'FORUM_PRUNE_SETTINGS'				=> 'Forum prune settings',
-	'FORUM_RESYNCED'					=> 'Forum “%s” successfully resynced',
-	'FORUM_RULES_EXPLAIN'				=> 'Forum rules are displayed at any page within the given forum.',
-	'FORUM_RULES_LINK'					=> 'Link to forum rules',
-	'FORUM_RULES_LINK_EXPLAIN'			=> 'You are able to enter the URL of the page/post containing your forum rules here. This setting will override the forum rules text you specified.',
-	'FORUM_RULES_PREVIEW'				=> 'Forum rules preview',
-	'FORUM_RULES_TOO_LONG'				=> 'The forum rules must be less than 4000 characters.',
-	'FORUM_SETTINGS'					=> 'Forum settings',
-	'FORUM_STATUS'						=> 'Forum status',
-	'FORUM_STYLE'						=> 'Forum style',
-	'FORUM_TOPICS_PAGE'					=> 'Topics per page',
-	'FORUM_TOPICS_PAGE_EXPLAIN'			=> 'If non-zero this value will override the default topics per page setting.',
-	'FORUM_TYPE'						=> 'Forum type',
-	'FORUM_UPDATED'						=> 'Forum information updated successfully.',
-
-	'FORUM_WITH_SUBFORUMS_NOT_TO_LINK'		=> 'You want to change a postable forum having subforums to a link. Please move all subforums out of this forum before you proceed, because after changing to a link you are no longer able to see the subforums currently connected to this forum.',
-
-	'GENERAL_FORUM_SETTINGS'	=> 'General forum settings',
-
-	'LINK'						=> 'Link',
-	'LIST_INDEX'				=> 'List subforum in parent-forum’s legend',
-	'LIST_INDEX_EXPLAIN'		=> 'Displays this forum on the index and elsewhere as a link within the legend of its parent-forum if the parent-forum’s “List subforums in legend” option is enabled.',
-	'LIST_SUBFORUMS'			=> 'List subforums in legend',
-	'LIST_SUBFORUMS_EXPLAIN'	=> 'Displays this forum’s subforums on the index and elsewhere as a link within the legend if their “List subforum in parent-forum’s legend” option is enabled.',
-	'LOCKED'					=> 'Locked',
-
-	'MOVE_POSTS_NO_POSTABLE_FORUM'	=> 'The forum you selected for moving the posts to is not postable. Please select a postable forum.',
-	'MOVE_POSTS_TO'					=> 'Move posts to',
-	'MOVE_SUBFORUMS_TO'				=> 'Move subforums to',
-
-	'NO_DESTINATION_FORUM'			=> 'You have not specified a forum to move content to.',
-	'NO_FORUM_ACTION'				=> 'No action defined for what happens with the forum content.',
-	'NO_PARENT'						=> 'No parent',
-	'NO_PERMISSIONS'				=> 'Do not copy permissions',
-	'NO_PERMISSION_FORUM_ADD'		=> 'You do not have the necessary permissions to add forums.',
-	'NO_PERMISSION_FORUM_DELETE'	=> 'You do not have the necessary permissions to delete forums.',
-
-	'PARENT_IS_LINK_FORUM'		=> 'The parent you specified is a forum link. Link forums are not able to hold other forums, please specify a category or forum as the parent forum.',
-	'PARENT_NOT_EXIST'			=> 'Parent does not exist.',
-	'PRUNE_ANNOUNCEMENTS'		=> 'Prune announcements',
-	'PRUNE_STICKY'				=> 'Prune stickies',
-	'PRUNE_OLD_POLLS'			=> 'Prune old polls',
-	'PRUNE_OLD_POLLS_EXPLAIN'	=> 'Removes topics with polls not voted in for post age days.',
-
-	'REDIRECT_ACL'	=> 'Now you are able to %sset permissions%s for this forum.',
-
-	'SYNC_IN_PROGRESS'			=> 'Synchronizing forum',
-	'SYNC_IN_PROGRESS_EXPLAIN'	=> 'Currently resyncing topic range %1$d/%2$d.',
-
-	'TYPE_CAT'			=> 'Category',
-	'TYPE_FORUM'		=> 'Forum',
-	'TYPE_LINK'			=> 'Link',
-
-	'UNLOCKED'			=> 'Unlocked',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
deleted file mode 100644
index db6f334540..0000000000
--- a/phpBB/language/en/acp/groups.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
-*
-* acp_groups [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ACP_GROUPS_MANAGE_EXPLAIN'		=> 'From this panel you can administrate all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.',
-	'ADD_USERS'						=> 'Add users',
-	'ADD_USERS_EXPLAIN'				=> 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.',
-
-	'COPY_PERMISSIONS'				=> 'Copy permissions from',
-	'COPY_PERMISSIONS_EXPLAIN'		=> 'Once created, the group will have the same permissions as the one you select here.',
-	'CREATE_GROUP'					=> 'Create new group',
-
-	'GROUPS_NO_MEMBERS'				=> 'This group has no members',
-	'GROUPS_NO_MODS'				=> 'No group leaders defined',
-
-	'GROUP_APPROVE'					=> 'Approve member',
-	'GROUP_APPROVED'				=> 'Approved members',
-	'GROUP_AVATAR'					=> 'Group avatar',
-	'GROUP_AVATAR_EXPLAIN'			=> 'This image will be displayed in the Group Control Panel.',
-	'GROUP_CLOSED'					=> 'Closed',
-	'GROUP_COLOR'					=> 'Group colour',
-	'GROUP_COLOR_EXPLAIN'			=> 'Defines the colour members’ usernames will appear in, leave blank for user default.',
-	'GROUP_CONFIRM_ADD_USER'		=> 'Are you sure that you want to add the user %1$s to the group?',
-	'GROUP_CONFIRM_ADD_USERS'		=> 'Are you sure that you want to add the users %1$s to the group?',
-	'GROUP_CREATED'					=> 'Group has been created successfully.',
-	'GROUP_DEFAULT'					=> 'Make group default for member',
-	'GROUP_DEFS_UPDATED'			=> 'Default group set for all selected members.',
-	'GROUP_DELETE'					=> 'Remove member from group',
-	'GROUP_DELETED'					=> 'Group deleted and user default groups set successfully.',
-	'GROUP_DEMOTE'					=> 'Demote group leader',
-	'GROUP_DESC'					=> 'Group description',
-	'GROUP_DETAILS'					=> 'Group details',
-	'GROUP_EDIT_EXPLAIN'			=> 'Here you can edit an existing group. You can change its name, description and type (open, closed, etc.). You can also set certain group wide options such as colouration, rank, etc. Changes made here override users’ current settings. Please note that group members can override group-avatar settings, unless you set appropriate user permissions.',
-	'GROUP_ERR_USERS_EXIST'			=> 'The specified users are already members of this group.',
-	'GROUP_FOUNDER_MANAGE'			=> 'Founder manage only',
-	'GROUP_FOUNDER_MANAGE_EXPLAIN'	=> 'Restrict management of this group to founders only. Users having group permissions are still able to see this group as well as this group’s members.',
-	'GROUP_HIDDEN'					=> 'Hidden',
-	'GROUP_LANG'					=> 'Group language',
-	'GROUP_LEAD'					=> 'Group leaders',
-	'GROUP_LEADERS_ADDED'			=> 'New leaders added to group successfully.',
-	'GROUP_LEGEND'					=> 'Display group in legend',
-	'GROUP_LIST'					=> 'Current members',
-	'GROUP_LIST_EXPLAIN'			=> 'This is a complete list of all the current users with membership of this group. You can delete members (except in certain special groups) or add new ones as you see fit.',
-	'GROUP_MEMBERS'					=> 'Group members',
-	'GROUP_MEMBERS_EXPLAIN'			=> 'This is a complete listing of all the members of this usergroup. It includes separate sections for leaders, pending and existing members. From here you can manage all aspects of who has membership of this group and what their role is. To remove a leader but keep them in the group use Demote rather than delete. Similarly use Promote to make an existing member a leader.',
-	'GROUP_MESSAGE_LIMIT'			=> 'Group private message limit per folder',
-	'GROUP_MESSAGE_LIMIT_EXPLAIN'	=> 'This setting overrides the per-user folder message limit. A value of 0 means the user default limit will be used.',
-	'GROUP_MODS_ADDED'				=> 'New group leaders added successfully.',
-	'GROUP_MODS_DEMOTED'			=> 'Group leaders demoted successfully.',
-	'GROUP_MODS_PROMOTED'			=> 'Group members promoted successfully.',
-	'GROUP_NAME'					=> 'Group name',
-	'GROUP_NAME_TAKEN'				=> 'The group name you entered is already in use, please select an alternative.',
-	'GROUP_OPEN'					=> 'Open',
-	'GROUP_PENDING'					=> 'Pending members',
-	'GROUP_MAX_RECIPIENTS'			=> 'Maximum number of allowed recipients per private message',
-	'GROUP_MAX_RECIPIENTS_EXPLAIN'	=> 'The maximum number of allowed recipients in a private message. If 0 is entered, the board-wide setting is used.',
-	'GROUP_PROMOTE'					=> 'Promote to group leader',
-	'GROUP_RANK'					=> 'Group rank',
-	'GROUP_RECEIVE_PM'				=> 'Group able to receive private messages',
-	'GROUP_RECEIVE_PM_EXPLAIN'		=> 'Please note that hidden groups are not able to be messaged, regardless of this setting.',
-	'GROUP_REQUEST'					=> 'Request',
-	'GROUP_SETTINGS_SAVE'			=> 'Group wide settings',
-	'GROUP_TYPE'					=> 'Group type',
-	'GROUP_TYPE_EXPLAIN'			=> 'This determines which users can join or view this group.',
-	'GROUP_UPDATED'					=> 'Group preferences updated successfully.',
-	
-	'GROUP_USERS_ADDED'				=> 'New users added to group successfully.',
-	'GROUP_USERS_EXIST'				=> 'The selected users are already members.',
-	'GROUP_USERS_REMOVE'			=> 'Users removed from group and new defaults set successfully.',
-
-	'MAKE_DEFAULT_FOR_ALL'	=> 'Make default group for every member',
-	'MEMBERS'				=> 'Members',
-
-	'NO_GROUP'					=> 'No group specified.',
-	'NO_GROUPS_CREATED'			=> 'No groups created yet.',
-	'NO_PERMISSIONS'			=> 'Do not copy permissions',
-	'NO_USERS'					=> 'You haven’t entered any users.',
-	'NO_USERS_ADDED'			=> 'No users were added to the group.',
-	'NO_VALID_USERS'			=> 'You haven’t entered any users eligible for that action.',
-
-	'SPECIAL_GROUPS'			=> 'Pre-defined groups',
-	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
-
-	'TOTAL_MEMBERS'				=> 'Members',
-
-	'USERS_APPROVED'				=> 'Users approved successfully.',
-	'USER_DEFAULT'					=> 'User default',
-	'USER_DEF_GROUPS'				=> 'User defined groups',
-	'USER_DEF_GROUPS_EXPLAIN'		=> 'These are groups created by you or another admin on this board. You can manage memberships as well as edit group properties or even delete the group.',
-	'USER_GROUP_DEFAULT'			=> 'Set as default group',
-	'USER_GROUP_DEFAULT_EXPLAIN'	=> 'Saying yes here will set this group as the default group for the added users.',
-	'USER_GROUP_LEADER'				=> 'Set as group leader',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
deleted file mode 100644
index a10148942b..0000000000
--- a/phpBB/language/en/acp/language.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ACP_FILES'						=> 'Admin language files',
-	'ACP_LANGUAGE_PACKS_EXPLAIN'	=> 'Here you are able to install/remove language packs.',
-
-	'EMAIL_FILES'			=> 'E-mail 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.',
-	'INVALID_UPLOAD_METHOD'		=> 'The selected upload method is not valid, please choose a different method.',
-
-	'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 /><strong>Note:</strong> Once you changed a language file, the changes will be stored within a separate 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 <strong>%s</strong> has been removed successfully. All users using this language have been reset to the boards default language.',
-	'LANGUAGE_PACK_DETAILS'				=> 'Language pack details',
-	'LANGUAGE_PACK_INSTALLED'			=> 'The language pack <strong>%s</strong> 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 (including robots)',
-	'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: <strong style="color:red">%s</strong>',
-	'MISSING_LANG_VARIABLES'	=> 'Missing language variables',
-	'MODS_FILES'				=> 'MODs language files',
-
-	'NO_FILE_SELECTED'				=> 'You haven’t specified a language file.',
-	'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',
-	'SUBMIT_AND_UPLOAD'			=> 'Submit and upload 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 <strong>%s</strong> language pack',
-
-	'UNINSTALLED_LANGUAGE_PACKS'	=> 'Uninstalled language packs',
-
-	'UNABLE_TO_WRITE_FILE'		=> 'The file could not be written to %s.',
-	'UPLOAD_COMPLETED'			=> 'The upload was completed successfully.',
-	'UPLOAD_FAILED'				=> 'The upload failed for unknown reasons. You may need to replace the relevant file manually.',
-	'UPLOAD_METHOD'				=> 'Upload method',
-	'UPLOAD_SETTINGS'			=> 'Upload settings',
-
-	'WRONG_LANGUAGE_FILE'		=> 'Selected language file is invalid.',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php
deleted file mode 100644
index 875b24a94b..0000000000
--- a/phpBB/language/en/acp/modules.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
-*
-* acp_modules [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ACP_MODULE_MANAGEMENT_EXPLAIN'	=> 'Here you are able to manage all kind of modules. Please note that the ACP has a three-level menu structure (Category -> Category -> Module) whereby the others having a two-level menu structure (Category -> Module) which must be kept. Please also be aware that you may lock out yourself if you disable or delete the modules responsible for the module management itself.',
-	'ADD_MODULE'					=> 'Add module',
-	'ADD_MODULE_CONFIRM'			=> 'Are you sure you want to add the selected module with the selected mode?',
-	'ADD_MODULE_TITLE'				=> 'Add module',
-
-	'CANNOT_REMOVE_MODULE'	=> 'Unable to remove module, it has assigned children. Please remove or move all children before performing this action.',
-	'CATEGORY'				=> 'Category',
-	'CHOOSE_MODE'			=> 'Choose module mode',
-	'CHOOSE_MODE_EXPLAIN'	=> 'Choose the modules mode being used.',
-	'CHOOSE_MODULE'			=> 'Choose module',
-	'CHOOSE_MODULE_EXPLAIN'	=> 'Choose the file being called by this module.',
-	'CREATE_MODULE'			=> 'Create new module',
-
-	'DEACTIVATED_MODULE'	=> 'Deactivated module',
-	'DELETE_MODULE'			=> 'Delete module',
-	'DELETE_MODULE_CONFIRM'	=> 'Are you sure you want to remove this module?',
-
-	'EDIT_MODULE'			=> 'Edit module',
-	'EDIT_MODULE_EXPLAIN'	=> 'Here you are able to enter module specific settings.',
-
-	'HIDDEN_MODULE'			=> 'Hidden module',
-
-	'MODULE'					=> 'Module',
-	'MODULE_ADDED'				=> 'Module successfully added.',
-	'MODULE_DELETED'			=> 'Module successfully removed.',
-	'MODULE_DISPLAYED'			=> 'Module displayed',
-	'MODULE_DISPLAYED_EXPLAIN'	=> 'If you do not wish to display this module, but want to use it, set this to no.',
-	'MODULE_EDITED'				=> 'Module successfully edited.',
-	'MODULE_ENABLED'			=> 'Module enabled',
-	'MODULE_LANGNAME'			=> 'Module language name',
-	'MODULE_LANGNAME_EXPLAIN'	=> 'Enter the displayed module name. Use language constant if name is served from language file.',
-	'MODULE_TYPE'				=> 'Module type',
-
-	'NO_CATEGORY_TO_MODULE'	=> 'Unable to turn category into module. Please remove/move all children before performing this action.',
-	'NO_MODULE'				=> 'No module found.',
-	'NO_MODULE_ID'			=> 'No module id specified.',
-	'NO_MODULE_LANGNAME'	=> 'No module language name specified.',
-	'NO_PARENT'				=> 'No Parent',
-
-	'PARENT'				=> 'Parent',
-	'PARENT_NO_EXIST'		=> 'Parent does not exist.',
-
-	'SELECT_MODULE'			=> 'Select a module',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
deleted file mode 100644
index 920643d927..0000000000
--- a/phpBB/language/en/acp/permissions.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
-*
-* acp_permissions [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ACP_PERMISSIONS_EXPLAIN'	=> '
-		<p>Permissions are highly granular and grouped into four major sections, which are:</p>
-
-		<h2>Global Permissions</h2>
-		<p>These are used to control access on a global level and apply to the entire bulletin board. They are further divided into Users’ Permissions, Groups’ Permissions, Administrators and Global Moderators.</p>
-
-		<h2>Forum Based Permissions</h2>
-		<p>These are used to control access on a per forum basis. They are further divided into Forum Permissions, Forum Moderators, Users’ Forum Permissions and Groups’ Forum Permissions.</p>
-
-		<h2>Permission Roles</h2>
-		<p>These are used to create different sets of permissions for the different permission types later being able to be assigned on a role-based basis. The default roles should cover the administration of bulletin boards large and small, though within each of the four divisions, you can add/edit/delete roles as you see fit.</p>
-
-		<h2>Permission Masks</h2>
-		<p>These are used to view the effective permissions assigned to Users, Moderators (Local and Global), Administrators or Forums.</p>
-
-		<br />
-
-		<p>For further information on setting up and managing permissions on your phpBB3 board, please see <a href="http://www.phpbb.com/support/documentation/3.0/quickstart/quick_permissions.html">Chapter 1.5 of our Quick Start Guide</a>.</p>
-	',
-
-	'ACL_NEVER'				=> 'Never',
-	'ACL_SET'				=> 'Setting permissions',
-	'ACL_SET_EXPLAIN'		=> 'Permissions are based on a simple <samp>YES</samp>/<samp>NO</samp> system. Setting an option to <samp>NEVER</samp> for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select <samp>NO</samp>. If values are assigned for this option elsewhere they will be used in preference, else <samp>NEVER</samp> is assumed. All objects marked (with the checkbox in front of them) will copy the permission set you defined.',
-	'ACL_SETTING'			=> 'Setting',
-
-	'ACL_TYPE_A_'			=> 'Administrative permissions',
-	'ACL_TYPE_F_'			=> 'Forum permissions',
-	'ACL_TYPE_M_'			=> 'Moderative permissions',
-	'ACL_TYPE_U_'			=> 'User permissions',
-
-	'ACL_TYPE_GLOBAL_A_'	=> 'Administrative permissions',
-	'ACL_TYPE_GLOBAL_U_'	=> 'User permissions',
-	'ACL_TYPE_GLOBAL_M_'	=> 'Global Moderator permissions',
-	'ACL_TYPE_LOCAL_M_'		=> 'Forum Moderator permissions',
-	'ACL_TYPE_LOCAL_F_'		=> 'Forum permissions',
-
-	'ACL_NO'				=> 'No',
-	'ACL_VIEW'				=> 'Viewing permissions',
-	'ACL_VIEW_EXPLAIN'		=> 'Here you can see the effective permissions the user/group is having. A red square indicates that the user/group does not have the permission, a green square indicates that the user/group does have the permission.',
-	'ACL_YES'				=> 'Yes',
-
-	'ACP_ADMINISTRATORS_EXPLAIN'				=> 'Here you can assign administrator permissions to users or groups. All users with administrator permissions can view the administration control panel.',
-	'ACP_FORUM_MODERATORS_EXPLAIN'				=> 'Here you can assign users and groups as forum moderators. To assign users access to forums, to define global moderative permissions or administrators please use the appropriate page.',
-	'ACP_FORUM_PERMISSIONS_EXPLAIN'				=> 'Here you can alter which users and groups can access which forums. To assign moderators or define administrators please use the appropriate page.',
-	'ACP_GLOBAL_MODERATORS_EXPLAIN'				=> 'Here you can assign global moderator permissions to users or groups. These moderators are like ordinary moderators except they have access to every forum on your board.',
-	'ACP_GROUPS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to groups.',
-	'ACP_GROUPS_PERMISSIONS_EXPLAIN'			=> 'Here you can assign global permissions to groups - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. Individual users permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
-	'ACP_ADMIN_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
-	'ACP_FORUM_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
-	'ACP_MOD_ROLES_EXPLAIN'						=> 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
-	'ACP_USER_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
-	'ACP_USERS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to users.',
-	'ACP_USERS_PERMISSIONS_EXPLAIN'				=> 'Here you can assign global permissions to users - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. To alter these settings for large numbers of users the Group permissions system is the preferred method. User’s permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
-	'ACP_VIEW_ADMIN_PERMISSIONS_EXPLAIN'		=> 'Here you can view the effective administrative permissions assigned to the selected users/groups.',
-	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS_EXPLAIN'	=> 'Here you can view the global moderative permissions assigned to the selected users/groups.',
-	'ACP_VIEW_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can view the forum permissions assigned to the selected users/groups and forums.',
-	'ACP_VIEW_FORUM_MOD_PERMISSIONS_EXPLAIN'	=> 'Here you can view the forum moderator permissions assigned to the selected users/groups and forums.',
-	'ACP_VIEW_USER_PERMISSIONS_EXPLAIN'			=> 'Here you can view the effective user permissions assigned to the selected users/groups.',
-
-	'ADD_GROUPS'				=> 'Add groups',
-	'ADD_PERMISSIONS'			=> 'Add permissions',
-	'ADD_USERS'					=> 'Add users',
-	'ADVANCED_PERMISSIONS'		=> 'Advanced Permissions',
-	'ALL_GROUPS'				=> 'Select all groups',
-	'ALL_NEVER'					=> 'All <samp>NEVER</samp>',
-	'ALL_NO'					=> 'All <samp>NO</samp>',
-	'ALL_USERS'					=> 'Select all users',
-	'ALL_YES'					=> 'All <samp>YES</samp>',
-	'APPLY_ALL_PERMISSIONS'		=> 'Apply all permissions',
-	'APPLY_PERMISSIONS'			=> 'Apply permissions',
-	'APPLY_PERMISSIONS_EXPLAIN'	=> 'The permissions and role defined for this item will only be applied to this item and all checked items.',
-	'AUTH_UPDATED'				=> 'Permissions have been updated.',
-
-	'CREATE_ROLE'				=> 'Create role',
-	'CREATE_ROLE_FROM'			=> 'Use settings from…',
-	'CUSTOM'					=> 'Custom…',
-
-	'DEFAULT'					=> 'Default',
-	'DELETE_ROLE'				=> 'Delete role',
-	'DELETE_ROLE_CONFIRM'		=> 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> lose their permission settings.',
-	'DISPLAY_ROLE_ITEMS'		=> 'View items using this role',
-
-	'EDIT_PERMISSIONS'			=> 'Edit permissions',
-	'EDIT_ROLE'					=> 'Edit role',
-
-	'GROUPS_NOT_ASSIGNED'		=> 'No group assigned to this role',
-
-	'LOOK_UP_GROUP'				=> 'Look up usergroup',
-	'LOOK_UP_USER'				=> 'Look up user',
-
-	'MANAGE_GROUPS'		=> 'Manage groups',
-	'MANAGE_USERS'		=> 'Manage users',
-
-	'NO_AUTH_SETTING_FOUND'		=> 'Permission settings not defined.',
-	'NO_ROLE_ASSIGNED'			=> 'No role assigned…',
-	'NO_ROLE_ASSIGNED_EXPLAIN'	=> 'Setting to this role does not change permissions on the right. If you want to unset/remove all permissions you should use the “All <samp>NO</samp>” link.',
-	'NO_ROLE_AVAILABLE'			=> 'No role available',
-	'NO_ROLE_NAME_SPECIFIED'	=> 'Please give the role a name.',
-	'NO_ROLE_SELECTED'			=> 'Role could not be found.',
-	'NO_USER_GROUP_SELECTED'	=> 'You haven’t selected any user or group.',
-
-	'ONLY_FORUM_DEFINED'	=> 'You only defined forums in your selection. Please also select at least one user or one group.',
-
-	'PERMISSION_APPLIED_TO_ALL'		=> 'Permissions and role will also be applied to all checked objects',
-	'PLUS_SUBFORUMS'				=> '+Subforums',
-
-	'REMOVE_PERMISSIONS'			=> 'Remove permissions',
-	'REMOVE_ROLE'					=> 'Remove role',
-	'RESULTING_PERMISSION'			=> 'Resulting permission',
-	'ROLE'							=> 'Role',
-	'ROLE_ADD_SUCCESS'				=> 'Role successfully added.',
-	'ROLE_ASSIGNED_TO'				=> 'Users/Groups assigned to %s',
-	'ROLE_DELETED'					=> 'Role successfully removed.',
-	'ROLE_DESCRIPTION'				=> 'Role description',
-
-	'ROLE_ADMIN_FORUM'			=> 'Forum Admin',
-	'ROLE_ADMIN_FULL'			=> 'Full Admin',
-	'ROLE_ADMIN_STANDARD'		=> 'Standard Admin',
-	'ROLE_ADMIN_USERGROUP'		=> 'User and Groups Admin',
-	'ROLE_FORUM_BOT'			=> 'Bot Access',
-	'ROLE_FORUM_FULL'			=> 'Full Access',
-	'ROLE_FORUM_LIMITED'		=> 'Limited Access',
-	'ROLE_FORUM_LIMITED_POLLS'	=> 'Limited Access + Polls',
-	'ROLE_FORUM_NOACCESS'		=> 'No Access',
-	'ROLE_FORUM_ONQUEUE'		=> 'On Moderation Queue',
-	'ROLE_FORUM_POLLS'			=> 'Standard Access + Polls',
-	'ROLE_FORUM_READONLY'		=> 'Read Only Access',
-	'ROLE_FORUM_STANDARD'		=> 'Standard Access',
-	'ROLE_MOD_FULL'				=> 'Full Moderator',
-	'ROLE_MOD_QUEUE'			=> 'Queue Moderator',
-	'ROLE_MOD_SIMPLE'			=> 'Simple Moderator',
-	'ROLE_MOD_STANDARD'			=> 'Standard Moderator',
-	'ROLE_USER_FULL'			=> 'All Features',
-	'ROLE_USER_LIMITED'			=> 'Limited Features',
-	'ROLE_USER_NOAVATAR'		=> 'No Avatar',
-	'ROLE_USER_NOPM'			=> 'No Private Messages',
-	'ROLE_USER_STANDARD'		=> 'Standard Features',
-
-	'ROLE_DESCRIPTION_ADMIN_FORUM'			=> 'Can access the forum management and forum permission settings.',
-	'ROLE_DESCRIPTION_ADMIN_FULL'			=> 'Has access to all administrative functions of this board.<br />Not recommended.',
-	'ROLE_DESCRIPTION_ADMIN_STANDARD'		=> 'Has access to most administrative features but is not allowed to use server or system related tools.',
-	'ROLE_DESCRIPTION_ADMIN_USERGROUP'		=> 'Can manage groups and users: Able to change permissions, settings, manage bans, and manage ranks.',
-	'ROLE_DESCRIPTION_FORUM_BOT'			=> 'This role is recommended for bots and search spiders.',
-	'ROLE_DESCRIPTION_FORUM_FULL'			=> 'Can use all forum features, including posting of announcements and stickies. Can also ignore the flood limit.<br />Not recommended for normal users.',
-	'ROLE_DESCRIPTION_FORUM_LIMITED'		=> 'Can use some forum features, but cannot attach files or use post icons.',
-	'ROLE_DESCRIPTION_FORUM_LIMITED_POLLS'	=> 'As per Limited Access but can also create polls.',
-	'ROLE_DESCRIPTION_FORUM_NOACCESS'		=> 'Can neither see nor access the forum.',
-	'ROLE_DESCRIPTION_FORUM_ONQUEUE'		=> 'Can use most forum features including attachments, but posts and topics need to be approved by a moderator.',
-	'ROLE_DESCRIPTION_FORUM_POLLS'			=> 'Like Standard Access but can also create polls.',
-	'ROLE_DESCRIPTION_FORUM_READONLY'		=> 'Can read the forum, but cannot create new topics or reply to posts.',
-	'ROLE_DESCRIPTION_FORUM_STANDARD'		=> 'Can use most forum features including attachments and deleting own topics, but cannot lock own topics, and cannot create polls.',
-	'ROLE_DESCRIPTION_MOD_FULL'				=> 'Can use all moderating features, including banning.',
-	'ROLE_DESCRIPTION_MOD_QUEUE'			=> 'Can use the Moderation Queue to validate and edit posts, but nothing else.',
-	'ROLE_DESCRIPTION_MOD_SIMPLE'			=> 'Can only use basic topic actions. Cannot send warnings or use moderation queue.',
-	'ROLE_DESCRIPTION_MOD_STANDARD'			=> 'Can use most moderating tools, but cannot ban users or change the post author.',
-	'ROLE_DESCRIPTION_USER_FULL'			=> 'Can use all available forum features for users, including changing the user name or ignoring the flood limit.<br />Not recommended.',
-	'ROLE_DESCRIPTION_USER_LIMITED'			=> 'Can access some of the user features. Attachments, e-mails, or instant messages are not allowed.',
-	'ROLE_DESCRIPTION_USER_NOAVATAR'		=> 'Has a limited feature set and is not allowed to use the Avatar feature.',
-	'ROLE_DESCRIPTION_USER_NOPM'			=> 'Has a limited feature set, and is not allowed to use Private Messages.',
-	'ROLE_DESCRIPTION_USER_STANDARD'		=> 'Can access most but not all user features. Cannot change user name or ignore the flood limit, for instance.',
-
-	'ROLE_DESCRIPTION_EXPLAIN'		=> 'You are able to enter a short explanation of what the role is doing or for what it is meant for. The text you enter here will be displayed within the permissions screens too.',
-	'ROLE_DESCRIPTION_LONG'			=> 'The role description is too long, please limit it to 4000 characters.',
-	'ROLE_DETAILS'					=> 'Role details',
-	'ROLE_EDIT_SUCCESS'				=> 'Role successfully edited.',
-	'ROLE_NAME'						=> 'Role name',
-	'ROLE_NAME_ALREADY_EXIST'		=> 'A role named <strong>%s</strong> already exist for the specified permission type.',
-	'ROLE_NOT_ASSIGNED'				=> 'Role has not been assigned yet.',
-
-	'SELECTED_FORUM_NOT_EXIST'		=> 'The selected forum(s) do not exist.',
-	'SELECTED_GROUP_NOT_EXIST'		=> 'The selected group(s) do not exist.',
-	'SELECTED_USER_NOT_EXIST'		=> 'The selected user(s) do not exist.',
-	'SELECT_FORUM_SUBFORUM_EXPLAIN'	=> 'The forum you select here will include all subforums into the selection.',
-	'SELECT_ROLE'					=> 'Select role…',
-	'SELECT_TYPE'					=> 'Select type',
-	'SET_PERMISSIONS'				=> 'Set permissions',
-	'SET_ROLE_PERMISSIONS'			=> 'Set role permissions',
-	'SET_USERS_PERMISSIONS'			=> 'Set users permissions',
-	'SET_USERS_FORUM_PERMISSIONS'	=> 'Set users forum permissions',
-
-	'TRACE_DEFAULT'					=> 'By default every permission is <samp>NO</samp> (unset). So the permission can be overwritten by other settings.',
-	'TRACE_FOR'						=> 'Trace for',
-	'TRACE_GLOBAL_SETTING'			=> '%s (global)',
-	'TRACE_GROUP_NEVER_TOTAL_NEVER'	=> 'This group’s permission is set to <samp>NEVER</samp> like the total result so the old result is kept.',
-	'TRACE_GROUP_NEVER_TOTAL_NEVER_LOCAL'	=> 'This group’s permission for this forum is set to <samp>NEVER</samp> like the total result so the old result is kept.',
-	'TRACE_GROUP_NEVER_TOTAL_NO'	=> 'This group’s permission is set to <samp>NEVER</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
-	'TRACE_GROUP_NEVER_TOTAL_NO_LOCAL'	=> 'This group’s permission for this forum is set to <samp>NEVER</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
-	'TRACE_GROUP_NEVER_TOTAL_YES'	=> 'This group’s permission is set to <samp>NEVER</samp> which overwrites the total <samp>YES</samp> to a <samp>NEVER</samp> for this user.',
-	'TRACE_GROUP_NEVER_TOTAL_YES_LOCAL'	=> 'This group’s permission for this forum is set to <samp>NEVER</samp> which overwrites the total <samp>YES</samp> to a <samp>NEVER</samp> for this user.',
-	'TRACE_GROUP_NO'				=> 'The permission is <samp>NO</samp> for this group so the old total value is kept.',
-	'TRACE_GROUP_NO_LOCAL'			=> 'The permission is <samp>NO</samp> for this group within this forum so the old total value is kept.',
-	'TRACE_GROUP_YES_TOTAL_NEVER'	=> 'This group’s permission is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
-	'TRACE_GROUP_YES_TOTAL_NEVER_LOCAL'	=> 'This group’s permission for this forum is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
-	'TRACE_GROUP_YES_TOTAL_NO'		=> 'This group’s permission is set to <samp>YES</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
-	'TRACE_GROUP_YES_TOTAL_NO_LOCAL'	=> 'This group’s permission for this forum is set to <samp>YES</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
-	'TRACE_GROUP_YES_TOTAL_YES'		=> 'This group’s permission is set to <samp>YES</samp> and the total permission is already set to <samp>YES</samp>, so the total result is kept.',
-	'TRACE_GROUP_YES_TOTAL_YES_LOCAL'	=> 'This group’s permission for this forum is set to <samp>YES</samp> and the total permission is already set to <samp>YES</samp>, so the total result is kept.',
-	'TRACE_PERMISSION'				=> 'Trace permission - %s',
-	'TRACE_RESULT'					=> 'Trace result',
-	'TRACE_SETTING'					=> 'Trace setting',
-
-	'TRACE_USER_GLOBAL_YES_TOTAL_YES'		=> 'The forum independent user permission evaluates to <samp>YES</samp> but the total permission is already set to <samp>YES</samp>, so the total result is kept. %sTrace global permission%s',
-	'TRACE_USER_GLOBAL_YES_TOTAL_NEVER'		=> 'The forum independent user permission evaluates to <samp>YES</samp> which overwrites the current local result <samp>NEVER</samp>. %sTrace global permission%s',
-	'TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT'	=> 'The forum independent user permission evaluates to <samp>NEVER</samp> which doesn’t influence the local permission. %sTrace global permission%s',
-
-	'TRACE_USER_FOUNDER'					=> 'The user has the founder type set, therefore admin permissions are set to <samp>YES</samp> by default.',
-	'TRACE_USER_KEPT'						=> 'The user’s permission is <samp>NO</samp> so the old total value is kept.',
-	'TRACE_USER_KEPT_LOCAL'					=> 'The user’s permission for this forum is <samp>NO</samp> so the old total value is kept.',
-	'TRACE_USER_NEVER_TOTAL_NEVER'			=> 'The user’s permission is set to <samp>NEVER</samp> and the total value is set to <samp>NEVER</samp>, so nothing is changed.',
-	'TRACE_USER_NEVER_TOTAL_NEVER_LOCAL'	=> 'The user’s permission for this forum is set to <samp>NEVER</samp> and the total value is set to <samp>NEVER</samp>, so nothing is changed.',
-	'TRACE_USER_NEVER_TOTAL_NO'				=> 'The user’s permission is set to <samp>NEVER</samp> which becomes the total value because it was set to NO.',
-	'TRACE_USER_NEVER_TOTAL_NO_LOCAL'		=> 'The user’s permission for this forum is set to <samp>NEVER</samp> which becomes the total value because it was set to NO.',
-	'TRACE_USER_NEVER_TOTAL_YES'			=> 'The user’s permission is set to <samp>NEVER</samp> and overwrites the previous <samp>YES</samp>.',
-	'TRACE_USER_NEVER_TOTAL_YES_LOCAL'		=> 'The user’s permission for this forum is set to <samp>NEVER</samp> and overwrites the previous <samp>YES</samp>.',
-	'TRACE_USER_NO_TOTAL_NO'				=> 'The user’s permission is <samp>NO</samp> and the total value was set to NO so it defaults to <samp>NEVER</samp>.',
-	'TRACE_USER_NO_TOTAL_NO_LOCAL'			=> 'The user’s permission for this forum is <samp>NO</samp> and the total value was set to NO so it defaults to <samp>NEVER</samp>.',
-	'TRACE_USER_YES_TOTAL_NEVER'			=> 'The user’s permission is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
-	'TRACE_USER_YES_TOTAL_NEVER_LOCAL'		=> 'The user’s permission for this forum is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
-	'TRACE_USER_YES_TOTAL_NO'				=> 'The user’s permission is set to <samp>YES</samp> which becomes the total value because it was set to <samp>NO</samp>.',
-	'TRACE_USER_YES_TOTAL_NO_LOCAL'			=> 'The user’s permission for this forum is set to <samp>YES</samp> which becomes the total value because it was set to <samp>NO</samp>.',
-	'TRACE_USER_YES_TOTAL_YES'				=> 'The user’s permission is set to <samp>YES</samp> and the total value is set to <samp>YES</samp>, so nothing is changed.',
-	'TRACE_USER_YES_TOTAL_YES_LOCAL'		=> 'The user’s permission for this forum is set to <samp>YES</samp> and the total value is set to <samp>YES</samp>, so nothing is changed.',
-	'TRACE_WHO'								=> 'Who',
-	'TRACE_TOTAL'							=> 'Total',
-
-	'USERS_NOT_ASSIGNED'			=> 'No user assigned to this role',
-	'USER_IS_MEMBER_OF_DEFAULT'		=> 'is a member of the following pre-defined groups',
-	'USER_IS_MEMBER_OF_CUSTOM'		=> 'is a member of the following user defined groups',
-
-	'VIEW_ASSIGNED_ITEMS'	=> 'View assigned items',
-	'VIEW_LOCAL_PERMS'		=> 'Local permissions',
-	'VIEW_GLOBAL_PERMS'		=> 'Global permissions',
-	'VIEW_PERMISSIONS'		=> 'View permissions',
-
-	'WRONG_PERMISSION_TYPE'				=> 'Wrong permission type selected.',
-	'WRONG_PERMISSION_SETTING_FORMAT'	=> 'The permission settings are in a wrong format, phpBB is not able to process them correctly.',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
deleted file mode 100644
index c8ccc0e56a..0000000000
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-/**
-* acp_permissions_phpbb (phpBB Permission Set) [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-/**
-*	MODDERS PLEASE NOTE
-*
-*	You are able to put your permission sets into a separate file too by
-*	prefixing the new file with permissions_ and putting it into the acp
-*	language folder.
-*
-*	An example of how the file could look like:
-*
-*	<code>
-*
-*	if (empty($lang) || !is_array($lang))
-*	{
-*		$lang = array();
-*	}
-*
-*	// Adding new category
-*	$lang['permission_cat']['bugs'] = 'Bugs';
-*
-*	// Adding new permission set
-*	$lang['permission_type']['bug_'] = 'Bug Permissions';
-*
-*	// Adding the permissions
-*	$lang = array_merge($lang, array(
-*		'acl_bug_view'		=> array('lang' => 'Can view bug reports', 'cat' => 'bugs'),
-*		'acl_bug_post'		=> array('lang' => 'Can post bugs', 'cat' => 'post'), // Using a phpBB category here
-*	));
-*
-*	</code>
-*/
-
-// Define categories and permission types
-$lang = array_merge($lang, array(
-	'permission_cat'	=> array(
-		'actions'		=> 'Actions',
-		'content'		=> 'Content',
-		'forums'		=> 'Forums',
-		'misc'			=> 'Misc',
-		'permissions'	=> 'Permissions',
-		'pm'			=> 'Private messages',
-		'polls'			=> 'Polls',
-		'post'			=> 'Post',
-		'post_actions'	=> 'Post actions',
-		'posting'		=> 'Posting',
-		'profile'		=> 'Profile',
-		'settings'		=> 'Settings',
-		'topic_actions'	=> 'Topic actions',
-		'user_group'	=> 'Users &amp; Groups',
-	),
-
-	// With defining 'global' here we are able to specify what is printed out if the permission is within the global scope.
-	'permission_type'	=> array(
-		'u_'			=> 'User permissions',
-		'a_'			=> 'Admin permissions',
-		'm_'			=> 'Moderator permissions',
-		'f_'			=> 'Forum permissions',
-		'global'		=> array(
-			'm_'			=> 'Global moderator permissions',
-		),
-	),
-));
-
-// User Permissions
-$lang = array_merge($lang, array(
-	'acl_u_viewprofile'	=> array('lang' => 'Can view profiles, memberlist and online list', 'cat' => 'profile'),
-	'acl_u_chgname'		=> array('lang' => 'Can change username', 'cat' => 'profile'),
-	'acl_u_chgpasswd'	=> array('lang' => 'Can change password', 'cat' => 'profile'),
-	'acl_u_chgemail'	=> array('lang' => 'Can change e-mail address', 'cat' => 'profile'),
-	'acl_u_chgavatar'	=> array('lang' => 'Can change avatar', 'cat' => 'profile'),
-	'acl_u_chggrp'		=> array('lang' => 'Can change default usergroup', 'cat' => 'profile'),
-
-	'acl_u_attach'		=> array('lang' => 'Can attach files', 'cat' => 'post'),
-	'acl_u_download'	=> array('lang' => 'Can download files', 'cat' => 'post'),
-	'acl_u_savedrafts'	=> array('lang' => 'Can save drafts', 'cat' => 'post'),
-	'acl_u_chgcensors'	=> array('lang' => 'Can disable word censors', 'cat' => 'post'),
-	'acl_u_sig'			=> array('lang' => 'Can use signature', 'cat' => 'post'),
-
-	'acl_u_sendpm'		=> array('lang' => 'Can send private messages', 'cat' => 'pm'),
-	'acl_u_masspm'		=> array('lang' => 'Can send messages to multiple users', 'cat' => 'pm'),
-	'acl_u_masspm_group'=> array('lang' => 'Can send messages to groups', 'cat' => 'pm'),
-	'acl_u_readpm'		=> array('lang' => 'Can read private messages', 'cat' => 'pm'),
-	'acl_u_pm_edit'		=> array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
-	'acl_u_pm_delete'	=> array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),
-	'acl_u_pm_forward'	=> array('lang' => 'Can forward private messages', 'cat' => 'pm'),
-	'acl_u_pm_emailpm'	=> array('lang' => 'Can e-mail private messages', 'cat' => 'pm'),
-	'acl_u_pm_printpm'	=> array('lang' => 'Can print private messages', 'cat' => 'pm'),
-	'acl_u_pm_attach'	=> array('lang' => 'Can attach files in private messages', 'cat' => 'pm'),
-	'acl_u_pm_download'	=> array('lang' => 'Can download files in private messages', 'cat' => 'pm'),
-	'acl_u_pm_bbcode'	=> array('lang' => 'Can post BBCode in private messages', 'cat' => 'pm'),
-	'acl_u_pm_smilies'	=> array('lang' => 'Can post smilies in private messages', 'cat' => 'pm'),
-	'acl_u_pm_img'		=> array('lang' => 'Can post images in private messages', 'cat' => 'pm'),
-	'acl_u_pm_flash'	=> array('lang' => 'Can post Flash in private messages', 'cat' => 'pm'),
-
-	'acl_u_sendemail'	=> array('lang' => 'Can send e-mails', 'cat' => 'misc'),
-	'acl_u_sendim'		=> array('lang' => 'Can send instant messages', 'cat' => 'misc'),
-	'acl_u_ignoreflood'	=> array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
-	'acl_u_hideonline'	=> array('lang' => 'Can hide online status', 'cat' => 'misc'),
-	'acl_u_viewonline'	=> array('lang' => 'Can view hidden online users', 'cat' => 'misc'),
-	'acl_u_search'		=> array('lang' => 'Can search board', 'cat' => 'misc'),
-));
-
-// Forum Permissions
-$lang = array_merge($lang, array(
-	'acl_f_list'		=> array('lang' => 'Can see forum', 'cat' => 'post'),
-	'acl_f_read'		=> array('lang' => 'Can read forum', 'cat' => 'post'),
-	'acl_f_post'		=> array('lang' => 'Can start new topics', 'cat' => 'post'),
-	'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
-	'acl_f_icons'		=> array('lang' => 'Can use topic/post icons', 'cat' => 'post'),
-	'acl_f_announce'	=> array('lang' => 'Can post announcements', 'cat' => 'post'),
-	'acl_f_sticky'		=> array('lang' => 'Can post stickies', 'cat' => 'post'),
-
-	'acl_f_poll'		=> array('lang' => 'Can create polls', 'cat' => 'polls'),
-	'acl_f_vote'		=> array('lang' => 'Can vote in polls', 'cat' => 'polls'),
-	'acl_f_votechg'		=> array('lang' => 'Can change existing vote', 'cat' => 'polls'),
-
-	'acl_f_attach'		=> array('lang' => 'Can attach files', 'cat' => 'content'),
-	'acl_f_download'	=> array('lang' => 'Can download files', 'cat' => 'content'),
-	'acl_f_sigs'		=> array('lang' => 'Can use signatures', 'cat' => 'content'),
-	'acl_f_bbcode'		=> array('lang' => 'Can post BBCode', 'cat' => 'content'),
-	'acl_f_smilies'		=> array('lang' => 'Can post smilies', 'cat' => 'content'),
-	'acl_f_img'			=> array('lang' => 'Can post images', 'cat' => 'content'),
-	'acl_f_flash'		=> array('lang' => 'Can post Flash', 'cat' => 'content'),
-
-	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'actions'),
-	'acl_f_delete'		=> array('lang' => 'Can delete own posts', 'cat' => 'actions'),
-	'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
-	'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
-	'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
-	'acl_f_subscribe'	=> array('lang' => 'Can subscribe forum', 'cat' => 'actions'),
-	'acl_f_print'		=> array('lang' => 'Can print topics', 'cat' => 'actions'),
-	'acl_f_email'		=> array('lang' => 'Can e-mail topics', 'cat' => 'actions'),
-
-	'acl_f_search'		=> array('lang' => 'Can search the forum', 'cat' => 'misc'),
-	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
-	'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'misc'),
-	'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'misc'),
-));
-
-// Moderator Permissions
-$lang = array_merge($lang, array(
-	'acl_m_edit'		=> array('lang' => 'Can edit posts', 'cat' => 'post_actions'),
-	'acl_m_delete'		=> array('lang' => 'Can delete posts', 'cat' => 'post_actions'),
-	'acl_m_approve'		=> array('lang' => 'Can approve posts', 'cat' => 'post_actions'),
-	'acl_m_report'		=> array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
-	'acl_m_chgposter'	=> array('lang' => 'Can change post author', 'cat' => 'post_actions'),
-
-	'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
-	'acl_m_lock'	=> array('lang' => 'Can lock topics', 'cat' => 'topic_actions'),
-	'acl_m_split'	=> array('lang' => 'Can split topics', 'cat' => 'topic_actions'),
-	'acl_m_merge'	=> array('lang' => 'Can merge topics', 'cat' => 'topic_actions'),
-
-	'acl_m_info'	=> array('lang' => 'Can view post details', 'cat' => 'misc'),
-	'acl_m_warn'	=> array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
-	'acl_m_ban'		=> array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
-));
-
-// Admin Permissions
-$lang = array_merge($lang, array(
-	'acl_a_board'		=> array('lang' => 'Can alter board settings/check for updates', 'cat' => 'settings'),
-	'acl_a_server'		=> array('lang' => 'Can alter server/communication settings', 'cat' => 'settings'),
-	'acl_a_jabber'		=> array('lang' => 'Can alter Jabber settings', 'cat' => 'settings'),
-	'acl_a_phpinfo'		=> array('lang' => 'Can view php settings', 'cat' => 'settings'),
-
-	'acl_a_forum'		=> array('lang' => 'Can manage forums', 'cat' => 'forums'),
-	'acl_a_forumadd'	=> array('lang' => 'Can add new forums', 'cat' => 'forums'),
-	'acl_a_forumdel'	=> array('lang' => 'Can delete forums', 'cat' => 'forums'),
-	'acl_a_prune'		=> array('lang' => 'Can prune forums', 'cat' => 'forums'),
-
-	'acl_a_icons'		=> array('lang' => 'Can alter topic/post icons and smilies', 'cat' => 'posting'),
-	'acl_a_words'		=> array('lang' => 'Can alter word censors', 'cat' => 'posting'),
-	'acl_a_bbcode'		=> array('lang' => 'Can define BBCode tags', 'cat' => 'posting'),
-	'acl_a_attach'		=> array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'),
-
-	'acl_a_user'		=> array('lang' => 'Can manage users<br /><em>This also includes seeing the users browser agent within the viewonline list.</em>', 'cat' => 'user_group'),
-	'acl_a_userdel'		=> array('lang' => 'Can delete/prune users', 'cat' => 'user_group'),
-	'acl_a_group'		=> array('lang' => 'Can manage groups', 'cat' => 'user_group'),
-	'acl_a_groupadd'	=> array('lang' => 'Can add new groups', 'cat' => 'user_group'),
-	'acl_a_groupdel'	=> array('lang' => 'Can delete groups', 'cat' => 'user_group'),
-	'acl_a_ranks'		=> array('lang' => 'Can manage ranks', 'cat' => 'user_group'),
-	'acl_a_profile'		=> array('lang' => 'Can manage custom profile fields', 'cat' => 'user_group'),
-	'acl_a_names'		=> array('lang' => 'Can manage disallowed names', 'cat' => 'user_group'),
-	'acl_a_ban'			=> array('lang' => 'Can manage bans', 'cat' => 'user_group'),
-
-	'acl_a_viewauth'	=> array('lang' => 'Can view permission masks', 'cat' => 'permissions'),
-	'acl_a_authgroups'	=> array('lang' => 'Can alter permissions for individual groups', 'cat' => 'permissions'),
-	'acl_a_authusers'	=> array('lang' => 'Can alter permissions for individual users', 'cat' => 'permissions'),
-	'acl_a_fauth'		=> array('lang' => 'Can alter forum permission class', 'cat' => 'permissions'),
-	'acl_a_mauth'		=> array('lang' => 'Can alter moderator permission class', 'cat' => 'permissions'),
-	'acl_a_aauth'		=> array('lang' => 'Can alter admin permission class', 'cat' => 'permissions'),
-	'acl_a_uauth'		=> array('lang' => 'Can alter user permission class', 'cat' => 'permissions'),
-	'acl_a_roles'		=> array('lang' => 'Can manage roles', 'cat' => 'permissions'),
-	'acl_a_switchperm'	=> array('lang' => 'Can use others permissions', 'cat' => 'permissions'),
-
-	'acl_a_styles'		=> array('lang' => 'Can manage styles', 'cat' => 'misc'),
-	'acl_a_viewlogs'	=> array('lang' => 'Can view logs', 'cat' => 'misc'),
-	'acl_a_clearlogs'	=> array('lang' => 'Can clear logs', 'cat' => 'misc'),
-	'acl_a_modules'		=> array('lang' => 'Can manage modules', 'cat' => 'misc'),
-	'acl_a_language'	=> array('lang' => 'Can manage language packs', 'cat' => 'misc'),
-	'acl_a_email'		=> array('lang' => 'Can send mass e-mail', 'cat' => 'misc'),
-	'acl_a_bots'		=> array('lang' => 'Can manage bots', 'cat' => 'misc'),
-	'acl_a_reasons'		=> array('lang' => 'Can manage report/denial reasons', 'cat' => 'misc'),
-	'acl_a_backup'		=> array('lang' => 'Can backup/restore database', 'cat' => 'misc'),
-	'acl_a_search'		=> array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'),
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
deleted file mode 100644
index 01453b85ef..0000000000
--- a/phpBB/language/en/acp/posting.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?php
-/**
-*
-* acp_posting [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-// BBCodes
-// Note to translators: you can translate everything but what's between { and }
-$lang = array_merge($lang, array(
-	'ACP_BBCODES_EXPLAIN'		=> 'BBCode is a special implementation of HTML offering greater control over what and how something is displayed. From this page you can add, remove and edit custom BBCodes.',
-	'ADD_BBCODE'				=> 'Add a new BBCode',
-
-	'BBCODE_ADDED'				=> 'BBCode added successfully.',
-	'BBCODE_EDITED'				=> 'BBCode edited successfully.',
-	'BBCODE_NOT_EXIST'			=> 'The BBCode you selected does not exist.',
-	'BBCODE_HELPLINE'			=> 'Help line',
-	'BBCODE_HELPLINE_EXPLAIN'	=> 'This field contains the mouse over text of the BBCode.',
-	'BBCODE_HELPLINE_TEXT'		=> 'Help line text',
-	'BBCODE_HELPLINE_TOO_LONG'	=> 'The help line you entered is too long.',
-
-	'BBCODE_INVALID_TAG_NAME'	=> 'The BBCode tag name that you selected already exists.',
-	'BBCODE_INVALID'			=> 'Your BBCode is constructed in an invalid form.',
-	'BBCODE_OPEN_ENDED_TAG'		=> 'Your custom BBCode must contain both an opening and a closing tag.',
-	'BBCODE_TAG'				=> 'Tag',
-	'BBCODE_TAG_TOO_LONG'		=> 'The tag name you selected is too long.',
-	'BBCODE_TAG_DEF_TOO_LONG'	=> 'The tag definition that you have entered is too long, please shorten your tag definition.',
-	'BBCODE_USAGE'				=> 'BBCode usage',
-	'BBCODE_USAGE_EXAMPLE'		=> '[highlight={COLOR}]{TEXT}[/highlight]<br /><br />[font={SIMPLETEXT1}]{SIMPLETEXT2}[/font]',
-	'BBCODE_USAGE_EXPLAIN'		=> 'Here you define how to use the BBCode. Replace any variable input by the corresponding token (%ssee below%s).',
-
-	'EXAMPLE'						=> 'Example:',
-	'EXAMPLES'						=> 'Examples:',
-
-	'HTML_REPLACEMENT'				=> 'HTML replacement',
-	'HTML_REPLACEMENT_EXAMPLE'		=> '&lt;span style="background-color: {COLOR};"&gt;{TEXT}&lt;/span&gt;<br /><br />&lt;span style="font-family: {SIMPLETEXT1};"&gt;{SIMPLETEXT2}&lt;/span&gt;',
-	'HTML_REPLACEMENT_EXPLAIN'		=> 'Here you define the default HTML replacement. Do not forget to put back tokens you used above!',
-
-	'TOKEN'					=> 'Token',
-	'TOKENS'				=> 'Tokens',
-	'TOKENS_EXPLAIN'		=> 'Tokens are placeholders for user input. The input will be validated only if it matches the corresponding definition. If needed, you can number them by adding a number as the last character between the braces, e.g. {TEXT1}, {TEXT2}.<br /><br />Within the HTML replacement you can also use any language string present in your language/ directory like this: {L_<em>&lt;STRINGNAME&gt;</em>} where <em>&lt;STRINGNAME&gt;</em> is the name of the translated string you want to add. For example, {L_WROTE} will be displayed as &quot;wrote&quot; or its translation according to user’s locale.<br /><br /><strong>Please note that only tokens listed below are able to be used within custom BBCodes.</strong>',
-	'TOKEN_DEFINITION'		=> 'What can it be?',
-	'TOO_MANY_BBCODES'		=> 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.',
-
-	'tokens'	=>	array(
-		'TEXT'			=> 'Any text, including foreign characters, numbers, etc… You should not use this token in HTML tags. Instead try to use IDENTIFIER or SIMPLETEXT.',
-		'SIMPLETEXT'	=> 'Characters from the latin alphabet (A-Z), numbers, spaces, commas, dots, minus, plus, hyphen and underscore',
-		'IDENTIFIER'	=> 'Characters from the latin alphabet (A-Z), numbers, hyphen and underscore',
-		'NUMBER'		=> 'Any series of digits',
-		'EMAIL'			=> 'A valid e-mail address',
-		'URL'			=> 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, &quot;http://&quot; is prefixed to the string.',
-		'LOCAL_URL'		=> 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol.',
-		'COLOR'			=> 'A HTML colour, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>'
-	)
-));
-
-// Smilies and topic icons
-$lang = array_merge($lang, array(
-	'ACP_ICONS_EXPLAIN'		=> 'From this page you can add, remove and edit the icons users may add to their topics or posts. These icons are generally displayed next to topic titles on the forum listing, or the post subjects in topic listings. You can also install and create new packages of icons.',
-	'ACP_SMILIES_EXPLAIN'	=> 'Smilies or emoticons are typically small, sometimes animated images used to convey an emotion or feeling. From this page you can add, remove and edit the emoticons users can use in their posts and private messages. You can also install and create new packages of smilies.',
-	'ADD_SMILIES'			=> 'Add multiple smilies',
-	'ADD_SMILEY_CODE'		=> 'Add additional smiley code',
-	'ADD_ICONS'				=> 'Add multiple icons',
-	'AFTER_ICONS'			=> 'After %s',
-	'AFTER_SMILIES'			=> 'After %s',
-
-	'CODE'						=> 'Code',
-	'CURRENT_ICONS'				=> 'Current icons',
-	'CURRENT_ICONS_EXPLAIN'		=> 'Choose what to do with the currently installed icons.',
-	'CURRENT_SMILIES'			=> 'Current smilies',
-	'CURRENT_SMILIES_EXPLAIN'	=> 'Choose what to do with the currently installed smilies.',
-
-	'DISPLAY_ON_POSTING'		=> 'Display on posting page',
-	'DISPLAY_POSTING'			=> 'On posting page',
-	'DISPLAY_POSTING_NO'		=> 'Not on posting page',
-
-
-
-	'EDIT_ICONS'				=> 'Edit icons',
-	'EDIT_SMILIES'				=> 'Edit smilies',
-	'EMOTION'					=> 'Emotion',
-	'EXPORT_ICONS'				=> 'Export and download icons.pak',
-	'EXPORT_ICONS_EXPLAIN'		=> '%sOn clicking this link, the configuration for your installed icons will be packaged into <samp>icons.pak</samp> which once downloaded can be used to create a <samp>.zip</samp> or <samp>.tgz</samp> file containing all of your icons plus this <samp>icons.pak</samp> configuration file%s.',
-	'EXPORT_SMILIES'			=> 'Export and download smilies.pak',
-	'EXPORT_SMILIES_EXPLAIN'	=> '%sOn clicking this link, the configuration for your installed smilies will be packaged into <samp>smilies.pak</samp> which once downloaded can be used to create a <samp>.zip</samp> or <samp>.tgz</samp> file containing all of your smilies plus this <samp>smilies.pak</samp> configuration file%s.',
-
-	'FIRST'			=> 'First',
-
-	'ICONS_ADD'				=> 'Add a new icon',
-	'ICONS_NONE_ADDED'		=> 'No icons were added.',
-	'ICONS_ONE_ADDED'		=> 'The icon has been added successfully.',
-	'ICONS_ADDED'			=> 'The icons have been added successfully.',
-	'ICONS_CONFIG'			=> 'Icon configuration',
-	'ICONS_DELETED'			=> 'The icon has been removed successfully.',
-	'ICONS_EDIT'			=> 'Edit icon',
-	'ICONS_ONE_EDITED'		=> 'The icon has been updated successfully.',
-	'ICONS_NONE_EDITED'		=> 'No icons were updated.',
-	'ICONS_EDITED'			=> 'The icons have been updated successfully.',
-	'ICONS_HEIGHT'			=> 'Icon height',
-	'ICONS_IMAGE'			=> 'Icon image',
-	'ICONS_IMPORTED'		=> 'The icons pack has been installed successfully.',
-	'ICONS_IMPORT_SUCCESS'	=> 'The icons pack was imported successfully.',
-	'ICONS_LOCATION'		=> 'Icon location',
-	'ICONS_NOT_DISPLAYED'	=> 'The following icons are not displayed on the posting page',
-	'ICONS_ORDER'			=> 'Icon order',
-	'ICONS_URL'				=> 'Icon image file',
-	'ICONS_WIDTH'			=> 'Icon width',
-	'IMPORT_ICONS'			=> 'Install icons package',
-	'IMPORT_SMILIES'		=> 'Install smilies package',
-
-	'KEEP_ALL'			=> 'Keep all',
-
-	'MASS_ADD_SMILIES'	=> 'Add multiple smilies',
-
-	'NO_ICONS_ADD'		=> 'There are no icons available for adding.',
-	'NO_ICONS_EDIT'		=> 'There are no icons available for modifying.',
-	'NO_ICONS_EXPORT'	=> 'You have no icons with which to create a package.',
-	'NO_ICONS_PAK'		=> 'No icon packages found.',
-	'NO_SMILIES_ADD'	=> 'There are no smilies available for adding.',
-	'NO_SMILIES_EDIT'	=> 'There are no smilies available for modifying.',
-	'NO_SMILIES_EXPORT'	=> 'You have no smilies with which to create a package.',
-	'NO_SMILIES_PAK'	=> 'No smiley packages found.',
-
-	'PAK_FILE_NOT_READABLE'		=> 'Could not read <samp>.pak</samp> file.',
-
-	'REPLACE_MATCHES'	=> 'Replace matches',
-
-	'SELECT_PACKAGE'			=> 'Select a package file',
-	'SMILIES_ADD'				=> 'Add a new smiley',
-	'SMILIES_NONE_ADDED'		=> 'No smilies were added.',
-	'SMILIES_ONE_ADDED'			=> 'The smiley has been added successfully.',
-	'SMILIES_ADDED'				=> 'The smilies have been added successfully.',
-	'SMILIES_CODE'				=> 'Smiley code',
-	'SMILIES_CONFIG'			=> 'Smiley configuration',
-	'SMILIES_DELETED'			=> 'The smiley has been removed successfully.',
-	'SMILIES_EDIT'				=> 'Edit smiley',
-	'SMILIE_NO_CODE'			=> 'The smilie “%s”  was ignored, as there was no code entered.',
-	'SMILIE_NO_EMOTION'			=> 'The smilie “%s” was ignored, as there was no emotion entered.',
-	'SMILIES_NONE_EDITED'		=> 'No smilies were updated.',
-	'SMILIES_ONE_EDITED'		=> 'The smiley has been updated successfully.',
-	'SMILIES_EDITED'			=> 'The smilies have been updated successfully.',
-	'SMILIES_EMOTION'			=> 'Emotion',
-	'SMILIES_HEIGHT'			=> 'Smiley height',
-	'SMILIES_IMAGE'				=> 'Smiley image',
-	'SMILIES_IMPORTED'			=> 'The smilies pack has been installed successfully.',
-	'SMILIES_IMPORT_SUCCESS'	=> 'The smilies pack was imported successfully.',
-	'SMILIES_LOCATION'			=> 'Smiley location',
-	'SMILIES_NOT_DISPLAYED'		=> 'The following smilies are not displayed on the posting page',
-	'SMILIES_ORDER'				=> 'Smiley order',
-	'SMILIES_URL'				=> 'Smiley image file',
-	'SMILIES_WIDTH'				=> 'Smiley width',
-
-	'WRONG_PAK_TYPE'	=> 'The specified package does not contain the appropriate data.',
-));
-
-// Word censors
-$lang = array_merge($lang, array(
-	'ACP_WORDS_EXPLAIN'		=> 'From this control panel you can add, edit, and remove words that will be automatically censored on your forums. People are still allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, e.g. *test* will match detestable, test* would match testing, *test would match detest.',
-	'ADD_WORD'				=> 'Add new word',
-
-	'EDIT_WORD'		=> 'Edit word censor',
-	'ENTER_WORD'	=> 'You must enter a word and its replacement.',
-
-	'NO_WORD'	=> 'No word selected for editing.',
-
-	'REPLACEMENT'	=> 'Replacement',
-
-	'UPDATE_WORD'	=> 'Update word censor',
-
-	'WORD'				=> 'Word',
-	'WORD_ADDED'		=> 'The word censor has been successfully added.',
-	'WORD_REMOVED'		=> 'The selected word censor has been successfully removed.',
-	'WORD_UPDATED'		=> 'The selected word censor has been successfully updated.',
-));
-
-// Ranks
-$lang = array_merge($lang, array(
-	'ACP_RANKS_EXPLAIN'		=> 'Using this form you can add, edit, view and delete ranks. You can also create special ranks which can be applied to a user via the user management facility.',
-	'ADD_RANK'				=> 'Add new rank',
-
-	'MUST_SELECT_RANK'		=> 'You must select a rank.',
-
-	'NO_ASSIGNED_RANK'		=> 'No special rank assigned.',
-	'NO_RANK_TITLE'			=> 'You haven’t specified a title for the rank.',
-	'NO_UPDATE_RANKS'		=> 'The rank was successfully deleted. However user accounts using this rank were not updated. You will need to manually reset the rank on these accounts.',
-
-	'RANK_ADDED'			=> 'The rank was successfully added.',
-	'RANK_IMAGE'			=> 'Rank image',
-	'RANK_IMAGE_EXPLAIN'	=> 'Use this to define a small image associated with the rank. The path is relative to the root phpBB directory.',
-	'RANK_MINIMUM'			=> 'Minimum posts',
-	'RANK_REMOVED'			=> 'The rank was successfully deleted.',
-	'RANK_SPECIAL'			=> 'Set as special rank',
-	'RANK_TITLE'			=> 'Rank title',
-	'RANK_UPDATED'			=> 'The rank was successfully updated.',
-));
-
-// Disallow Usernames
-$lang = array_merge($lang, array(
-	'ACP_DISALLOW_EXPLAIN'	=> 'Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of *. Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it.',
-	'ADD_DISALLOW_EXPLAIN'	=> 'You can disallow a username using the wildcard character * to match any character.',
-	'ADD_DISALLOW_TITLE'	=> 'Add a disallowed username',
-
-	'DELETE_DISALLOW_EXPLAIN'	=> 'You can remove a disallowed username by selecting the username from this list and clicking submit.',
-	'DELETE_DISALLOW_TITLE'		=> 'Remove a disallowed username',
-	'DISALLOWED_ALREADY'		=> 'The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present.',
-	'DISALLOWED_DELETED'		=> 'The disallowed username has been successfully removed.',
-	'DISALLOW_SUCCESSFUL'		=> 'The disallowed username has been successfully added.',
-
-	'NO_DISALLOWED'				=> 'No disallowed usernames',
-	'NO_USERNAME_SPECIFIED'		=> 'You haven’t selected or entered a username to operate with.',
-));
-
-// Reasons
-$lang = array_merge($lang, array(
-	'ACP_REASONS_EXPLAIN'	=> 'Here you can manage the reasons used in reports and denial messages when disapproving posts. There is one default reason (marked with a *) you are not able to remove, this reason is normally used for custom messages if no reason fits.',
-	'ADD_NEW_REASON'		=> 'Add new reason',
-	'AVAILABLE_TITLES'		=> 'Available localised reason titles',
-
-	'IS_NOT_TRANSLATED'			=> 'Reason has <strong>not</strong> been localised.',
-	'IS_NOT_TRANSLATED_EXPLAIN'	=> 'Reason has <strong>not</strong> been localised. If you want to provide the localised form, specify the correct key from the language files report reasons section.',
-	'IS_TRANSLATED'				=> 'Reason has been localised.',
-	'IS_TRANSLATED_EXPLAIN'		=> 'Reason has been localised. If the title you enter here is specified within the language files report reasons section, the localised form of the title and description will be used.',
-
-	'NO_REASON'					=> 'Reason could not be found.',
-	'NO_REASON_INFO'			=> 'You have to specify a title and a description for this reason.',
-	'NO_REMOVE_DEFAULT_REASON'	=> 'You are not able to remove the default reason “Other”.',
-
-	'REASON_ADD'				=> 'Add report/denial reason',
-	'REASON_ADDED'				=> 'Report/denial reason successfully added.',
-	'REASON_ALREADY_EXIST'		=> 'A reason with this title already exist, please enter another title for this reason.',
-	'REASON_DESCRIPTION'		=> 'Reason description',
-	'REASON_DESC_TRANSLATED'	=> 'Displayed reason description',
-	'REASON_EDIT'				=> 'Edit report/denial reason',
-	'REASON_EDIT_EXPLAIN'		=> 'Here you are able to add or edit a reason. If the reason is translated the localised version is used instead of the description entered here.',
-	'REASON_REMOVED'			=> 'Report/denial reason successfully removed.',
-	'REASON_TITLE'				=> 'Reason title',
-	'REASON_TITLE_TRANSLATED'	=> 'Displayed reason title',
-	'REASON_UPDATED'			=> 'Report/denial reason successfully updated.',
-
-	'USED_IN_REPORTS'		=> 'Used in reports',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
deleted file mode 100644
index 295571226e..0000000000
--- a/phpBB/language/en/acp/profile.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
-*
-* acp_profile [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-// Custom profile fields
-$lang = array_merge($lang, array(
-	'ADDED_PROFILE_FIELD'	=> 'Successfully added custom profile field.',
-	'ALPHA_ONLY'			=> 'Alphanumeric only',
-	'ALPHA_SPACERS'			=> 'Alphanumeric and spacers',
-	'ALWAYS_TODAY'			=> 'Always the current date',
-
-	'BOOL_ENTRIES_EXPLAIN'	=> 'Enter your options now',
-	'BOOL_TYPE_EXPLAIN'		=> 'Define the type, either a checkbox or radio buttons. A checkbox will only be displayed if it is checked for a given user. In that case the <strong>second</strong> language option will be used. Radio buttons will display regardless of their value.',
-
-	'CHANGED_PROFILE_FIELD'		=> 'Successfully changed profile field.',
-	'CHARS_ANY'					=> 'Any character',
-	'CHECKBOX'					=> 'Checkbox',
-	'COLUMNS'					=> 'Columns',
-	'CP_LANG_DEFAULT_VALUE'		=> 'Default value',
-	'CP_LANG_EXPLAIN'			=> 'Field description',
-	'CP_LANG_EXPLAIN_EXPLAIN'	=> 'The explanation for this field presented to the user.',
-	'CP_LANG_NAME'				=> 'Field name/title presented to the user',
-	'CP_LANG_OPTIONS'			=> 'Options',
-	'CREATE_NEW_FIELD'			=> 'Create new field',
-	'CUSTOM_FIELDS_NOT_TRANSLATED'	=> 'At least one custom profile field has not yet been translated. Please enter the required information by clicking on the “Translate” link.',
-
-	'DEFAULT_ISO_LANGUAGE'			=> 'Default language [%s]',
-	'DEFAULT_LANGUAGE_NOT_FILLED'	=> 'The language entries for the default language are not filled for this profile field.',
-	'DEFAULT_VALUE'					=> 'Default value',
-	'DELETE_PROFILE_FIELD'			=> 'Remove profile field',
-	'DELETE_PROFILE_FIELD_CONFIRM'	=> 'Are you sure you want to delete this profile field?',
-	'DISPLAY_AT_PROFILE'			=> 'Display in user control panel',
-	'DISPLAY_AT_PROFILE_EXPLAIN'	=> 'The user is able to change this profile field within the user control panel.',
-	'DISPLAY_AT_REGISTER'			=> 'Display at registration screen',
-	'DISPLAY_AT_REGISTER_EXPLAIN'	=> 'If this option is enabled, the field will be displayed on registration and able to be changed within the user control panel.',
-	'DISPLAY_PROFILE_FIELD'			=> 'Publicly display profile field',
-	'DISPLAY_PROFILE_FIELD_EXPLAIN'	=> 'The profile field will be shown in all places allowed within the load settings. Setting this to “no” will hide the field from topic pages, profiles and the memberlist.',
-	'DROPDOWN_ENTRIES_EXPLAIN'		=> 'Enter your options now, every option in one line.',
-
-	'EDIT_DROPDOWN_LANG_EXPLAIN'	=> 'Please note that you are able to change your options text and also able to add new options to the end. It is not advised to add new options between existing options - this could result in wrong options assigned to your users. This can also happen if you remove options in-between. Removing options from the end result in users having assigned this item now reverting back to the default one.',
-	'EMPTY_FIELD_IDENT'				=> 'Empty field identification',
-	'EMPTY_USER_FIELD_NAME'			=> 'Please enter a field name/title',
-	'ENTRIES'						=> 'Entries',
-	'EVERYTHING_OK'					=> 'Everything OK',
-
-	'FIELD_BOOL'				=> 'Boolean (Yes/No)',
-	'FIELD_DATE'				=> 'Date',
-	'FIELD_DESCRIPTION'			=> 'Field description',
-	'FIELD_DESCRIPTION_EXPLAIN'	=> 'The explanation for this field presented to the user.',
-	'FIELD_DROPDOWN'			=> 'Dropdown box',
-	'FIELD_IDENT'				=> 'Field identification',
-	'FIELD_IDENT_ALREADY_EXIST'	=> 'The chosen field identification already exist. Please choose another name.',
-	'FIELD_IDENT_EXPLAIN'		=> 'The field identification is a name to identify the profile field within the database and the templates.',
-	'FIELD_INT'					=> 'Numbers',
-	'FIELD_LENGTH'				=> 'Length of input box',
-	'FIELD_NOT_FOUND'			=> 'Profile field not found.',
-	'FIELD_STRING'				=> 'Single text field',
-	'FIELD_TEXT'				=> 'Textarea',
-	'FIELD_TYPE'				=> 'Field type',
-	'FIELD_TYPE_EXPLAIN'		=> 'You are not able to change the field type later.',
-	'FIELD_VALIDATION'			=> 'Field validation',
-	'FIRST_OPTION'				=> 'First option',
-
-	'HIDE_PROFILE_FIELD'			=> 'Hide profile field',
-	'HIDE_PROFILE_FIELD_EXPLAIN'	=> 'Only administrators and moderators are able to see/fill out this profile field. If this option is enabled, the profile field will be only displayed in users’ profiles.',
-
-	'INVALID_CHARS_FIELD_IDENT'	=> 'Field identification can only contain lowercase a-z and _',
-	'INVALID_FIELD_IDENT_LEN'	=> 'Field identification can only be 17 characters long',
-	'ISO_LANGUAGE'				=> 'Language [%s]',
-
-	'LANG_SPECIFIC_OPTIONS'		=> 'Language specific options [<strong>%s</strong>]',
-
-	'MAX_FIELD_CHARS'		=> 'Maximum number of characters',
-	'MAX_FIELD_NUMBER'		=> 'Highest allowed number',
-	'MIN_FIELD_CHARS'		=> 'Minimum number of characters',
-	'MIN_FIELD_NUMBER'		=> 'Lowest allowed number',
-
-	'NO_FIELD_ENTRIES'			=> 'No entries defined',
-	'NO_FIELD_ID'				=> 'No field id specified.',
-	'NO_FIELD_TYPE'				=> 'No Field type specified.',
-	'NO_VALUE_OPTION'			=> 'Option equal to non entered value',
-	'NO_VALUE_OPTION_EXPLAIN'	=> 'Value for a non-entry. If the field is required, the user gets an error if he choose the option selected here.',
-	'NUMBERS_ONLY'				=> 'Only numbers (0-9)',
-
-	'PROFILE_BASIC_OPTIONS'		=> 'Basic options',
-	'PROFILE_FIELD_ACTIVATED'	=> 'Profile field successfully activated.',
-	'PROFILE_FIELD_DEACTIVATED'	=> 'Profile field successfully deactivated.',
-	'PROFILE_LANG_OPTIONS'		=> 'Language specific options',
-	'PROFILE_TYPE_OPTIONS'		=> 'Profile type specific options',
-
-	'RADIO_BUTTONS'				=> 'Radio buttons',
-	'REMOVED_PROFILE_FIELD'		=> 'Successfully removed profile field.',
-	'REQUIRED_FIELD'			=> 'Required field',
-	'REQUIRED_FIELD_EXPLAIN'	=> 'Force profile field to be filled out or specified by user. This will display the profile field at registration and within the user control panel.',
-	'ROWS'						=> 'Rows',
-
-	'SAVE'							=> 'Save',
-	'SECOND_OPTION'					=> 'Second option',
-	'STEP_1_EXPLAIN_CREATE'			=> 'Here you can enter the first basic parameters of your new profile field. This information is needed for the second step where you’ll be able to set remaining options and tweak your profile field further.',
-	'STEP_1_EXPLAIN_EDIT'			=> 'Here you can change the basic parameters of your profile field. The relevant options are re-calculated within the second step.',
-	'STEP_1_TITLE_CREATE'			=> 'Add profile field',
-	'STEP_1_TITLE_EDIT'				=> 'Edit profile field',
-	'STEP_2_EXPLAIN_CREATE'			=> 'Here you are able to define some common options you may want to adjust.',
-	'STEP_2_EXPLAIN_EDIT'			=> 'Here you are able to change some common options.<br /><strong>Please note that changes to profile fields will not affect existing profile fields entered by your users.</strong>',
-	'STEP_2_TITLE_CREATE'			=> 'Profile type specific options',
-	'STEP_2_TITLE_EDIT'				=> 'Profile type specific options',
-	'STEP_3_EXPLAIN_CREATE'			=> 'Since you have more than one board language installed, you have to fill out the remaining language items too. The profile field will work with the default language enabled, you are able to fill out the remaining language items later too.',
-	'STEP_3_EXPLAIN_EDIT'			=> 'Since you have more than one board language installed, you now can change or add the remaining language items too. The profile field will work with the default language enabled.',
-	'STEP_3_TITLE_CREATE'			=> 'Remaining language definitions',
-	'STEP_3_TITLE_EDIT'				=> 'Language definitions',
-	'STRING_DEFAULT_VALUE_EXPLAIN'	=> 'Enter a default phrase to be displayed, a default value. Leave empty if you want to show it empty at the first place.',
-
-	'TEXT_DEFAULT_VALUE_EXPLAIN'	=> 'Enter a default text to be displayed, a default value. Leave empty if you want to show it empty at the first place.',
-	'TRANSLATE'						=> 'Translate',
-
-	'USER_FIELD_NAME'	=> 'Field name/title presented to the user',
-
-	'VISIBILITY_OPTION'				=> 'Visibility option',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
deleted file mode 100644
index 31e14d62a1..0000000000
--- a/phpBB/language/en/acp/prune.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
-*
-* acp_prune [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-// User pruning
-$lang = array_merge($lang, array(
-	'ACP_PRUNE_USERS_EXPLAIN'	=> 'Here you can delete (or deactivate) users from your board. This can be done in a variety of ways; by post count, last activity, etc. Each of these criteria can be combined, i.e. you can prune users last active before 2002-01-01 with fewer than 10 posts. Alternatively you can enter a list of users directly into the text box, any criteria entered will be ignored. Take care with this facility! Once a user is deleted there is no way back.',
-
-	'DEACTIVATE_DELETE'			=> 'Deactivate or delete',
-	'DEACTIVATE_DELETE_EXPLAIN'	=> 'Choose whether to deactivate users or delete them entirely, note there is no undo!',
-	'DELETE_USERS'				=> 'Delete',
-	'DELETE_USER_POSTS'			=> 'Delete pruned user posts',
-	'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.',
-
-	'JOINED_EXPLAIN'			=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
-
-	'LAST_ACTIVE_EXPLAIN'		=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
-
-	'PRUNE_USERS_LIST'				=> 'Users to be pruned',
-	'PRUNE_USERS_LIST_DELETE'		=> 'With the selected critera for pruning users the following accounts will be removed.',
-	'PRUNE_USERS_LIST_DEACTIVATE'	=> 'With the selected critera for pruning users the following accounts will be deactivated.',
-
-	'SELECT_USERS_EXPLAIN'		=> 'Enter specific usernames here, they will be used in preference to the criteria above.',
-
-	'USER_DEACTIVATE_SUCCESS'	=> 'The selected users have been deactivated successfully.',
-	'USER_DELETE_SUCCESS'		=> 'The selected users have been deleted successfully.',
-	'USER_PRUNE_FAILURE'		=> 'No users fit the selected criteria.',
-
-	'WRONG_ACTIVE_JOINED_DATE'	=> 'The date entered is wrong, it is expected in <kbd>YYYY-MM-DD</kbd> format.',
-));
-
-// Forum Pruning
-$lang = array_merge($lang, array(
-	'ACP_PRUNE_FORUMS_EXPLAIN'	=> 'This will delete any topic which has not been posted to or viewed within the number of days you select. If you do not enter a number then all topics will be deleted. By default, it will not remove topics in which polls are still running nor will it remove stickies and announcements.',
-
-	'FORUM_PRUNE'		=> 'Forum prune',
-
-	'NO_PRUNE'			=> 'No forums pruned.',
-
-	'SELECTED_FORUM'	=> 'Selected forum',
-	'SELECTED_FORUMS'	=> 'Selected forums',
-
-	'POSTS_PRUNED'					=> 'Posts pruned',
-	'PRUNE_ANNOUNCEMENTS'			=> 'Prune announcements',
-	'PRUNE_FINISHED_POLLS'			=> 'Prune closed polls',
-	'PRUNE_FINISHED_POLLS_EXPLAIN'	=> 'Removes topics with polls which have ended.',
-	'PRUNE_FORUM_CONFIRM'			=> 'Are you sure you want to prune the selected forums with the settings specified? Once removed, there is no way to recover the pruned posts and topics.',
-	'PRUNE_NOT_POSTED'				=> 'Days since last posted',
-	'PRUNE_NOT_VIEWED'				=> 'Days since last viewed',
-	'PRUNE_OLD_POLLS'				=> 'Prune old polls',
-	'PRUNE_OLD_POLLS_EXPLAIN'		=> 'Removes topics with polls not voted in for post age days.',
-	'PRUNE_STICKY'					=> 'Prune stickies',
-	'PRUNE_SUCCESS'					=> 'Pruning of forums was successful.',
-
-	'TOPICS_PRUNED'		=> 'Topics pruned',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
deleted file mode 100644
index 11e6723c75..0000000000
--- a/phpBB/language/en/acp/search.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
-*
-* acp_search [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ACP_SEARCH_INDEX_EXPLAIN'				=> 'Here you can manage the search backend’s indexes. Since you normally use only one backend you should delete all indexes that you do not make use of. After altering some of the search settings (e.g. the number of minimum/maximum chars) it might be worth recreating the index so it reflects those changes.',
-	'ACP_SEARCH_SETTINGS_EXPLAIN'			=> 'Here you can define what search backend will be used for indexing posts and performing searches. You can set various options that can influence how much processing these actions require. Some of these settings are the same for all search engine backends.',
-
-	'COMMON_WORD_THRESHOLD'					=> 'Common word threshold',
-	'COMMON_WORD_THRESHOLD_EXPLAIN'			=> 'Words which are contained in a greater percentage of all posts will be regarded as common. Common words are ignored in search queries. Set to zero to disable. Only takes effect if there are more than 100 posts.',
-	'CONFIRM_SEARCH_BACKEND'				=> 'Are you sure you wish to switch to a different search backend? After changing the search backend you will have to create an index for the new search backend. If you don’t plan on switching back to the old search backend you can also delete the old backend’s index in order to free system resources.',
-	'CONTINUE_DELETING_INDEX'				=> 'Continue previous index removal process',
-	'CONTINUE_DELETING_INDEX_EXPLAIN'		=> 'An index removal process has been started. In order to access the search index page you will have to complete it or cancel it.',
-	'CONTINUE_INDEXING'						=> 'Continue previous indexing process',
-	'CONTINUE_INDEXING_EXPLAIN'				=> 'An indexing process has been started. In order to access the search index page you will have to complete it or cancel it.',
-	'CREATE_INDEX'							=> 'Create index',
-
-	'DELETE_INDEX'							=> 'Delete index',
-	'DELETING_INDEX_IN_PROGRESS'			=> 'Deleting the index in progress',
-	'DELETING_INDEX_IN_PROGRESS_EXPLAIN'	=> 'The search backend is currently cleaning its index. This can take a few minutes.',
-
-	'FULLTEXT_MYSQL_INCOMPATIBLE_VERSION'	=> 'The MySQL fulltext backend can only be used with MySQL4 and above.',
-	'FULLTEXT_MYSQL_NOT_MYISAM'				=> 'MySQL fulltext indexes can only be used with MyISAM tables.',
-	'FULLTEXT_MYSQL_TOTAL_POSTS'			=> 'Total number of indexed posts',
-
-	'GENERAL_SEARCH_SETTINGS'				=> 'General search settings',
-	'GO_TO_SEARCH_INDEX'					=> 'Go to search index page',
-
-	'INDEX_STATS'							=> 'Index statistics',
-	'INDEXING_IN_PROGRESS'					=> 'Indexing in progress',
-	'INDEXING_IN_PROGRESS_EXPLAIN'			=> 'The search backend is currently indexing all posts on the board. This can take from a few minutes to a few hours depending on your board’s size.',
-
-	'LIMIT_SEARCH_LOAD'						=> 'Search page system load limit',
-	'LIMIT_SEARCH_LOAD_EXPLAIN'				=> 'If the 1 minute system load exceeds this value the search page will go offline, 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.',
-
-	'MAX_SEARCH_CHARS'						=> 'Max characters indexed by search',
-	'MAX_SEARCH_CHARS_EXPLAIN'				=> 'Words with no more than this many characters will be indexed for searching.',
-	'MAX_NUM_SEARCH_KEYWORDS'				=> 'Maximum number of allowed keywords',
-	'MAX_NUM_SEARCH_KEYWORDS_EXPLAIN'		=> 'Maximum number of words the user is able to search for. A value of 0 allows an unlimited number of words.',
-	'MIN_SEARCH_CHARS'						=> 'Min characters indexed by search',
-	'MIN_SEARCH_CHARS_EXPLAIN'				=> 'Words with at least this many characters will be indexed for searching.',
-	'MIN_SEARCH_AUTHOR_CHARS'				=> 'Min author name characters',
-	'MIN_SEARCH_AUTHOR_CHARS_EXPLAIN'		=> 'Users have to enter at least this many characters of the name when performing a wildcard author search. If the author’s username is shorter than this number you can still search for the author’s posts by entering the complete username.',
-
-	'PROGRESS_BAR'							=> 'Progress bar',
-
-	'SEARCH_GUEST_INTERVAL'					=> 'Guest search flood interval',
-	'SEARCH_GUEST_INTERVAL_EXPLAIN'			=> 'Number of seconds guests must wait between searches. If one guest searches all others have to wait until the time interval passed.',
-	'SEARCH_INDEX_CREATE_REDIRECT'			=> 'All posts up to post id %1$d have now been indexed, of which %2$d posts were within this step.<br />The current rate of indexing is approximately %3$.1f posts per second.<br />Indexing in progress…',
-	'SEARCH_INDEX_DELETE_REDIRECT'			=> 'All posts up to post id %1$d have been removed from the search index.<br />Deleting in progress…',
-	'SEARCH_INDEX_CREATED'					=> 'Successfully indexed all posts in the board database.',
-	'SEARCH_INDEX_REMOVED'					=> 'Successfully deleted the search index for this backend.',
-	'SEARCH_INTERVAL'						=> 'User search flood interval',
-	'SEARCH_INTERVAL_EXPLAIN'				=> 'Number of seconds users must wait between searches. This interval is checked independently for each user.',
-	'SEARCH_STORE_RESULTS'					=> 'Search result cache length',
-	'SEARCH_STORE_RESULTS_EXPLAIN'			=> 'Cached search results will expire after this time, in seconds. Set to 0 if you want to disable search cache.',
-	'SEARCH_TYPE'							=> 'Search backend',
-	'SEARCH_TYPE_EXPLAIN'					=> 'phpBB allows you to choose the backend that is used for searching text in post contents. By default the search will use phpBB’s own fulltext search.',
-	'SWITCHED_SEARCH_BACKEND'				=> 'You switched the search backend. In order to use the new search backend you should make sure that there is an index for the backend you chose.',
-
-	'TOTAL_WORDS'							=> 'Total number of indexed words',
-	'TOTAL_MATCHES'							=> 'Total number of word to post relations indexed',
-
-	'YES_SEARCH'							=> 'Enable search facilities',
-	'YES_SEARCH_EXPLAIN'					=> 'Enables user facing search functionality including member search.',
-	'YES_SEARCH_UPDATE'						=> 'Enable fulltext updating',
-	'YES_SEARCH_UPDATE_EXPLAIN'				=> 'Updating of fulltext indexes when posting, overridden if search is disabled.',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
deleted file mode 100644
index 2d28b4fb2a..0000000000
--- a/phpBB/language/en/acp/styles.php
+++ /dev/null
@@ -1,421 +0,0 @@
-<?php
-/**
-*
-* acp_styles [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ACP_IMAGESETS_EXPLAIN'	=> 'Imagesets comprise all the button, forum, folder, etc. and other non-style specific images used by the board. Here you can edit, export or delete existing imagesets and import or activate new sets.',
-	'ACP_STYLES_EXPLAIN'	=> 'Here you can manage the available styles on your board. A style consists of a template, theme and imageset. You may alter existing styles, delete, deactivate, reactivate, create or import new ones. You can also see what a style will look like using the preview function. The current default style is noted by the presence of an asterisk (*). Also listed is the total user count for each style, note that overriding user styles will not be reflected here.',
-	'ACP_TEMPLATES_EXPLAIN'	=> 'A template set comprises all the markup used to generate the layout of your board. Here you can edit existing template sets, delete, export, import and preview sets. You can also modify the templating code used to generate BBCode.',
-	'ACP_THEMES_EXPLAIN'	=> 'From here you can create, install, edit, delete and export themes. A theme is the combination of colours and images that are applied to your templates to define the basic look of your board. The range of options open to you depends on the configuration of your server and phpBB installation, see the manual for further details. Please note that when creating new themes the use of an existing theme as a basis is optional.',
-	'ADD_IMAGESET'			=> 'Create imageset',
-	'ADD_IMAGESET_EXPLAIN'	=> 'Here you can create a new imageset. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this imageset on an existing one. You may also be able to upload or import (from the store directory) a imageset archive. If you upload or import an archive the imageset name can be optionally taken from the archive name (to do this leave the imageset name blank).',
-	'ADD_STYLE'				=> 'Create style',
-	'ADD_STYLE_EXPLAIN'		=> 'Here you can create a new style. Depending on your server configuration and file permissions you may have additional options. For example you may be able to base this style on an existing one. You may also be able to upload or import (from the store directory) a style archive. If you upload or import an archive the style name will be determined automatically.',
-	'ADD_TEMPLATE'			=> 'Create template',
-	'ADD_TEMPLATE_EXPLAIN'	=> 'Here you can add a new template. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this template set on an existing one. You may also be able to upload or import (from the store directory) a template archive. If you upload or import an archive the template name can be optionally taken from the archive name (to do this leave the template name blank).',
-	'ADD_THEME'				=> 'Create theme',
-	'ADD_THEME_EXPLAIN'		=> 'Here you can add a new theme. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this theme on an existing one. You may also be able to upload or import (from the store directory) a theme archive. If you upload or import an archive the theme name can be optionally taken from the archive name (to do this leave the theme name blank).',
-	'ARCHIVE_FORMAT'		=> 'Archive file type',
-	'AUTOMATIC_EXPLAIN'		=> 'Leave blank to attempt automatic detection.',
-
-	'BACKGROUND'			=> 'Background',
-	'BACKGROUND_COLOUR'		=> 'Background colour',
-	'BACKGROUND_IMAGE'		=> 'Background image',
-	'BACKGROUND_REPEAT'		=> 'Background repeat',
-	'BOLD'					=> 'Bold',
-
-	'CACHE'							=> 'Cache',
-	'CACHE_CACHED'					=> 'Cached',
-	'CACHE_FILENAME'				=> 'Template file',
-	'CACHE_FILESIZE'				=> 'File size',
-	'CACHE_MODIFIED'				=> 'Modified',
-	'CONFIRM_IMAGESET_REFRESH'		=> 'Are you sure you wish to refresh all imageset data? The settings from the imageset configuration file will overwrite all modifications to the imageset which have been carried out with the imageset editor.',
-	'CONFIRM_TEMPLATE_CLEAR_CACHE'	=> 'Are you sure you wish to clear all cached versions of your template files?',
-	'CONFIRM_THEME_REFRESH'			=> 'Are you sure you wish to refresh the theme data stored in the database with the contents of the theme on the filesystem? This will overwrite all modifications which have been carried out with the theme editor while the theme was stored in the database.',
-	'COPYRIGHT'						=> 'Copyright',
-	'CREATE_IMAGESET'				=> 'Create new imageset',
-	'CREATE_STYLE'					=> 'Create new style',
-	'CREATE_TEMPLATE'				=> 'Create new template set',
-	'CREATE_THEME'					=> 'Create new theme',
-	'CURRENT_IMAGE'					=> 'Current image',
-
-	'DEACTIVATE_DEFAULT'		=> 'You cannot deactivate the default style.',
-	'DELETE_FROM_FS'			=> 'Delete from filesystem',
-	'DELETE_IMAGESET'			=> 'Delete imageset',
-	'DELETE_IMAGESET_EXPLAIN'	=> 'Here you can remove the selected imageset from the database. Additionally, if you have permission you can elect to remove the set from the filesystem. Please note that there is no undo capability. When the imageset is deleted it is gone for good. It is recommended that you first export your set for possible future use.',
-	'DELETE_STYLE'				=> 'Delete style',
-	'DELETE_STYLE_EXPLAIN'		=> 'Here you can remove the selected style. You cannot remove all the style elements from here. These must be deleted individually via their respective forms. Take care in deleting styles there is no undo facility.',
-	'DELETE_TEMPLATE'			=> 'Delete template',
-	'DELETE_TEMPLATE_EXPLAIN'	=> 'Here you can remove the selected template set from the database. Additionally, if you have permission you can elect to remove the set from the filesystem. Please note that there is no undo capability. When the templates are deleted they are gone for good. It is recommended that you first export your set for possible future use.',
-	'DELETE_THEME'				=> 'Delete theme',
-	'DELETE_THEME_EXPLAIN'		=> 'Here you can remove the selected theme from the database. Additionally, if you have permission you can elect to remove the theme from the filesystem. Please note that there is no undo capability. When the theme is deleted it is gone for good. It is recommended that you first export your theme for possible future use.',
-	'DETAILS'					=> 'Details',
-	'DIMENSIONS_EXPLAIN'		=> 'Selecting yes here will include width/height parameters.',
-
-	'EDIT_DETAILS_IMAGESET'				=> 'Edit imageset details',
-	'EDIT_DETAILS_IMAGESET_EXPLAIN'		=> 'Here you can edit certain imageset details such as its name.',
-	'EDIT_DETAILS_STYLE'				=> 'Edit style',
-	'EDIT_DETAILS_STYLE_EXPLAIN'		=> 'Using the form below you can modify this existing style. You may alter the combination of template, theme and imageset which define the style itself. You may also make the style the default one.',
-	'EDIT_DETAILS_TEMPLATE'				=> 'Edit template details',
-	'EDIT_DETAILS_TEMPLATE_EXPLAIN'		=> 'Here you can edit certain template details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your template set can be written to by the web server.',
-	'EDIT_DETAILS_THEME'				=> 'Edit theme details',
-	'EDIT_DETAILS_THEME_EXPLAIN'		=> 'Here you can edit certain theme details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your stylesheet can be written to by the web server.',
-	'EDIT_IMAGESET'						=> 'Edit imageset',
-	'EDIT_IMAGESET_EXPLAIN'				=> 'Here you can edit the individual images which define the imageset. You can also specify dimensions for the image. Dimensions are optional, specifying them can overcome certain rendering issues with some browsers. By not specifying them you reduce the size of the database record a little.',
-	'EDIT_TEMPLATE'						=> 'Edit template',
-	'EDIT_TEMPLATE_EXPLAIN'				=> 'Here you can edit your template set directly. Please remember that these edits are permanent and cannot be undone once submitted. If PHP can write to the template files in your styles directory any changes here will be written directly to those files. If PHP cannot write to those files they will be copied into the database and all changes will only be reflected there. Please take care when editing your template set, remember to close all replacement variable terms {XXXX} and conditional statements.',
-	'EDIT_THEME'						=> 'Edit theme',
-	'EDIT_THEME_EXPLAIN'				=> 'Here you can edit the selected theme, changing colours, images, etc.',
-	'EDIT_THEME_STORED_DB'				=> 'The stylesheet file was unwritable so the stylesheet is now stored in the database containing your modification.',
-	'EDIT_THEME_STORE_PARSED'			=> 'The theme requires that its stylesheet is parsed. This is only possible if it’s stored in the database.',
-	'EXPORT'							=> 'Export',
-
-	'FOREGROUND'			=> 'Foreground',
-	'FONT_COLOUR'			=> 'Font colour',
-	'FONT_FACE'				=> 'Font face',
-	'FONT_FACE_EXPLAIN'		=> 'You can specify multiple fonts separated by commas. If a user doesn’t have the first font installed the first other working font will be chosen.',
-	'FONT_SIZE'				=> 'Font size',
-
-	'GLOBAL_IMAGES'			=> 'Global',
-
-	'HIDE_CSS'				=> 'Hide raw CSS',
-
-	'IMAGE_WIDTH'				=> 'Image width',
-	'IMAGE_HEIGHT'				=> 'Image height',
-	'IMAGE'						=> 'Image',
-	'IMAGE_NAME'				=> 'Image name',
-	'IMAGE_PARAMETER'			=> 'Parameter',
-	'IMAGE_VALUE'				=> 'Value',
-	'IMAGESET_ADDED'			=> 'New imageset added on filesystem.',
-	'IMAGESET_ADDED_DB'			=> 'New imageset added to database.',
-	'IMAGESET_DELETED'			=> 'Imageset deleted successfully.',
-	'IMAGESET_DELETED_FS'		=> 'Imageset removed from database but some files may remain on the filesystem.',
-	'IMAGESET_DETAILS_UPDATED'	=> 'Imageset details successfully updated.',
-	'IMAGESET_ERR_ARCHIVE'		=> 'Please select an archive method.',
-	'IMAGESET_ERR_COPY_LONG'	=> 'The copyright can be no longer than 60 characters.',
-	'IMAGESET_ERR_NAME_CHARS'	=> 'The imageset name can only contain alphanumeric characters, -, +, _ and space.',
-	'IMAGESET_ERR_NAME_EXIST'	=> 'A imageset with that name already exists.',
-	'IMAGESET_ERR_NAME_LONG'	=> 'The imageset name can be no longer than 30 characters.',
-	'IMAGESET_ERR_NOT_IMAGESET'	=> 'The archive you specified does not contain a valid imageset.',
-	'IMAGESET_ERR_STYLE_NAME'	=> 'You must supply a name for this imageset.',
-	'IMAGESET_EXPORT'			=> 'Export imageset',
-	'IMAGESET_EXPORT_EXPLAIN'	=> 'Here you can export an imageset in the form of an archive. This archive will contain all the data necessary to install the set of images on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
-	'IMAGESET_EXPORTED'			=> 'Imageset exported successfully and stored in %s.',
-	'IMAGESET_NAME'				=> 'Imageset name',
-	'IMAGESET_REFRESHED'		=> 'Imageset refreshed successfully.',
-	'IMAGESET_UPDATED'			=> 'Imageset updated successfully.',
-	'ITALIC'					=> 'Italic',
-
-	'IMG_CAT_BUTTONS'		=> 'Localised buttons',
-	'IMG_CAT_CUSTOM'		=> 'Custom images',
-	'IMG_CAT_FOLDERS'		=> 'Topic icons',
-	'IMG_CAT_FORUMS'		=> 'Forum icons',
-	'IMG_CAT_ICONS'			=> 'General icons',
-	'IMG_CAT_LOGOS'			=> 'Logos',
-	'IMG_CAT_POLLS'			=> 'Polling images',
-	'IMG_CAT_UI'			=> 'General user interface elements',
-	'IMG_CAT_USER'			=> 'Additional images',
-
-	'IMG_SITE_LOGO'			=> 'Main logo',
-	'IMG_UPLOAD_BAR'		=> 'Upload progress bar',
-	'IMG_POLL_LEFT'			=> 'Poll left end',
-	'IMG_POLL_CENTER'		=> 'Poll centre',
-	'IMG_POLL_RIGHT'		=> 'Poll right end',
-	'IMG_ICON_FRIEND'		=> 'Add as friend',
-	'IMG_ICON_FOE'			=> 'Add as foe',
-
-	'IMG_FORUM_LINK'			=> 'Forum link',
-	'IMG_FORUM_READ'			=> 'Forum',
-	'IMG_FORUM_READ_LOCKED'		=> 'Forum locked',
-	'IMG_FORUM_READ_SUBFORUM'	=> 'Subforum',
-	'IMG_FORUM_UNREAD'			=> 'Forum new posts',
-	'IMG_FORUM_UNREAD_LOCKED'	=> 'Forum new posts locked',
-	'IMG_FORUM_UNREAD_SUBFORUM'	=> 'Subforum new posts',
-	'IMG_SUBFORUM_READ'			=> 'Legend subforum',
-	'IMG_SUBFORUM_UNREAD'		=> 'Legend subforum new posts',
-
-	'IMG_TOPIC_MOVED'			=> 'Topic moved',
-
-	'IMG_TOPIC_READ'				=> 'Topic',
-	'IMG_TOPIC_READ_MINE'			=> 'Topic posted to',
-	'IMG_TOPIC_READ_HOT'			=> 'Topic popular',
-	'IMG_TOPIC_READ_HOT_MINE'		=> 'Topic popular posted to',
-	'IMG_TOPIC_READ_LOCKED'			=> 'Topic locked',
-	'IMG_TOPIC_READ_LOCKED_MINE'	=> 'Topic locked posted to',
-
-	'IMG_TOPIC_UNREAD'				=> 'Topic new posts',
-	'IMG_TOPIC_UNREAD_MINE'			=> 'Topic posted to new',
-	'IMG_TOPIC_UNREAD_HOT'			=> 'Topic popular new posts',
-	'IMG_TOPIC_UNREAD_HOT_MINE'		=> 'Topic popular posted to new',
-	'IMG_TOPIC_UNREAD_LOCKED'		=> 'Topic locked new',
-	'IMG_TOPIC_UNREAD_LOCKED_MINE'	=> 'Topic locked posted to new',
-
-	'IMG_STICKY_READ'				=> 'Sticky topic',
-	'IMG_STICKY_READ_MINE'			=> 'Sticky topic posted to',
-	'IMG_STICKY_READ_LOCKED'		=> 'Sticky topic locked',
-	'IMG_STICKY_READ_LOCKED_MINE'	=> 'Sticky topic locked posted to',
-	'IMG_STICKY_UNREAD'				=> 'Sticky topic new posts',
-	'IMG_STICKY_UNREAD_MINE'		=> 'Sticky topic posted to new',
-	'IMG_STICKY_UNREAD_LOCKED'		=> 'Sticky topic locked new posts',
-	'IMG_STICKY_UNREAD_LOCKED_MINE'	=> 'Sticky topic locked posted to new',
-
-	'IMG_ANNOUNCE_READ'					=> 'Announcement',
-	'IMG_ANNOUNCE_READ_MINE'			=> 'Announcement posted to',
-	'IMG_ANNOUNCE_READ_LOCKED'			=> 'Announcement locked',
-	'IMG_ANNOUNCE_READ_LOCKED_MINE'		=> 'Announcement locked posted to',
-	'IMG_ANNOUNCE_UNREAD'				=> 'Announcement new posts',
-	'IMG_ANNOUNCE_UNREAD_MINE'			=> 'Announcement posted to new',
-	'IMG_ANNOUNCE_UNREAD_LOCKED'		=> 'Announcement locked new posts',
-	'IMG_ANNOUNCE_UNREAD_LOCKED_MINE'	=> 'Announcement locked posted to new',
-
-	'IMG_GLOBAL_READ'					=> 'Global',
-	'IMG_GLOBAL_READ_MINE'				=> 'Global posted to',
-	'IMG_GLOBAL_READ_LOCKED'			=> 'Global locked',
-	'IMG_GLOBAL_READ_LOCKED_MINE'		=> 'Global locked posted to',
-	'IMG_GLOBAL_UNREAD'					=> 'Global new posts',
-	'IMG_GLOBAL_UNREAD_MINE'			=> 'Global posted to new',
-	'IMG_GLOBAL_UNREAD_LOCKED'			=> 'Global locked new posts',
-	'IMG_GLOBAL_UNREAD_LOCKED_MINE'		=> 'Global locked posted to new',
-
-	'IMG_PM_READ'		=> 'Read private message',
-	'IMG_PM_UNREAD'		=> 'Unread private message',
-
-	'IMG_ICON_BACK_TOP'		=> 'Top',
-
-	'IMG_ICON_CONTACT_AIM'		=> 'AIM',
-	'IMG_ICON_CONTACT_EMAIL'	=> 'Send e-mail',
-	'IMG_ICON_CONTACT_ICQ'		=> 'ICQ',
-	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
-	'IMG_ICON_CONTACT_MSNM'		=> 'MSNM',
-	'IMG_ICON_CONTACT_PM'		=> 'Send message',
-	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',
-	'IMG_ICON_CONTACT_WWW'		=> 'Website',
-
-	'IMG_ICON_POST_DELETE'			=> 'Delete post',
-	'IMG_ICON_POST_EDIT'			=> 'Edit post',
-	'IMG_ICON_POST_INFO'			=> 'Show post details',
-	'IMG_ICON_POST_QUOTE'			=> 'Quote post',
-	'IMG_ICON_POST_REPORT'			=> 'Report post',
-	'IMG_ICON_POST_TARGET'			=> 'Minipost',
-	'IMG_ICON_POST_TARGET_UNREAD'	=> 'New minipost',
-
-
-	'IMG_ICON_TOPIC_ATTACH'			=> 'Attachment',
-	'IMG_ICON_TOPIC_LATEST'			=> 'Last post',
-	'IMG_ICON_TOPIC_NEWEST'			=> 'Last unread post',
-	'IMG_ICON_TOPIC_REPORTED'		=> 'Post reported',
-	'IMG_ICON_TOPIC_UNAPPROVED'		=> 'Post unapproved',
-
-	'IMG_ICON_USER_ONLINE'		=> 'User online',
-	'IMG_ICON_USER_OFFLINE'		=> 'User offline',
-	'IMG_ICON_USER_PROFILE'		=> 'Show profile',
-	'IMG_ICON_USER_SEARCH'		=> 'Search posts',
-	'IMG_ICON_USER_WARN'		=> 'Warn user',
-
-	'IMG_BUTTON_PM_FORWARD'		=> 'Forward private message',
-	'IMG_BUTTON_PM_NEW'			=> 'New private message',
-	'IMG_BUTTON_PM_REPLY'		=> 'Reply private message',
-	'IMG_BUTTON_TOPIC_LOCKED'	=> 'Topic locked',
-	'IMG_BUTTON_TOPIC_NEW'		=> 'New topic',
-	'IMG_BUTTON_TOPIC_REPLY'	=> 'Reply topic',
-
-	'IMG_USER_ICON1'		=> 'User defined image 1',
-	'IMG_USER_ICON2'		=> 'User defined image 2',
-	'IMG_USER_ICON3'		=> 'User defined image 3',
-	'IMG_USER_ICON4'		=> 'User defined image 4',
-	'IMG_USER_ICON5'		=> 'User defined image 5',
-	'IMG_USER_ICON6'		=> 'User defined image 6',
-	'IMG_USER_ICON7'		=> 'User defined image 7',
-	'IMG_USER_ICON8'		=> 'User defined image 8',
-	'IMG_USER_ICON9'		=> 'User defined image 9',
-	'IMG_USER_ICON10'		=> 'User defined image 10',
-
-	'INCLUDE_DIMENSIONS'		=> 'Include dimensions',
-	'INCLUDE_IMAGESET'			=> 'Include imageset',
-	'INCLUDE_TEMPLATE'			=> 'Include template',
-	'INCLUDE_THEME'				=> 'Include theme',
-	'INSTALL_IMAGESET'			=> 'Install imageset',
-	'INSTALL_IMAGESET_EXPLAIN'	=> 'Here you can install your selected imageset. You can edit certain details if you wish or use the installation defaults.',
-	'INSTALL_STYLE'				=> 'Install style',
-	'INSTALL_STYLE_EXPLAIN'		=> 'Here you can install a new style and if appropriate the corresponding style elements. If you already have the relevant style elements installed they will not be overwritten. Some styles require existing style elements to already be installed. If you try installing such a style and do not have the required elements you will be notified.',
-	'INSTALL_TEMPLATE'			=> 'Install Template',
-	'INSTALL_TEMPLATE_EXPLAIN'	=> 'Here you can install a new template set. Depending on your server configuration you may have a number of options here.',
-	'INSTALL_THEME'				=> 'Install theme',
-	'INSTALL_THEME_EXPLAIN'		=> 'Here you can install your selected theme. You can edit certain details if you wish or use the installation defaults.',
-	'INSTALLED_IMAGESET'		=> 'Installed imagesets',
-	'INSTALLED_STYLE'			=> 'Installed styles',
-	'INSTALLED_TEMPLATE'		=> 'Installed templates',
-	'INSTALLED_THEME'			=> 'Installed themes',
-
-	'LINE_SPACING'				=> 'Line spacing',
-	'LOCALISED_IMAGES'			=> 'Localised',
-
-	'NO_CLASS'					=> 'Cannot find class in stylesheet.',
-	'NO_IMAGESET'				=> 'Cannot find imageset on filesystem.',
-	'NO_IMAGE'					=> 'No image',
-	'NO_IMAGE_ERROR'			=> 'Cannot find image on filesystem.',
-	'NO_STYLE'					=> 'Cannot find style on filesystem.',
-	'NO_TEMPLATE'				=> 'Cannot find template on filesystem.',
-	'NO_THEME'					=> 'Cannot find theme on filesystem.',
-	'NO_UNINSTALLED_IMAGESET'	=> 'No uninstalled imagesets detected.',
-	'NO_UNINSTALLED_STYLE'		=> 'No uninstalled styles detected.',
-	'NO_UNINSTALLED_TEMPLATE'	=> 'No uninstalled templates detected.',
-	'NO_UNINSTALLED_THEME'		=> 'No uninstalled themes detected.',
-	'NO_UNIT'					=> 'None',
-
-	'ONLY_IMAGESET'			=> 'This is the only remaining imageset, you cannot delete it.',
-	'ONLY_STYLE'			=> 'This is the only remaining style, you cannot delete it.',
-	'ONLY_TEMPLATE'			=> 'This is the only remaining template set, you cannot delete it.',
-	'ONLY_THEME'			=> 'This is the only remaining theme, you cannot delete it.',
-	'OPTIONAL_BASIS'		=> 'Optional basis',
-
-	'REFRESH'					=> 'Refresh',
-	'REPEAT_NO'					=> 'None',
-	'REPEAT_X'					=> 'Only horizontally',
-	'REPEAT_Y'					=> 'Only vertically',
-	'REPEAT_ALL'				=> 'Both directions',
-	'REPLACE_IMAGESET'			=> 'Replace imageset with',
-	'REPLACE_IMAGESET_EXPLAIN'	=> 'This imageset will replace the one you are deleting in any styles that use it.',
-	'REPLACE_STYLE'				=> 'Replace style with',
-	'REPLACE_STYLE_EXPLAIN'		=> 'This style will replace the one being deleted for members that use it.',
-	'REPLACE_TEMPLATE'			=> 'Replace template with',
-	'REPLACE_TEMPLATE_EXPLAIN'	=> 'This template set will replace the one you are deleting in any styles that use it.',
-	'REPLACE_THEME'				=> 'Replace theme with',
-	'REPLACE_THEME_EXPLAIN'		=> 'This theme will replace the one you are deleting in any styles that use it.',
-	'REQUIRES_IMAGESET'			=> 'This style requires the %s imageset to be installed.',
-	'REQUIRES_TEMPLATE'			=> 'This style requires the %s template set to be installed.',
-	'REQUIRES_THEME'			=> 'This style requires the %s theme to be installed.',
-
-	'SELECT_IMAGE'				=> 'Select image',
-	'SELECT_TEMPLATE'			=> 'Select template file',
-	'SELECT_THEME'				=> 'Select theme file',
-	'SELECTED_IMAGE'			=> 'Selected image',
-	'SELECTED_IMAGESET'			=> 'Selected imageset',
-	'SELECTED_TEMPLATE'			=> 'Selected template',
-	'SELECTED_TEMPLATE_FILE'	=> 'Selected template file',
-	'SELECTED_THEME'			=> 'Selected theme',
-	'SELECTED_THEME_FILE'		=> 'Selected theme file',
-	'STORE_DATABASE'			=> 'Database',
-	'STORE_FILESYSTEM'			=> 'Filesystem',
-	'STYLE_ACTIVATE'			=> 'Activate',
-	'STYLE_ACTIVE'				=> 'Active',
-	'STYLE_ADDED'				=> 'Style added successfully.',
-	'STYLE_DEACTIVATE'			=> 'Deactivate',
-	'STYLE_DEFAULT'				=> 'Make default style',
-	'STYLE_DELETED'				=> 'Style deleted successfully.',
-	'STYLE_DETAILS_UPDATED'		=> 'Style edited successfully.',
-	'STYLE_ERR_ARCHIVE'			=> 'Please select an archive method.',
-	'STYLE_ERR_COPY_LONG'		=> 'The copyright can be no longer than 60 characters.',
-	'STYLE_ERR_MORE_ELEMENTS'	=> 'You must select at least one style element.',
-	'STYLE_ERR_NAME_CHARS'		=> 'The style name can only contain alphanumeric characters, -, +, _ and space.',
-	'STYLE_ERR_NAME_EXIST'		=> 'A style with that name already exists.',
-	'STYLE_ERR_NAME_LONG'		=> 'The style name can be no longer than 30 characters.',
-	'STYLE_ERR_NO_IDS'			=> 'You must select a template, theme and imageset for this style.',
-	'STYLE_ERR_NOT_STYLE'		=> 'The imported or uploaded file did not contain a valid style archive.',
-	'STYLE_ERR_STYLE_NAME'		=> 'You must supply a name for this style.',
-	'STYLE_EXPORT'				=> 'Export style',
-	'STYLE_EXPORT_EXPLAIN'		=> 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme and imageset for a commonly used template you could simply export the theme and imageset and omit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
-	'STYLE_EXPORTED'			=> 'Style exported successfully and stored in %s.',
-	'STYLE_IMAGESET'			=> 'Imageset',
-	'STYLE_NAME'				=> 'Style name',
-	'STYLE_TEMPLATE'			=> 'Template',
-	'STYLE_THEME'				=> 'Theme',
-	'STYLE_USED_BY'				=> 'Used by (including robots)',
-
-	'TEMPLATE_ADDED'			=> 'Template set added and stored on filesystem.',
-	'TEMPLATE_CACHE'			=> 'Template cache',
-	'TEMPLATE_CACHE_EXPLAIN'	=> 'By default phpBB caches the compiled version of its templates. This decreases the load on the server each time a page is viewed and thus may reduce the page generation time. Here you can view the cache status of each file and delete individual files or the entire cache.',
-	'TEMPLATE_CACHE_CLEARED'	=> 'Template cache cleared successfully.',
-	'TEMPLATE_CACHE_EMPTY'		=> 'There are no cached templates.',
-	'TEMPLATE_DELETED'			=> 'Template set deleted successfully.',
-	'TEMPLATE_DELETED_FS'		=> 'Template set removed from database but some files may remain on the filesystem.',
-	'TEMPLATE_DETAILS_UPDATED'	=> 'Template details successfully updated.',
-	'TEMPLATE_EDITOR'			=> 'Raw HTML template editor',
-	'TEMPLATE_EDITOR_HEIGHT'	=> 'Template editor height',
-	'TEMPLATE_ERR_ARCHIVE'		=> 'Please select an archive method.',
-	'TEMPLATE_ERR_CACHE_READ'	=> 'The cache directory used to store cached versions of template files could not be opened.',
-	'TEMPLATE_ERR_COPY_LONG'	=> 'The copyright can be no longer than 60 characters.',
-	'TEMPLATE_ERR_NAME_CHARS'	=> 'The template name can only contain alphanumeric characters, -, +, _ and space.',
-	'TEMPLATE_ERR_NAME_EXIST'	=> 'A template set with that name already exists.',
-	'TEMPLATE_ERR_NAME_LONG'	=> 'The template name can be no longer than 30 characters.',
-	'TEMPLATE_ERR_NOT_TEMPLATE'	=> 'The archive you specified does not contain a valid template set.',
-	'TEMPLATE_ERR_STYLE_NAME'	=> 'You must supply a name for this template.',
-	'TEMPLATE_EXPORT'			=> 'Export templates',
-	'TEMPLATE_EXPORT_EXPLAIN'	=> 'Here you can export a template set in the form of an archive. This archive will contain all the files necessary to install the templates on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
-	'TEMPLATE_EXPORTED'			=> 'Templates exported successfully and stored in %s.',
-	'TEMPLATE_FILE'				=> 'Template file',
-	'TEMPLATE_FILE_UPDATED'		=> 'Template file updated successfully.',
-	'TEMPLATE_LOCATION'			=> 'Store templates in',
-	'TEMPLATE_LOCATION_EXPLAIN'	=> 'Images are always stored on the filesystem.',
-	'TEMPLATE_NAME'				=> 'Template name',
-
-	'THEME_ADDED'				=> 'New theme added on filesystem.',
-	'THEME_ADDED_DB'			=> 'New theme added to database.',
-	'THEME_CLASS_ADDED'			=> 'Custom class added successfully.',
-	'THEME_DELETED'				=> 'Theme deleted successfully.',
-	'THEME_DELETED_FS'			=> 'Theme removed from database but files remain on the filesystem.',
-	'THEME_DETAILS_UPDATED'		=> 'Theme details successfully updated.',
-	'THEME_EDITOR'				=> 'Theme editor',
-	'THEME_EDITOR_HEIGHT'		=> 'Theme editor height',
-	'THEME_ERR_ARCHIVE'			=> 'Please select an archive method.',
-	'THEME_ERR_CLASS_CHARS'		=> 'Only alphanumeric characters plus ., :, -, _ and # are valid in class names.',
-	'THEME_ERR_COPY_LONG'		=> 'The copyright can be no longer than 60 characters.',
-	'THEME_ERR_NAME_CHARS'		=> 'The theme name can only contain alphanumeric characters, -, +, _ and space.',
-	'THEME_ERR_NAME_EXIST'		=> 'A theme with that name already exists.',
-	'THEME_ERR_NAME_LONG'		=> 'The theme name can be no longer than 30 characters.',
-	'THEME_ERR_NOT_THEME'		=> 'The archive you specified does not contain a valid theme.',
-	'THEME_ERR_REFRESH_FS'		=> 'This theme is stored on the filesystem so there is no need to refresh it.',
-	'THEME_ERR_STYLE_NAME'		=> 'You must supply a name for this theme.',
-	'THEME_FILE'				=> 'Theme file',
-	'THEME_EXPORT'				=> 'Export Theme',
-	'THEME_EXPORT_EXPLAIN'		=> 'Here you can export a theme in the form of an archive. This archive will contain all the data necessary to install the theme on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
-	'THEME_EXPORTED'			=> 'Theme exported successfully and stored in %s.',
-	'THEME_LOCATION'			=> 'Store stylesheet in',
-	'THEME_LOCATION_EXPLAIN'	=> 'Images are always stored on the filesystem.',
-	'THEME_NAME'				=> 'Theme name',
-	'THEME_REFRESHED'			=> 'Theme refreshed successfully.',
-	'THEME_UPDATED'				=> 'Theme updated successfully.',
-
-	'UNDERLINE'				=> 'Underline',
-	'UNINSTALLED_IMAGESET'	=> 'Uninstalled imagesets',
-	'UNINSTALLED_STYLE'		=> 'Uninstalled styles',
-	'UNINSTALLED_TEMPLATE'	=> 'Uninstalled templates',
-	'UNINSTALLED_THEME'		=> 'Uninstalled themes',
-	'UNSET'					=> 'Undefined',
-
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
deleted file mode 100644
index dc28032483..0000000000
--- a/phpBB/language/en/acp/users.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
-*
-* acp_users [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ADMIN_SIG_PREVIEW'		=> 'Signature preview',
-	'AT_LEAST_ONE_FOUNDER'	=> 'You are not able to change this founder to a normal user. There needs to be at least one founder enabled for this board. If you want to change this users founder status, promote another user to be a founder first.',
-
-	'BAN_ALREADY_ENTERED'	=> 'The ban had been previously entered successfully. The ban list has not been updated.',
-	'BAN_SUCCESSFUL'		=> 'Ban entered successfully.',
-
-	'CANNOT_BAN_FOUNDER'			=> 'You are not allowed to ban founder accounts.',
-	'CANNOT_BAN_YOURSELF'			=> 'You are not allowed to ban yourself.',
-	'CANNOT_DEACTIVATE_BOT'			=> 'You are not allowed to deactivate bot accounts. Please deactivate the bot within the bots page instead.',
-	'CANNOT_DEACTIVATE_FOUNDER'		=> 'You are not allowed to deactivate founder accounts.',
-	'CANNOT_DEACTIVATE_YOURSELF'	=> 'You are not allowed to deactivate your own account.',
-	'CANNOT_FORCE_REACT_BOT'		=> 'You are not allowed to force reactivation on bot accounts. Please reactivate the bot within the bots page instead.',
-	'CANNOT_FORCE_REACT_FOUNDER'	=> 'You are not allowed to force reactivation on founder accounts.',
-	'CANNOT_FORCE_REACT_YOURSELF'	=> 'You are not allowed to force reactivation of your own account.',
-	'CANNOT_REMOVE_ANONYMOUS'		=> 'You are not able to remove the guest user account.',
-	'CANNOT_REMOVE_YOURSELF'		=> 'You are not allowed to remove your own user account.',
-	'CANNOT_SET_FOUNDER_IGNORED'	=> 'You are not able to promote ignored users to be founders.',
-	'CANNOT_SET_FOUNDER_INACTIVE'	=> 'You need to activate users before you promote them to founders, only activated users are able to be promoted.',
-	'CONFIRM_EMAIL_EXPLAIN'			=> 'You only need to specify this if you are changing the users e-mail address.',
-
-	'DELETE_POSTS'			=> 'Delete posts',
-	'DELETE_USER'			=> 'Delete user',
-	'DELETE_USER_EXPLAIN'	=> 'Please note that deleting a user is final, they cannot be recovered.',
-
-	'FORCE_REACTIVATION_SUCCESS'	=> 'Successfully forced reactivation.',
-	'FOUNDER'						=> 'Founder',
-	'FOUNDER_EXPLAIN'				=> 'Founders have all administrative permissions and can never be banned, deleted or altered by non-founder members.',
-
-	'GROUP_APPROVE'					=> 'Approve member',
-	'GROUP_DEFAULT'					=> 'Make group default for member',
-	'GROUP_DELETE'					=> 'Remove member from group',
-	'GROUP_DEMOTE'					=> 'Demote group leader',
-	'GROUP_PROMOTE'					=> 'Promote to group leader',
-
-	'IP_WHOIS_FOR'			=> 'IP whois for %s',
-
-	'LAST_ACTIVE'			=> 'Last active',
-
-	'MOVE_POSTS_EXPLAIN'	=> 'Please select the forum to which you wish to move all the posts this user has made.',
-
-	'NO_SPECIAL_RANK'		=> 'No special rank assigned',
-	'NOT_MANAGE_FOUNDER'	=> 'You tried to manage a user with founder status. Only founders are allowed to manage other founders.',
-
-	'QUICK_TOOLS'			=> 'Quick tools',
-
-	'REGISTERED'			=> 'Registered',
-	'REGISTERED_IP'			=> 'Registered from IP',
-	'RETAIN_POSTS'			=> 'Retain posts',
-
-	'SELECT_FORM'			=> 'Select form',
-	'SELECT_USER'			=> 'Select user',
-
-	'USER_ADMIN'					=> 'User administration',
-	'USER_ADMIN_ACTIVATE'			=> 'Activate account',
-	'USER_ADMIN_ACTIVATED'			=> 'User activated successfully.',
-	'USER_ADMIN_AVATAR_REMOVED'		=> 'Successfully removed avatar from user account.',
-	'USER_ADMIN_BAN_EMAIL'			=> 'Ban by e-mail',
-	'USER_ADMIN_BAN_EMAIL_REASON'	=> 'E-mail address banned via user management',
-	'USER_ADMIN_BAN_IP'				=> 'Ban by IP',
-	'USER_ADMIN_BAN_IP_REASON'		=> 'IP banned via user management',
-	'USER_ADMIN_BAN_NAME_REASON'	=> 'Username banned via user management',
-	'USER_ADMIN_BAN_USER'			=> 'Ban by username',
-	'USER_ADMIN_DEACTIVATE'			=> 'Deactivate account',
-	'USER_ADMIN_DEACTIVED'			=> 'User deactivated successfully.',
-	'USER_ADMIN_DEL_ATTACH'			=> 'Delete all attachments',
-	'USER_ADMIN_DEL_AVATAR'			=> 'Delete avatar',
-	'USER_ADMIN_DEL_POSTS'			=> 'Delete all posts',
-	'USER_ADMIN_DEL_SIG'			=> 'Delete signature',
-	'USER_ADMIN_EXPLAIN'			=> 'Here you can change your users information and certain specific options.',
-	'USER_ADMIN_FORCE'				=> 'Force reactivation',
-	'USER_ADMIN_MOVE_POSTS'			=> 'Move all posts',
-	'USER_ADMIN_SIG_REMOVED'		=> 'Successfully removed signature from user account.',
-	'USER_ATTACHMENTS_REMOVED'		=> 'Successfully removed all attachments made by this user.',
-	'USER_AVATAR_UPDATED'			=> 'Successfully updated user avatars details.',
-	'USER_CUSTOM_PROFILE_FIELDS'	=> 'Custom profile fields',
-	'USER_DELETED'					=> 'User deleted successfully.',
-	'USER_GROUP_ADD'				=> 'Add user to group',
-	'USER_GROUP_NORMAL'				=> 'User defined groups user is a member of',
-	'USER_GROUP_PENDING'			=> 'Groups user is in pending mode',
-	'USER_GROUP_SPECIAL'			=> 'Pre-defined groups user is a member of',
-	'USER_NO_ATTACHMENTS'			=> 'There are no attached files to display.',
-	'USER_OVERVIEW_UPDATED'			=> 'User details updated.',
-	'USER_POSTS_DELETED'			=> 'Successfully removed all posts made by this user.',
-	'USER_POSTS_MOVED'				=> 'Successfully moved users posts to target forum.',
-	'USER_PREFS_UPDATED'			=> 'User preferences updated.',
-	'USER_PROFILE'					=> 'User profile',
-	'USER_PROFILE_UPDATED'			=> 'User profile updated.',
-	'USER_RANK'						=> 'User rank',
-	'USER_RANK_UPDATED'				=> 'User rank updated.',
-	'USER_SIG_UPDATED'				=> 'User signature successfully updated.',
-	'USER_TOOLS'					=> 'Basic tools',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
deleted file mode 100644
index 657df9301b..0000000000
--- a/phpBB/language/en/common.php
+++ /dev/null
@@ -1,913 +0,0 @@
-<?php
-/**
-*
-* common [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-//
-// Some characters you may want to copy&paste:
-// ’ » “ ” …
-//
-
-$lang = array_merge($lang, array(
-	'TRANSLATION_INFO'	=> '',
-	'DIRECTION'			=> 'ltr',
-	'DATE_FORMAT'		=> '|d M Y|',	// 01 Jan 2007 (with Relative days enabled)
-	'USER_LANG'			=> 'en-gb',
-
-	'1_DAY'			=> '1 day',
-	'1_MONTH'		=> '1 month',
-	'1_YEAR'		=> '1 year',
-	'2_WEEKS'		=> '2 weeks',
-	'3_MONTHS'		=> '3 months',
-	'6_MONTHS'		=> '6 months',
-	'7_DAYS'		=> '7 days',
-
-	'ACCOUNT_ALREADY_ACTIVATED'		=> 'Your account has already been activated.',
-	'ACCOUNT_DEACTIVATED'			=> 'Your account has been manually deactivated and is only able to be reactivated by an administrator.',
-	'ACCOUNT_NOT_ACTIVATED'			=> 'Your account has not been activated yet.',
-	'ACP'							=> 'Administration Control Panel',
-	'ACTIVE'						=> 'active',
-	'ACTIVE_ERROR'					=> 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.',
-	'ADMINISTRATOR'					=> 'Administrator',
-	'ADMINISTRATORS'				=> 'Administrators',
-	'AGE'							=> 'Age',
-	'AIM'							=> 'AIM',
-	'ALLOWED'						=> 'Allowed',
-	'ALL_FILES'						=> 'All files',
-	'ALL_FORUMS'					=> 'All forums',
-	'ALL_MESSAGES'					=> 'All messages',
-	'ALL_POSTS'						=> 'All posts',
-	'ALL_TIMES'						=> 'All times are %1$s %2$s',
-	'ALL_TOPICS'					=> 'All Topics',
-	'AND'							=> 'And',
-	'ARE_WATCHING_FORUM'			=> 'You have subscribed to be notified of new posts in this forum.',
-	'ARE_WATCHING_TOPIC'			=> 'You have subscribed to be notified of new posts in this topic.',
-	'ASCENDING'						=> 'Ascending',
-	'ATTACHMENTS'					=> 'Attachments',
-	'ATTACHED_IMAGE_NOT_IMAGE'		=> 'The image file you tried to attach is invalid.',
-	'AUTHOR'						=> 'Author',
-	'AUTH_NO_PROFILE_CREATED'		=> 'The creation of a user profile was unsuccessful.',
-	'AVATAR_DISALLOWED_CONTENT'		=> 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
-	'AVATAR_DISALLOWED_EXTENSION'	=> 'This file cannot be displayed because the extension <strong>%s</strong> is not allowed.',
-	'AVATAR_EMPTY_REMOTE_DATA'		=> 'The specified avatar could not be uploaded because the remote data appears to be invalid or corrupted.',
-	'AVATAR_EMPTY_FILEUPLOAD'		=> 'The uploaded avatar file is empty.',
-	'AVATAR_INVALID_FILENAME'		=> '%s is an invalid filename.',
-	'AVATAR_NOT_UPLOADED'			=> 'Avatar could not be uploaded.',
-	'AVATAR_NO_SIZE'				=> 'The width or height of the linked avatar could not be determined. Please enter them manually.',
-	'AVATAR_PARTIAL_UPLOAD'			=> 'The specified file was only partially uploaded.',
-	'AVATAR_PHP_SIZE_NA'			=> 'The avatar’s filesize is too large.<br />The maximum allowed filesize set in php.ini could not be determined.',
-	'AVATAR_PHP_SIZE_OVERRUN'		=> 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
-	'AVATAR_URL_INVALID'			=> 'The URL you specified is invalid.',
-	'AVATAR_URL_NOT_FOUND'			=> 'The file specified could not be found.',
-	'AVATAR_WRONG_FILESIZE'			=> 'The avatar’s filesize must be between 0 and %1d %2s.',
-	'AVATAR_WRONG_SIZE'				=> 'The submitted avatar is %5$d pixels wide and %6$d pixels high. Avatars must be at least %1$d pixels wide and %2$d pixels high, but no larger than %3$d pixels wide and %4$d pixels high.',
-
-	'BACK_TO_TOP'			=> 'Top',
-	'BACK_TO_PREV'			=> 'Back to previous page',
-	'BAN_TRIGGERED_BY_EMAIL'=> 'A ban has been issued on your e-mail address.',
-	'BAN_TRIGGERED_BY_IP'	=> 'A ban has been issued on your IP address.',
-	'BAN_TRIGGERED_BY_USER'	=> 'A ban has been issued on your username.',
-	'BBCODE_GUIDE'			=> 'BBCode guide',
-	'BCC'					=> 'BCC',
-	'BIRTHDAYS'				=> 'Birthdays',
-	'BOARD_BAN_PERM'		=> 'You have been <strong>permanently</strong> banned from this board.<br /><br />Please contact the %2$sBoard Administrator%3$s for more information.',
-	'BOARD_BAN_REASON'		=> 'Reason given for ban: <strong>%s</strong>',
-	'BOARD_BAN_TIME'		=> 'You have been banned from this board until <strong>%1$s</strong>.<br /><br />Please contact the %2$sBoard Administrator%3$s for more information.',
-	'BOARD_DISABLE'			=> 'Sorry but this board is currently unavailable.',
-	'BOARD_DISABLED'		=> 'This board is currently disabled.',
-	'BOARD_UNAVAILABLE'		=> 'Sorry but the board is temporarily unavailable, please try again in a few minutes.',
-	'BROWSING_FORUM_GUESTS'	=> array(
-		0		=> 'Users browsing this forum: %1$s and %2$d guest',
-		2		=> 'Users browsing this forum: %1$s and %2$d guests',
-	),
-	'BYTES'					=> 'Bytes',
-
-	'CANCEL'				=> 'Cancel',
-	'CHANGE'				=> 'Change',
-	'CHANGE_FONT_SIZE'		=> 'Change font size',
-	'CHANGING_PREFERENCES'	=> 'Changing board preferences',
-	'CHANGING_PROFILE'		=> 'Changing profile settings',
-	'CLICK_VIEW_PRIVMSG'	=> '%sGo to your inbox%s',
-	'COLLAPSE_VIEW'			=> 'Collapse view',
-	'CLOSE_WINDOW'			=> 'Close window',
-	'COLOUR_SWATCH'			=> 'Colour swatch',
-	'COMMA_SEPARATOR'		=> ', ',	// Used in pagination of ACP & prosilver, use localised comma if appropriate, eg: Ideographic or Arabic
-	'CONFIRM'				=> 'Confirm',
-	'CONFIRM_CODE'			=> 'Confirmation code',
-	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as it appears. All letters are case insensitive, there is no zero.',
-	'CONFIRM_CODE_WRONG'	=> 'The confirmation code you entered was incorrect.',
-	'CONFIRM_OPERATION'		=> 'Are you sure you wish to carry out this operation?',
-	'CONGRATULATIONS'		=> 'Congratulations to',
-	'CONNECTION_FAILED'		=> 'Connection failed.',
-	'CONNECTION_SUCCESS'	=> 'Connection was successful!',
-	'CONTINUE_UPDATE'			=> 'Back',
-	'COOKIES_DELETED'		=> 'All board cookies successfully deleted.',
-	'CURRENT_TIME'			=> 'It is currently %s',
-
-	'DAY'					=> 'Day',
-	'DAYS'					=> 'Days',
-	'DELETE'				=> 'Delete',
-	'DELETE_ALL'			=> 'Delete all',
-	'DELETE_COOKIES'		=> 'Delete all board cookies',
-	'DELETE_MARKED'			=> 'Delete marked',
-	'DELETE_POST'			=> 'Delete post',
-	'DELIMITER'				=> 'Delimiter',
-	'DESCENDING'			=> 'Descending',
-	'DISABLED'				=> 'Disabled',
-	'DISPLAY'				=> 'Display',
-	'DISPLAY_GUESTS'		=> 'Display guests',
-	'DISPLAY_MESSAGES'		=> 'Display messages from previous',
-	'DISPLAY_POSTS'			=> 'Display posts from previous',
-	'DISPLAY_TOPICS'		=> 'Display topics from previous',
-	'DOWNLOADED'			=> 'Downloaded',
-	'DOWNLOADING_FILE'		=> 'Downloading file',
-	'DOWNLOAD_COUNT'		=> array(
-		0		=> 'Not downloaded yet',
-		1		=> 'Downloaded %d time',
-		2		=> 'Downloaded %d times',
-	),
-	'VIEWED_COUNT'			=> array(
-		0		=> 'Not viewed yet',
-		1		=> 'Viewed %d time',
-		2		=> 'Viewed %d times',
-	),
-
-	'DOWNLOAD_UPDATE_METHOD'			=> 'Download modified files archive',
-	'DOWNLOAD_UPDATE_METHOD_BUTTON'		=> 'Download modified files archive (recommended)',
-	'DOWNLOAD_UPDATE_METHOD_EXPLAIN'	=> 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.',
-
-	'EDIT_POST'							=> 'Edit post',
-	'EMAIL'								=> 'E-mail', // Short form for EMAIL_ADDRESS
-	'EMAIL_ADDRESS'						=> 'E-mail address',
-	'EMAIL_SMTP_ERROR_RESPONSE'			=> 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',
-	'EMPTY_SUBJECT'						=> 'You must specify a subject when posting a new topic.',
-	'EMPTY_MESSAGE_SUBJECT'				=> 'You must specify a subject when composing a new message.',
-	'ENABLED'							=> 'Enabled',
-	'ENCLOSURE'							=> 'Enclosure',
-	'ERR_CHANGING_DIRECTORY'			=> 'Unable to change directory.',
-	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',
-	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
-	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
-	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
-	'ERR_UNWATCHING'					=> 'An error occured while trying to unsubscribe.',
-	'ERR_WATCHING'						=> 'An error occured while trying to subscribe.',
-	'ERR_WRONG_PATH_TO_PHPBB'			=> 'The phpBB path specified appears to be invalid.',
-	'EXPAND_VIEW'						=> 'Expand view',
-	'EXTENSION'							=> 'Extension',
-	'EXTENSION_DISABLED_AFTER_POSTING'	=> 'The extension <strong>%s</strong> has been deactivated and can no longer be displayed.',
-
-	'FAQ'					=> 'FAQ',
-	'FAQ_EXPLAIN'			=> 'Frequently Asked Questions',
-	'FILENAME'				=> 'Filename',
-	'FILESIZE'				=> 'File size',
-	'FILEDATE'				=> 'File date',
-	'FILE_COMMENT'			=> 'File comment',
-	'FILE_NOT_FOUND'		=> 'The requested file could not be found.',
-	'FIND_USERNAME'			=> 'Find a member',
-	'FOLDER'				=> 'Folder',
-	'FORGOT_PASS'			=> 'I forgot my password',
-	'FORM_INVALID'			=> 'The submitted form was invalid. Try submitting again.',
-	'FORUM'					=> 'Forum',
-	'FORUMS'				=> 'Forums',
-	'FORUMS_MARKED'			=> 'All forums have been marked read.',
-	'FORUM_CAT'				=> 'Forum category',
-	'FORUM_INDEX'			=> 'Board index',
-	'FORUM_LINK'			=> 'Forum link',
-	'FORUM_LOCATION'		=> 'Forum location',
-	'FORUM_LOCKED'			=> 'Forum locked',
-	'FORUM_RULES'			=> 'Forum rules',
-	'FORUM_RULES_LINK'		=> 'Please click here to view the forum rules',
-	'FROM'					=> 'from',
-	'FSOCK_DISABLED'		=> 'The operation could not be completed because the <var>fsockopen</var> function has been disabled or the server being queried could not be found.',
-
-	'FTP_SETTINGS'					=> 'FTP settings',
-	'FTP_UPDATE_METHOD'				=> 'FTP upload',
-
-	'FTP_FSOCK_HOST'				=> 'FTP host',
-	'FTP_FSOCK_HOST_EXPLAIN'		=> 'FTP server used to connect your site.',
-	'FTP_FSOCK_PASSWORD'			=> 'FTP password',
-	'FTP_FSOCK_PASSWORD_EXPLAIN'	=> 'Password for your FTP username.',
-	'FTP_FSOCK_PORT'				=> 'FTP port',
-	'FTP_FSOCK_PORT_EXPLAIN'		=> 'Port used to connect to your server.',
-	'FTP_FSOCK_ROOT_PATH'			=> 'Path to phpBB',
-	'FTP_FSOCK_ROOT_PATH_EXPLAIN'	=> 'Path from the root to your phpBB board.',
-	'FTP_FSOCK_TIMEOUT'				=> 'FTP timeout',
-	'FTP_FSOCK_TIMEOUT_EXPLAIN'		=> 'The amount of time, in seconds, that the system will wait for a reply from your server.',
-	'FTP_FSOCK_USERNAME'			=> 'FTP username',
-	'FTP_FSOCK_USERNAME_EXPLAIN'	=> 'Username used to connect to your server.',
-
-	'FTP_HOST'					=> 'FTP host',
-	'FTP_HOST_EXPLAIN'			=> 'FTP server used to connect your site.',
-	'FTP_PASSWORD'				=> 'FTP password',
-	'FTP_PASSWORD_EXPLAIN'		=> 'Password for your FTP username.',
-	'FTP_PORT'					=> 'FTP port',
-	'FTP_PORT_EXPLAIN'			=> 'Port used to connect to your server.',
-	'FTP_ROOT_PATH'				=> 'Path to phpBB',
-	'FTP_ROOT_PATH_EXPLAIN'		=> 'Path from the root to your phpBB board.',
-	'FTP_TIMEOUT'				=> 'FTP timeout',
-	'FTP_TIMEOUT_EXPLAIN'		=> 'The amount of time, in seconds, that the system will wait for a reply from your server.',
-	'FTP_USERNAME'				=> 'FTP username',
-	'FTP_USERNAME_EXPLAIN'		=> 'Username used to connect to your server.',
-
-	'SFTP_HOST'					=> 'SFTP host',
-	'SFTP_HOST_EXPLAIN'			=> 'SFTP server used to connect your site.',
-	'SFTP_PASSWORD'				=> 'SFTP password',
-	'SFTP_PASSWORD_EXPLAIN'		=> 'Password for your SFTP username.',
-	'SFTP_PORT'					=> 'SFTP port',
-	'SFTP_PORT_EXPLAIN'			=> 'Port used to connect to your server.',
-	'SFTP_ROOT_PATH'			=> 'Path to phpBB',
-	'SFTP_ROOT_PATH_EXPLAIN'	=> 'Path from the root to your phpBB board.',
-	'SFTP_TIMEOUT'				=> 'SFTP timeout',
-	'SFTP_TIMEOUT_EXPLAIN'		=> 'The amount of time, in seconds, that the system will wait for a reply from your server.',
-	'SFTP_USERNAME'				=> 'SFTP username',
-	'SFTP_USERNAME_EXPLAIN'		=> 'Username used to connect to your server.',
-
-	'GENERAL_ERROR'				=> 'General Error',
-	'GB'						=> 'GB',
-	'GIB'						=> 'GiB',
-	'GO'						=> 'Go',
-	'GOTO_PAGE'					=> 'Go to page',
-	'GROUP'						=> 'Group',
-	'GROUPS'					=> 'Groups',
-	'GROUP_ERR_TYPE'			=> 'Inappropriate group type specified.',
-	'GROUP_ERR_USERNAME'		=> 'No group name specified.',
-	'GROUP_ERR_USER_LONG'		=> 'Group names cannot exceed 60 characters. The specified group name is too long.',
-	'GUEST'						=> 'Guest',
-	'GUEST_USERS_ONLINE'		=> 'There are %d guest users online',
-	'GUEST_USERS_ZERO_ONLINE'	=> 'There are 0 guest users online',
-	'GUEST_USER_ONLINE'			=> 'There is %d guest user online',
-
-	'GUEST_USER_COUNT'			=> array(
-		0		=> '%d guests',
-		1		=> '%d guest',
-		2		=> '%d guests',
-	),
-
-	'G_ADMINISTRATORS'			=> 'Administrators',
-	'G_BOTS'					=> 'Bots',
-	'G_GUESTS'					=> 'Guests',
-	'G_REGISTERED'				=> 'Registered users',
-	'G_REGISTERED_COPPA'		=> 'Registered COPPA users',
-	'G_GLOBAL_MODERATORS'		=> 'Global moderators',
-
-	'HIDDEN_USERS_ONLINE'		=> '%d hidden users online',
-	'HIDDEN_USERS_ZERO_ONLINE'	=> '0 hidden users online',
-	'HIDDEN_USER_ONLINE'		=> '%d hidden user online',
-
-	'HIDDEN_USER_COUNT'			=> array(
-		0			=> '%d hidden and ',
-	),
-
-	'HIDE_GUESTS'				=> 'Hide guests',
-	'HIDE_ME'					=> 'Hide my online status this session',
-	'HOURS'						=> 'Hours',
-	'HOME'						=> 'Home',
-
-	'ICQ'						=> 'ICQ',
-	'ICQ_STATUS'				=> 'ICQ status',
-	'IF'						=> 'If',
-	'IMAGE'						=> 'Image',
-	'IMAGE_FILETYPE_INVALID'	=> 'Image file type %d for mimetype %s not supported.',
-	'IMAGE_FILETYPE_MISMATCH'	=> 'Image file type mismatch: expected extension %1$s but extension %2$s given.',
-	'IN'						=> 'in',
-	'INDEX'						=> 'Index page',
-	'INFORMATION'				=> 'Information',
-	'INTERESTS'					=> 'Interests',
-	'INVALID_DIGEST_CHALLENGE'	=> 'Invalid digest challenge.',
-	'INVALID_EMAIL_LOG'			=> '<strong>%s</strong> possibly an invalid e-mail address?',
-	'IP'						=> 'IP',
-	'IP_BLACKLISTED'			=> 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.',
-
-	'JABBER'				=> 'Jabber',
-	'JOINED'				=> 'Joined',
-	'JUMP_PAGE'				=> 'Enter the page number you wish to go to',
-	'JUMP_TO'				=> 'Jump to',
-	'JUMP_TO_PAGE'			=> 'Click to jump to page…',
-
-	'KB'					=> 'KB',
-	'KIB'					=> 'KiB',
-
-	'LAST_POST'							=> 'Last post',
-	'LAST_UPDATED'						=> 'Last updated',
-	'LAST_VISIT'						=> 'Last visit',
-	'LDAP_NO_LDAP_EXTENSION'			=> 'LDAP extension not available.',
-	'LDAP_NO_SERVER_CONNECTION'			=> 'Could not connect to LDAP server.',
-	'LEGEND'							=> 'Legend',
-	'LOCATION'							=> 'Location',
-	'LOCK_POST'							=> 'Lock post',
-	'LOCK_POST_EXPLAIN'					=> 'Prevent editing',
-	'LOCK_TOPIC'						=> 'Lock topic',
-	'LOGIN'								=> 'Login',
-	'LOGIN_CHECK_PM'					=> 'Log in to check your private messages.',
-	'LOGIN_CONFIRMATION'				=> 'Confirmation of login',
-	'LOGIN_CONFIRM_EXPLAIN'				=> 'To prevent brute forcing accounts the board requires you to enter a confirmation code after a maximum amount of failed logins. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
-	'LOGIN_ERROR_ATTEMPTS'				=> 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now also have to enter the confirm code from the image you see below.',
-	'LOGIN_ERROR_EXTERNAL_AUTH_APACHE'	=> 'You have not been authenticated by Apache.',
-	'LOGIN_ERROR_PASSWORD'				=> 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
-	'LOGIN_ERROR_PASSWORD_CONVERT'		=> 'It was not possible to convert your password when updating this bulletin board’s software. Please %srequest a new password%s. If you continue to have problems please contact the %sBoard Administrator%s.',
-	'LOGIN_ERROR_USERNAME'				=> 'You have specified an incorrect username. Please check your username and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
-	'LOGIN_FORUM'						=> 'To view or post in this forum you must enter its password.',
-	'LOGIN_INFO'						=> 'In order to login you must be registered. Registering takes only a few moments but gives you increased capabilities. The board administrator may also grant additional permissions to registered users. Before you register please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.',
-	'LOGIN_VIEWFORUM'					=> 'The board requires you to be registered and logged in to view this forum.',
-	'LOGIN_EXPLAIN_EDIT'				=> 'In order to edit posts in this forum you have to be registered and logged in.',
-	'LOGIN_EXPLAIN_VIEWONLINE'			=> 'In order to view the online list you have to be registered and logged in.',
-	'LOGOUT'							=> 'Logout',
-	'LOGOUT_USER'						=> 'Logout [ %s ]',
-	'LOG_ME_IN'							=> 'Log me on automatically each visit',
-
-	'MAPPING_FILE_STRUCTURE'	=> 'To ease the upload here are the file locations which map your phpBB installation.',
-	'MARK'					=> 'Mark',
-	'MARK_ALL'				=> 'Mark all',
-	'MARK_FORUMS_READ'		=> 'Mark forums read',
-	'MB'					=> 'MB',
-	'MIB'					=> 'MiB',
-	'MCP'					=> 'Moderator Control Panel',
-	'MEMBERLIST'			=> 'Members',
-	'MEMBERLIST_EXPLAIN'	=> 'View complete list of members',
-	'MERGE'					=> 'Merge',
-	'MERGE_POSTS'			=> 'Merge posts',
-	'MERGE_TOPIC'			=> 'Merge topic',
-	'MESSAGE'				=> 'Message',
-	'MESSAGES'				=> 'Messages',
-	'MESSAGE_BODY'			=> 'Message body',
-	'MINUTES'				=> 'Minutes',
-	'MODERATE'				=> 'Moderate',
-	'MODERATORS'			=> array(
-		0	=> 'Moderator',
-		2	=> 'Moderators',
-	),
-	'MONTH'					=> 'Month',
-	'MOVE'					=> 'Move',
-	'MSNM'					=> 'MSNM/WLM',
-
-	'NA'						=> 'N/A',
-	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
-	'NEW_MESSAGE'				=> 'New message',
-	'NEW_MESSAGES'				=> 'New messages',
-	'NEW_PM'					=> array(
-		0		=> '<strong>%d</strong> new messages',
-		1		=> '<strong>%d</strong> new message',
-		2		=> '<strong>%d</strong> new messages',
-	),
-	'NEW_POST'					=> 'New post',
-	'NEW_POSTS'					=> 'New posts',
-	'NEXT'						=> 'Next',		// Used in pagination
-	'NEXT_STEP'					=> 'Next',
-	'NEVER'						=> 'Never',
-	'NO'						=> 'No',
-	'NOT_ALLOWED_MANAGE_GROUP'	=> 'You are not allowed to manage this group.',
-	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
-	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
-	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
-	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
-	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
-	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
-	'NO_ACTION'					=> 'No action specified.',
-	'NO_ADMINISTRATORS'			=> 'No administrators assigned at this board.',
-	'NO_AUTH_ADMIN'				=> 'Access to the Administration Control Panel is not allowed as you do not have administrative permissions.',
-	'NO_AUTH_ADMIN_USER_DIFFER'	=> 'You are not able to re-authenticate as a different user.',
-	'NO_AUTH_OPERATION'			=> 'You do not have the necessary permissions to complete this operation.',
-	'NO_CONNECT_TO_SMTP_HOST'	=> 'Could not connect to smtp host : %1$s : %2$s',
-	'NO_BIRTHDAYS'				=> 'No birthdays today',
-	'NO_EMAIL_MESSAGE'			=> 'E-mail message was blank.',
-	'NO_EMAIL_RESPONSE_CODE'	=> 'Could not get mail server response codes.',
-	'NO_EMAIL_SUBJECT'			=> 'No e-mail subject specified.',
-	'NO_FORUM'					=> 'The forum you selected does not exist.',
-	'NO_FORUMS'					=> 'This board has no forums.',
-	'NO_GROUP'					=> 'The requested usergroup does not exist.',
-	'NO_GROUP_MEMBERS'			=> 'This group currently has no members.',
-	'NO_IPS_DEFINED'			=> 'No IP addresses or hostnames defined',
-	'NO_MEMBERS'				=> 'No members found for this search criterion.',
-	'NO_MESSAGES'				=> 'No messages',
-	'NO_MODE'					=> 'No mode specified.',
-	'NO_MODERATORS'				=> 'There are no moderators.',
-	'NO_NEW_MESSAGES'			=> 'No new messages',
-	'NO_NEW_PM'					=> '<strong>0</strong> new messages',
-	'NO_NEW_POSTS'				=> 'No new posts',
-	'NO_ONLINE_USERS'			=> 'No registered users',
-	'NO_POSTS'					=> 'No posts',
-	'NO_POSTS_TIME_FRAME'		=> 'No posts exist inside this topic for the selected time frame.',
-	'NO_SUBJECT'				=> 'No subject specified',								// Used for posts having no subject defined but displayed within management pages.
-	'NO_SUCH_SEARCH_MODULE'		=> 'The specified search backend doesn’t exist.',
-	'NO_SUPPORTED_AUTH_METHODS'	=> 'No supported authentication methods.',
-	'NO_TOPIC'					=> 'The requested topic does not exist.',
-	'NO_TOPIC_FORUM'			=> 'The topic or forum no longer exists.',
-	'NO_TOPICS'					=> 'There are no topics or posts in this forum.',
-	'NO_TOPICS_TIME_FRAME'		=> 'No topics exist inside this forum for the selected time frame.',
-	'NO_UNREAD_PM'				=> '<strong>0</strong> unread messages',
-	'NO_UPLOAD_FORM_FOUND'		=> 'Upload initiated but no valid file upload form found.',
-	'NO_USER'					=> 'The requested user does not exist.',
-	'NO_USERS'					=> 'The requested users do not exist.',
-	'NO_USER_SPECIFIED'			=> 'No username was specified.',
-
-	// Nullar/Singular/Plural language entry. The key numbers define the number range in which a certain grammatical expression is valid.
-	'NUM_POSTS_IN_QUEUE'		=> array(
-		0			=> 'No posts in queue',		// 0
-		1			=> '1 post in queue',		// 1
-		2			=> '%d posts in queue',		// 2+
-	),
-
-	'OCCUPATION'				=> 'Occupation',
-	'OFFLINE'					=> 'Offline',
-	'ONLINE'					=> 'Online',
-	'ONLINE_BUDDIES'			=> 'Online friends',
-
-	'ONLINE_USER_COUNT'			=> array(
-		0		=> 'In total there are <strong>0</strong> users online :: ',
-		1		=> 'In total there is <strong>%d</strong> user online :: ',
-		2		=> 'In total there are <strong>%d</strong> users online :: ',
-	),
-	'OPTIONS'					=> 'Options',
-
-	'PAGE_OF'				=> 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
-	'PASSWORD'				=> 'Password',
-	'PLAY_QUICKTIME_FILE'	=> 'Play Quicktime file',
-	'PM'					=> 'PM',
-	'POSTING_MESSAGE'		=> 'Posting message in %s',
-	'POSTING_PRIVATE_MESSAGE'	=> 'Composing private message',
-	'POST'					=> 'Post',
-	'POST_ANNOUNCEMENT'		=> 'Announce',
-	'POST_STICKY'			=> 'Sticky',
-	'POSTED'				=> 'Posted',
-	'POSTED_IN_FORUM'		=> 'in',
-	'POSTED_ON_DATE'		=> 'on',
-	'POSTS'					=> 'Posts',
-	'POSTS_UNAPPROVED'		=> 'At least one post in this topic has not been approved.',
-	'POST_BY_AUTHOR'		=> 'by',
-	'POST_BY_FOE'			=> 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. %2$sDisplay this post%3$s.',
-	'POST_DAY'				=> '%.2f posts per day',
-	'POST_DETAILS'			=> 'Post details',
-	'POST_NEW_TOPIC'		=> 'Post new topic',
-	'POST_PCT'				=> '%.2f%% of all posts',
-	'POST_PCT_ACTIVE'		=> '%.2f%% of user’s posts',
-	'POST_PCT_ACTIVE_OWN'	=> '%.2f%% of your posts',
-	'POST_REPLY'			=> 'Post a reply',
-	'POST_REPORTED'			=> 'Click to view report',
-	'POST_SUBJECT'			=> 'Post subject',
-	'POST_TIME'				=> 'Post time',
-	'POST_TOPIC'			=> 'Post a new topic',
-	'POST_UNAPPROVED'		=> 'This post is waiting for approval',
-	'PREVIEW'				=> 'Preview',
-	'PREVIOUS'				=> 'Previous',		// Used in pagination
-	'PREVIOUS_STEP'			=> 'Previous',
-	'PRIVACY'				=> 'Privacy policy',
-	'PRIVATE_MESSAGE'		=> 'Private message',
-	'PRIVATE_MESSAGES'		=> 'Private messages',
-	'PRIVATE_MESSAGING'		=> 'Private messaging',
-	'PROFILE'				=> 'User Control Panel',
-
-	'READING_FORUM'				=> 'Viewing topics in %s',
-	'READING_GLOBAL_ANNOUNCE'	=> 'Reading global announcement',
-	'READING_LINK'				=> 'Following forum link %s',
-	'READING_TOPIC'				=> 'Reading topic in %s',
-	'READ_PROFILE'				=> 'Profile',
-	'REASON'					=> 'Reason',
-	'RECORD_ONLINE_USERS'		=> 'Most users ever online was <strong>%1$s</strong> on %2$s',
-	'REDIRECT'					=> 'Redirect',
-	'REDIRECTS'					=> 'Total redirects',
-	'REGISTER'					=> 'Register',
-	'REGISTERED_USERS'			=> 'Registered users:',
-	'REG_USERS_ONLINE'			=> 'There are %d registered users and ',
-	'REG_USERS_ZERO_ONLINE'		=> 'There are 0 registered users and ',
-
-	'REG_USER_COUNT'			=> array(
-		0			=> '%d registered, ',
-	),
-
-	'REG_USER_ONLINE'			=> 'There is %d registered user and ',
-	'REMOVE'					=> 'Remove',
-	'REMOVE_INSTALL'			=> 'Please delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.',
-	'REPLIES'					=> 'Replies',
-	'REPLY_WITH_QUOTE'			=> 'Reply with quote',
-	'REPLYING_GLOBAL_ANNOUNCE'	=> 'Replying to global announcement',
-	'REPLYING_MESSAGE'			=> 'Replying to message in %s',
-	'REPORT_BY'					=> 'Report by',
-	'REPORT_POST'				=> 'Report this post',
-	'REPORTING_POST'			=> 'Reporting post',
-	'RESEND_ACTIVATION'			=> 'Resend activation e-mail',
-	'RESET'						=> 'Reset',
-	'RESTORE_PERMISSIONS'		=> 'Restore permissions',
-	'RETURN_INDEX'				=> '%sReturn to the index page%s',
-	'RETURN_FORUM'				=> '%sReturn to the forum last visited%s',
-	'RETURN_PAGE'				=> '%sReturn to the previous page%s',
-	'RETURN_TOPIC'				=> '%sReturn to the topic last visited%s',
-	'RETURN_TO'					=> 'Return to',
-	'RULES_ATTACH_CAN'			=> 'You <strong>can</strong> post attachments in this forum',
-	'RULES_ATTACH_CANNOT'		=> 'You <strong>cannot</strong> post attachments in this forum',
-	'RULES_DELETE_CAN'			=> 'You <strong>can</strong> delete your posts in this forum',
-	'RULES_DELETE_CANNOT'		=> 'You <strong>cannot</strong> delete your posts in this forum',
-	'RULES_DOWNLOAD_CAN'		=> 'You <strong>can</strong> download attachments in this forum',
-	'RULES_DOWNLOAD_CANNOT'		=> 'You <strong>cannot</strong> download attachments in this forum',
-	'RULES_EDIT_CAN'			=> 'You <strong>can</strong> edit your posts in this forum',
-	'RULES_EDIT_CANNOT'			=> 'You <strong>cannot</strong> edit your posts in this forum',
-	'RULES_LOCK_CAN'			=> 'You <strong>can</strong> lock your topics in this forum',
-	'RULES_LOCK_CANNOT'			=> 'You <strong>cannot</strong> lock your topics in this forum',
-	'RULES_POST_CAN'			=> 'You <strong>can</strong> post new topics in this forum',
-	'RULES_POST_CANNOT'			=> 'You <strong>cannot</strong> post new topics in this forum',
-	'RULES_REPLY_CAN'			=> 'You <strong>can</strong> reply to topics in this forum',
-	'RULES_REPLY_CANNOT'		=> 'You <strong>cannot</strong> reply to topics in this forum',
-	'RULES_VOTE_CAN'			=> 'You <strong>can</strong> vote in polls in this forum',
-	'RULES_VOTE_CANNOT'			=> 'You <strong>cannot</strong> vote in polls in this forum',
-
-	'SEARCH'					=> 'Search',
-	'SEARCH_MINI'				=> 'Search…',
-	'SEARCH_ADV'				=> 'Advanced search',
-	'SEARCH_ADV_EXPLAIN'		=> 'View the advanced search options',
-	'SEARCH_KEYWORDS'			=> 'Search for keywords',
-	'SEARCHING_FORUMS'			=> 'Searching forums',
-	'SEARCH_ACTIVE_TOPICS'		=> 'View active topics',
-	'SEARCH_FOR'				=> 'Search for',
-	'SEARCH_FORUM'				=> 'Search this forum…',
-	'SEARCH_NEW'				=> 'View new posts',
-	'SEARCH_POSTS_BY'			=> 'Search posts by',
-	'SEARCH_SELF'				=> 'View your posts',
-	'SEARCH_TOPIC'				=> 'Search this topic…',
-	'SEARCH_UNANSWERED'			=> 'View unanswered posts',
-	'SECONDS'					=> 'Seconds',
-	'SELECT'					=> 'Select',
-	'SELECT_ALL_CODE'			=> 'Select all',
-	'SELECT_DESTINATION_FORUM'	=> 'Please select a destination forum',
-	'SELECT_FORUM'				=> 'Select a forum',
-	'SELECT_FTP_SETTINGS'		=> 'Select FTP settings',
-	'SEND_EMAIL'				=> 'E-mail',				// Used for submit buttons
-	'SEND_EMAIL_USER'			=> 'E-mail',				// Used as: {L_SEND_EMAIL_USER} {USERNAME} -> E-mail UserX
-	'SEND_PRIVATE_MESSAGE'		=> 'Send private message',
-	'SETTINGS'					=> 'Settings',
-
-	'SIGNATURE'					=> 'Signature',
-	'SKIP'						=> 'Skip to content',
-	'SMTP_NO_AUTH_SUPPORT'		=> 'SMTP server does not support authentication.',
-	'SORRY_AUTH_READ'			=> 'You are not authorised to read this forum.',
-	'SORRY_AUTH_VIEW_ATTACH'	=> 'You are not authorised to download this attachment.',
-	'SORT_BY'					=> 'Sort by',
-	'SORT_JOINED'				=> 'Joined date',
-	'SORT_LOCATION'				=> 'Location',
-	'SORT_RANK'					=> 'Rank',
-	'SORT_TOPIC_TITLE'			=> 'Topic title',
-	'SORT_USERNAME'				=> 'Username',
-	'SPLIT_TOPIC'				=> 'Split topic',
-	'SQL_ERROR_OCCURRED'		=> 'An SQL error occurred while fetching this page. Please contact the %sBoard Administrator%s if this problem persists.',
-	'STATISTICS'				=> 'Statistics',
-	'START_WATCHING_FORUM'		=> 'Subscribe forum',
-	'START_WATCHING_TOPIC'		=> 'Subscribe topic',
-	'STOP_WATCHING_FORUM'		=> 'Unsubscribe forum',
-	'STOP_WATCHING_TOPIC'		=> 'Unsubscribe topic',
-	'SUBFORUMS'					=> array(
-		0	=> 'Subforum',
-		2	=> 'Subforums',
-	),
-	'SUBJECT'					=> 'Subject',
-	'SUBMIT'					=> 'Submit',
-
-	'TERMS_USE'			=> 'Terms of use',
-	'TEST_CONNECTION'	=> 'Test connection',
-	'THE_TEAM'			=> 'The team',
-	'TIME'				=> 'Time',
-
-	'TOO_LONG'						=> 'The value you entered is too long',
-
-	'TOO_LONG_AIM'					=> 'The screenname you entered is too long.',
-	'TOO_LONG_CONFIRM_CODE'			=> 'The confirm code you entered is too long.',
-	'TOO_LONG_DATEFORMAT'			=> 'The date format you entered is too long.',
-	'TOO_LONG_ICQ'					=> 'The ICQ number you entered is too long.',
-	'TOO_LONG_INTERESTS'			=> 'The interests you entered is too long.',
-	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
-	'TOO_LONG_LOCATION'				=> 'The location you entered is too long.',
-	'TOO_LONG_MSN'					=> 'The MSNM/WLM name you entered is too long.',
-	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
-	'TOO_LONG_OCCUPATION'			=> 'The occupation you entered is too long.',
-	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
-	'TOO_LONG_USER_PASSWORD'		=> 'The password you entered is too long.',
-	'TOO_LONG_USERNAME'				=> 'The username you entered is too long.',
-	'TOO_LONG_EMAIL'				=> 'The e-mail address you entered is too long.',
-	'TOO_LONG_EMAIL_CONFIRM'		=> 'The e-mail address confirmation you entered is too long.',
-	'TOO_LONG_WEBSITE'				=> 'The website address you entered is too long.',
-	'TOO_LONG_YIM'					=> 'The Yahoo! Messenger name you entered is too long.',
-
-	'TOO_MANY_VOTE_OPTIONS'			=> 'You have tried to vote for too many options.',
-
-	'TOO_SHORT'						=> 'The value you entered is too short.',
-
-	'TOO_SHORT_AIM'					=> 'The screenname you entered is too short.',
-	'TOO_SHORT_CONFIRM_CODE'		=> 'The confirm code you entered is too short.',
-	'TOO_SHORT_DATEFORMAT'			=> 'The date format you entered is too short.',
-	'TOO_SHORT_ICQ'					=> 'The ICQ number you entered is too short.',
-	'TOO_SHORT_INTERESTS'			=> 'The interests you entered is too short.',
-	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
-	'TOO_SHORT_LOCATION'			=> 'The location you entered is too short.',
-	'TOO_SHORT_MSN'					=> 'The MSNM/WLM name you entered is too short.',
-	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
-	'TOO_SHORT_OCCUPATION'			=> 'The occupation you entered is too short.',
-	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
-	'TOO_SHORT_USER_PASSWORD'		=> 'The password you entered is too short.',
-	'TOO_SHORT_USERNAME'			=> 'The username you entered is too short.',
-	'TOO_SHORT_EMAIL'				=> 'The e-mail address you entered is too short.',
-	'TOO_SHORT_EMAIL_CONFIRM'		=> 'The e-mail address confirmation you entered is too short.',
-	'TOO_SHORT_WEBSITE'				=> 'The website address you entered is too short.',
-	'TOO_SHORT_YIM'					=> 'The Yahoo! Messenger name you entered is too short.',
-
-	'TOPIC'				=> 'Topic',
-	'TOPICS'			=> 'Topics',
-	'TOPIC_ICON'		=> 'Topic icon',
-	'TOPIC_LOCKED'		=> 'This topic is locked, you cannot edit posts or make further replies.',
-	'TOPIC_LOCKED_SHORT'=> 'Topic locked',
-	'TOPIC_MOVED'		=> 'Moved topic',
-	'TOPIC_REVIEW'		=> 'Topic review',
-	'TOPIC_TITLE'		=> 'Topic title',
-	'TOPIC_UNAPPROVED'	=> 'This topic has not been approved',
-	'TOTAL_ATTACHMENTS'	=> 'Attachment(s)',
-	'TOTAL_LOG'			=> '1 log',
-	'TOTAL_LOGS'		=> '%d logs',
-	'TOTAL_NO_PM'		=> '0 private messages in total',
-	'TOTAL_PM'			=> '1 private message in total',
-	'TOTAL_PMS'			=> '%d private messages in total',
-	'TOPIC_REPORTED'	=> 'This topic has been reported',
-	'TOTAL_POSTS'		=> 'Total posts',
-
-	'TOTAL_POSTS_COUNT'	=> array(
-		0		=> 'Total posts <strong>%d</strong>',
-	),
-	'TOTAL_TOPICS_COUNT'=> array(
-		0		=> 'Total topics <strong>%d</strong>',
-	),
-	'TOTAL_USERS_COUNT'	=> array(
-		0		=> 'Total members <strong>%d</strong>',
-	),
-	'TRACKED_PHP_ERROR'	=> 'Tracked PHP errors: %s',
-
-	'TRY_DOWNLOAD_METHOD'		=> 'You may want to try the download modified files method.<br />This method always works and is also the recommended update path.',
-	'TRY_DOWNLOAD_METHOD_BUTTON'=> 'Try this method now',
-
-	'UNABLE_GET_IMAGE_SIZE'	=> 'It was not possible to determine the dimensions of the image.',
-	'UNABLE_TO_DELIVER_FILE'=> 'Unable to deliver file.',
-	'UNKNOWN_BROWSER'		=> 'Unknown browser',
-	'UNMARK_ALL'			=> 'Unmark all',
-	'UNREAD_MESSAGES'		=> 'Unread messages',
-	'UNREAD_PM'				=> array(
-		0		=> '<strong>%d</strong> unread messages',
-		1		=> '<strong>%d</strong> unread message',
-		2		=> '<strong>%d</strong> unread messages',
-	),
-	'UNWATCHED_FORUMS'			=> 'You are no longer subscribed to the selected forums.',
-	'UNWATCHED_TOPICS'			=> 'You are no longer subscribed to the selected topics.',
-	'UNWATCHED_FORUMS_TOPICS'	=> 'You are no longer subscribed to the selected entries.',
-	'UPDATE'				=> 'Update',
-	'UPDATE_FILES'					=> 'Update files',
-	'UPDATE_METHOD_EXPLAIN'			=> 'You are now able to choose your preferred update method. Using the FTP upload will present you with a form you need to enter your FTP account details into. With this method the files will be automatically moved to the new location and backups of the old files being created by appending .bak to the filename. If you choose to download the modified files you are able to unpack and upload them to their correct location manually later.',
-	'UPLOAD_IN_PROGRESS'	=> 'The upload is currently in progress.',
-	'UPDATE_SUCCESS'				=> 'Update was successful',
-	'UPDATE_SUCCESS_EXPLAIN'		=> 'Successfully updated all files. You should now check to see if everything is working fine.',
-	'URL_REDIRECT'			=> 'If your browser does not support meta redirection %splease click HERE to be redirected%s.',
-	'USERGROUPS'			=> 'Groups',
-	'USERNAME'				=> 'Username',
-	'USERNAMES'				=> 'Usernames',
-	'USER_AVATAR'			=> 'User avatar',
-	'USER_CANNOT_READ'		=> 'You cannot read posts in this forum.',
-	'USER_POST'				=> '%d Post',
-	'USER_POSTS'			=> '%d Posts',
-	'USERS'					=> 'Users',
-	'USE_PERMISSIONS'		=> 'Test out user’s permissions',
-
-	'VARIANT_DATE_SEPARATOR'	=> ' / ',	// Used in date format dropdown, eg: "Today, 13:37 / 01 Jan 2007, 13:37" ... to join a relative date with calendar date
-	'VIEWED'					=> 'Viewed',
-	'VIEWING_FAQ'				=> 'Viewing FAQ',
-	'VIEWING_MEMBERS'			=> 'Viewing member details',
-	'VIEWING_ONLINE'			=> 'Viewing who is online',
-	'VIEWING_MCP'				=> 'Viewing moderator control panel',
-	'VIEWING_MEMBER_PROFILE'	=> 'Viewing member profile',
-	'VIEWING_PRIVATE_MESSAGES'	=> 'Viewing private messages',
-	'VIEWING_REGISTER'			=> 'Registering account',
-	'VIEWING_UCP'				=> 'Viewing user control panel',
-	'VIEWS'						=> 'Views',
-	'VIEW_BOOKMARKS'			=> 'View bookmarks',
-	'VIEW_FORUM_LOGS'			=> 'View Logs',
-	'VIEW_LATEST_POST'			=> 'View the latest post',
-	'VIEW_NEWEST_POST'			=> 'View first unread post',
-	'VIEW_NOTES'				=> 'View user notes',
-	'VIEW_ONLINE_TIME'			=> array(
-		0		=> 'based on users active over the past %d minute',
-		2		=> 'based on users active over the past %d minutes',
-	),
-	'VIEW_TOPIC'				=> 'View topic',
-	'VIEW_TOPIC_ANNOUNCEMENT'	=> 'Announcement: ',
-	'VIEW_TOPIC_GLOBAL'			=> 'Global Announcement: ',
-	'VIEW_TOPIC_LOCKED'			=> 'Locked: ',
-	'VIEW_TOPIC_LOGS'			=> 'View logs',
-	'VIEW_TOPIC_MOVED'			=> 'Moved: ',
-	'VIEW_TOPIC_POLL'			=> 'Poll: ',
-	'VIEW_TOPIC_STICKY'			=> 'Sticky: ',
-	'VISIT_WEBSITE'				=> 'Visit website',
-
-	'WARNINGS'			=> 'Warnings',
-	'WARN_USER'			=> 'Warn user',
-	'WELCOME_SUBJECT'	=> 'Welcome to %s forums',
-	'WEBSITE'			=> 'Website',
-	'WHOIS'				=> 'Whois',
-	'WHO_IS_ONLINE'		=> 'Who is online',
-	'WRONG_PASSWORD'	=> 'You entered an incorrect password.',
-
-	'WRONG_DATA_ICQ'			=> 'The number you entered is not a valid ICQ number.',
-	'WRONG_DATA_JABBER'			=> 'The name you entered is not a valid Jabber account name.',
-	'WRONG_DATA_LANG'			=> 'The language you specified is not valid.',
-	'WRONG_DATA_WEBSITE'		=> 'The website address has to be a valid URL, including the protocol. For example http://www.example.com/.',
-	'WROTE'						=> 'wrote',
-
-	'YEAR'				=> 'Year',
-	'YEAR_MONTH_DAY'	=> '(YYYY-MM-DD)',
-	'YES'				=> 'Yes',
-	'YIM'				=> 'YIM',
-	'YOU_LAST_VISIT'	=> 'Last visit was: %s',
-	'YOU_NEW_PM'		=> 'A new private message is waiting for you in your Inbox.',
-	'YOU_NEW_PMS'		=> 'New private messages are waiting for you in your Inbox.',
-	'YOU_NO_NEW_PM'		=> 'No new private messages are waiting for you.',
-
-	'datetime'			=> array(
-		'TODAY'		=> 'Today',
-		'TOMORROW'	=> 'Tomorrow',
-		'YESTERDAY'	=> 'Yesterday',
-		'AGO'		=> array(
-			0		=> 'less than a minute ago',
-			1		=> '%d minute ago',
-			2		=> '%d minutes ago',
-			60		=> '1 hour ago',
-		),
-
-		'Sunday'	=> 'Sunday',
-		'Monday'	=> 'Monday',
-		'Tuesday'	=> 'Tuesday',
-		'Wednesday'	=> 'Wednesday',
-		'Thursday'	=> 'Thursday',
-		'Friday'	=> 'Friday',
-		'Saturday'	=> 'Saturday',
-
-		'Sun'		=> 'Sun',
-		'Mon'		=> 'Mon',
-		'Tue'		=> 'Tue',
-		'Wed'		=> 'Wed',
-		'Thu'		=> 'Thu',
-		'Fri'		=> 'Fri',
-		'Sat'		=> 'Sat',
-
-		'January'	=> 'January',
-		'February'	=> 'February',
-		'March'		=> 'March',
-		'April'		=> 'April',
-		'May'		=> 'May',
-		'June'		=> 'June',
-		'July'		=> 'July',
-		'August'	=> 'August',
-		'September' => 'September',
-		'October'	=> 'October',
-		'November'	=> 'November',
-		'December'	=> 'December',
-
-		'Jan'		=> 'Jan',
-		'Feb'		=> 'Feb',
-		'Mar'		=> 'Mar',
-		'Apr'		=> 'Apr',
-		'May_short'	=> 'May',	// Short representation of "May". May_short used because in English the short and long date are the same for May.
-		'Jun'		=> 'Jun',
-		'Jul'		=> 'Jul',
-		'Aug'		=> 'Aug',
-		'Sep'		=> 'Sep',
-		'Oct'		=> 'Oct',
-		'Nov'		=> 'Nov',
-		'Dec'		=> 'Dec',
-	),
-
-	'tz'				=> array(
-		'-12'	=> 'UTC - 12 hours',
-		'-11'	=> 'UTC - 11 hours',
-		'-10'	=> 'UTC - 10 hours',
-		'-9.5'	=> 'UTC - 9:30 hours',
-		'-9'	=> 'UTC - 9 hours',
-		'-8'	=> 'UTC - 8 hours',
-		'-7'	=> 'UTC - 7 hours',
-		'-6'	=> 'UTC - 6 hours',
-		'-5'	=> 'UTC - 5 hours',
-		'-4.5'	=> 'UTC - 4:30 hours',
-		'-4'	=> 'UTC - 4 hours',
-		'-3.5'	=> 'UTC - 3:30 hours',
-		'-3'	=> 'UTC - 3 hours',
-		'-2'	=> 'UTC - 2 hours',
-		'-1'	=> 'UTC - 1 hour',
-		'0'		=> 'UTC',
-		'1'		=> 'UTC + 1 hour',
-		'2'		=> 'UTC + 2 hours',
-		'3'		=> 'UTC + 3 hours',
-		'3.5'	=> 'UTC + 3:30 hours',
-		'4'		=> 'UTC + 4 hours',
-		'4.5'	=> 'UTC + 4:30 hours',
-		'5'		=> 'UTC + 5 hours',
-		'5.5'	=> 'UTC + 5:30 hours',
-		'5.75'	=> 'UTC + 5:45 hours',
-		'6'		=> 'UTC + 6 hours',
-		'6.5'	=> 'UTC + 6:30 hours',
-		'7'		=> 'UTC + 7 hours',
-		'8'		=> 'UTC + 8 hours',
-		'8.75'	=> 'UTC + 8:45 hours',
-		'9'		=> 'UTC + 9 hours',
-		'9.5'	=> 'UTC + 9:30 hours',
-		'10'	=> 'UTC + 10 hours',
-		'10.5'	=> 'UTC + 10:30 hours',
-		'11'	=> 'UTC + 11 hours',
-		'11.5'	=> 'UTC + 11:30 hours',
-		'12'	=> 'UTC + 12 hours',
-		'12.75'	=> 'UTC + 12:45 hours',
-		'13'	=> 'UTC + 13 hours',
-		'14'	=> 'UTC + 14 hours',
-		'dst'	=> '[ <abbr title="Daylight Saving Time">DST</abbr> ]',
-	),
-
-	'tz_zones'	=> array(
-		'-12'	=> '[UTC - 12] Baker Island Time',
-		'-11'	=> '[UTC - 11] Niue Time, Samoa Standard Time',
-		'-10'	=> '[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time',
-		'-9.5'	=> '[UTC - 9:30] Marquesas Islands Time',
-		'-9'	=> '[UTC - 9] Alaska Standard Time, Gambier Island Time',
-		'-8'	=> '[UTC - 8] Pacific Standard Time',
-		'-7'	=> '[UTC - 7] Mountain Standard Time',
-		'-6'	=> '[UTC - 6] Central Standard Time',
-		'-5'	=> '[UTC - 5] Eastern Standard Time',
-		'-4.5'	=> '[UTC - 4:30] Venezuelan Standard Time',
-		'-4'	=> '[UTC - 4] Atlantic Standard Time',
-		'-3.5'	=> '[UTC - 3:30] Newfoundland Standard Time',
-		'-3'	=> '[UTC - 3] Amazon Standard Time, Central Greenland Time',
-		'-2'	=> '[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time',
-		'-1'	=> '[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time',
-		'0'		=> '[UTC] Western European Time, Greenwich Mean Time',
-		'1'		=> '[UTC + 1] Central European Time, West African Time',
-		'2'		=> '[UTC + 2] Eastern European Time, Central African Time',
-		'3'		=> '[UTC + 3] Moscow Standard Time, Eastern African Time',
-		'3.5'	=> '[UTC + 3:30] Iran Standard Time',
-		'4'		=> '[UTC + 4] Gulf Standard Time, Samara Standard Time',
-		'4.5'	=> '[UTC + 4:30] Afghanistan Time',
-		'5'		=> '[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time',
-		'5.5'	=> '[UTC + 5:30] Indian Standard Time, Sri Lanka Time',
-		'5.75'	=> '[UTC + 5:45] Nepal Time',
-		'6'		=> '[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time',
-		'6.5'	=> '[UTC + 6:30] Cocos Islands Time, Myanmar Time',
-		'7'		=> '[UTC + 7] Indochina Time, Krasnoyarsk Standard Time',
-		'8'		=> '[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time',
-		'8.75'	=> '[UTC + 8:45] Southeastern Western Australia Standard Time',
-		'9'		=> '[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time',
-		'9.5'	=> '[UTC + 9:30] Australian Central Standard Time',
-		'10'	=> '[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time',
-		'10.5'	=> '[UTC + 10:30] Lord Howe Standard Time',
-		'11'	=> '[UTC + 11] Solomon Island Time, Magadan Standard Time',
-		'11.5'	=> '[UTC + 11:30] Norfolk Island Time',
-		'12'	=> '[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time',
-		'12.75'	=> '[UTC + 12:45] Chatham Islands Time',
-		'13'	=> '[UTC + 13] Tonga Time, Phoenix Islands Time',
-		'14'	=> '[UTC + 14] Line Island Time',
-	),
-
-	// The value is only an example and will get replaced by the current time on view
-	'dateformats'	=> array(
-		'd M Y, H:i'			=> '01 Jan 2007, 13:37',
-		'd M Y H:i'				=> '01 Jan 2007 13:37',
-		'M jS, \'y, H:i'		=> 'Jan 1st, \'07, 13:37',
-		'D M d, Y g:i a'		=> 'Mon Jan 01, 2007 1:37 pm',
-		'F jS, Y, g:i a'		=> 'January 1st, 2007, 1:37 pm',
-		'|d M Y|, H:i'			=> 'Today, 13:37 / 01 Jan 2007, 13:37',
-		'|F jS, Y|, g:i a'		=> 'Today, 1:37 pm / January 1st, 2007, 1:37 pm'
-	),
-
-	// The default dateformat which will be used on new installs in this language
-	// Translators should change this if a the usual date format is different
-	'default_dateformat'	=> 'D M d, Y g:i a', // Mon Jan 01, 2007 1:37 pm
-
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/email/admin_activate.txt b/phpBB/language/en/email/admin_activate.txt
deleted file mode 100644
index 8b11f1b450..0000000000
--- a/phpBB/language/en/email/admin_activate.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: Activate user account
-
-Hello,
-
-The account owned by "{USERNAME}" has been deactivated or newly created, you should check the details of this user (if required) and handle it appropriately.
-
-Use this link to view the user's profile:
-{U_USER_DETAILS}
-
-Use this link to activate the account:
-{U_ACTIVATE}
-
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/admin_send_email.txt b/phpBB/language/en/email/admin_send_email.txt
deleted file mode 100644
index 6687404527..0000000000
--- a/phpBB/language/en/email/admin_send_email.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-The following is an e-mail sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
-
-{CONTACT_EMAIL}
-
-Include this full e-mail (particularly the headers). 
-
-Message sent to you follows:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-{MESSAGE}
-
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/admin_welcome_activated.txt b/phpBB/language/en/email/admin_welcome_activated.txt
deleted file mode 100644
index c16a403f00..0000000000
--- a/phpBB/language/en/email/admin_welcome_activated.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Subject: Account activated
-
-Hello {USERNAME},
-
-Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous e-mail.
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt
deleted file mode 100644
index 746d13da7a..0000000000
--- a/phpBB/language/en/email/admin_welcome_inactive.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Welcome to "{SITENAME}"
-
-{WELCOME_MSG}
-
-Please keep this e-mail for your records. Your account information is as follows:
-
-----------------------------
-Username: {USERNAME}
-Password: {PASSWORD}
-
-Board URL: {U_BOARD}
-----------------------------
-
-Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another e-mail when this has occurred.
-
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Thank you for registering.
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt
deleted file mode 100644
index 9d43ca4f85..0000000000
--- a/phpBB/language/en/email/coppa_resend_inactive.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-Subject: Welcome to "{SITENAME}"
-
-{WELCOME_MSG}
-
-In compliance with the COPPA your account is currently inactive.
-
-Please print this message out and have your parent or guardian sign and date it. Then fax it to:
-
-{FAX_INFO}
-
-OR mail it to:
-
-{MAIL_INFO}
-
------------------------------- CUT HERE ------------------------------
-Permission to participate at "{SITENAME}" - {U_BOARD}
-
-Username: {USERNAME}
-E-mail: {EMAIL_ADDRESS}
-
-I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION. 
-I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. 
-I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM "{SITENAME}" AT ANY TIME.
-
-
-Parent or guardian 
-(print your name here): _____________________
-
-(sign here): __________________ 
-
-Date: _______________
-
------------------------------- CUT HERE ------------------------------
-
-
-Once the administrator has received the above form via fax or regular mail your account will be activated.
-
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Thank you for registering.
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt
deleted file mode 100644
index f079ddb838..0000000000
--- a/phpBB/language/en/email/coppa_welcome_inactive.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Subject: Welcome to "{SITENAME}"
-
-{WELCOME_MSG}
-
-In compliance with the COPPA your account is currently inactive.
-
-Please print this message out and have your parent or guardian sign and date it. Then fax it to:
-
-{FAX_INFO}
-
-OR mail it to:
-
-{MAIL_INFO}
-
------------------------------- CUT HERE ------------------------------
-Permission to participate at "{SITENAME}" - {U_BOARD}
-
-Username: {USERNAME}
-Password: {PASSWORD}
-E-mail: {EMAIL_ADDRESS}
-
-I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION. 
-I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. 
-I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM "{SITENAME}" AT ANY TIME.
-
-
-Parent or guardian 
-(print your name here): _____________________
-
-(sign here): __________________ 
-
-Date: _______________
-
------------------------------- CUT HERE ------------------------------
-
-
-Once the administrator has received the above form via fax or regular mail your account will be activated.
-
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Thank you for registering.
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/email_notify.txt b/phpBB/language/en/email/email_notify.txt
deleted file mode 100644
index 0d0ac7fc28..0000000000
--- a/phpBB/language/en/email/email_notify.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject: "{SITENAME}" - E-mail a friend
-
-Hello {TO_USERNAME},
-
-This e-mail was sent from "{SITENAME}" by {FROM_USERNAME} who thought you may be interested in the following topic:
-
-{TOPIC_NAME}
-
-You can find it at:
-
-{U_TOPIC}
-
-A message from {FROM_USERNAME} may also be included below. Please note that this message has not been seen or approved by the board administrators. If you wish to complain about having received this e-mail please contact the board administrator at {BOARD_CONTACT}. Please quote the message headers when contacting this address.
-
-----------
-
-{MESSAGE}
\ No newline at end of file
diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt
deleted file mode 100644
index fae5a83885..0000000000
--- a/phpBB/language/en/email/forum_notify.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Subject: Forum post notification - "{FORUM_NAME}"
-
-Hello {USERNAME},
-
-You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
-
-{U_NEWEST_POST}
-
-If you want to view the topic, click the following link:
-{U_TOPIC}
-
-If you want to view the forum, click the following link:
-{U_FORUM}
-
-If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
-
-{U_STOP_WATCHING_FORUM}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/group_added.txt b/phpBB/language/en/email/group_added.txt
deleted file mode 100644
index 9464aae094..0000000000
--- a/phpBB/language/en/email/group_added.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Subject: You have been added to this usergroup
-
-Congratulations,
-
-You have been added to the "{GROUP_NAME}" group on "{SITENAME}".
-This action was done by a group leader or the site administrator, contact them for more information.
-
-You can view your groups information here:
-{U_GROUP}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/group_approved.txt b/phpBB/language/en/email/group_approved.txt
deleted file mode 100644
index 24afefcd07..0000000000
--- a/phpBB/language/en/email/group_approved.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Subject: Your request has been approved
-
-Congratulations,
-
-Your request to join the "{GROUP_NAME}" group on "{SITENAME}" has been approved.
-Click on the following link to see your group membership.
-
-{U_GROUP}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/group_request.txt b/phpBB/language/en/email/group_request.txt
deleted file mode 100644
index 75840831fb..0000000000
--- a/phpBB/language/en/email/group_request.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Subject: A request to join your group has been made
-
-Dear {USERNAME},
-
-The user "{REQUEST_USERNAME}" has requested to join the group "{GROUP_NAME}" you moderate on "{SITENAME}".
-To approve or deny this request for group membership please visit the following link:
-
-{U_PENDING}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt
deleted file mode 100644
index 4d9286bd65..0000000000
--- a/phpBB/language/en/email/installed.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: phpBB installed
-
-Congratulations,
-
-You have successfully installed phpBB on your server.
-
-This e-mail contains important information on your installation that you should keep safe. The password has been encrypted in the database and cannot be recovered, although you can request a new password should you lose this one.
-
-----------------------------
-Username: {USERNAME}
-Password: {PASSWORD}
-
-Board URL: {U_BOARD}
-----------------------------
-
-Useful information on your phpBB installation can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/
-
-In order to keep the board safe and secure, it is highly recommended that you keep current with software releases which can be easily done by subscribing to phpBB.com's mailing list, located at the above URL.
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt
deleted file mode 100644
index 529bbf0f8f..0000000000
--- a/phpBB/language/en/email/newtopic_notify.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: New topic notification - "{FORUM_NAME}"
-
-Hello {USERNAME},
-
-You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
-
-{U_FORUM}
-
-If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
-
-{U_STOP_WATCHING_FORUM}
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt
deleted file mode 100644
index e715b54026..0000000000
--- a/phpBB/language/en/email/post_approved.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: Post approved - "{POST_SUBJECT}"
-
-Hello {USERNAME},
-
-You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator.
-
-If you want to view the post, click the following link:
-{U_VIEW_POST}
-
-If you want to view the topic, click the following link:
-{U_VIEW_TOPIC}
-
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt
deleted file mode 100644
index 3bc64bb611..0000000000
--- a/phpBB/language/en/email/post_disapproved.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Subject: Post disapproved - "{POST_SUBJECT}"
-
-Hello {USERNAME},
-
-You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator.
-
-The following reason was given for the disapproval:
-
-{REASON}
-
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt
deleted file mode 100644
index d363df7973..0000000000
--- a/phpBB/language/en/email/privmsg_notify.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Subject: New private message has arrived
-
-Hello {USERNAME},
-
-You have received a new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject:
-
-{SUBJECT}
-
-You can view your new message by clicking on the following link:
-
-{U_INBOX}
-
-You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/profile_send_email.txt b/phpBB/language/en/email/profile_send_email.txt
deleted file mode 100644
index 9fb19e7eb1..0000000000
--- a/phpBB/language/en/email/profile_send_email.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Hello {TO_USERNAME},
-
-The following is an e-mail sent to you by {FROM_USERNAME} via your account on "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
-
-{BOARD_CONTACT}
-
-Include this full e-mail (particularly the headers). Please note that the reply address to this e-mail has been set to that of {FROM_USERNAME}.
-
-Message sent to you follows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-{MESSAGE}
diff --git a/phpBB/language/en/email/profile_send_im.txt b/phpBB/language/en/email/profile_send_im.txt
deleted file mode 100644
index 02c820c69d..0000000000
--- a/phpBB/language/en/email/profile_send_im.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Hello {TO_USERNAME},
-
-The following is a message sent to you by {FROM_USERNAME} via your account on "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
-
-{BOARD_CONTACT}
-
-Include this full message. Please note that the sender address has been set to the boards IM account.
-
-Message sent to you follows
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-{MESSAGE}
diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt
deleted file mode 100644
index eb7ef22b5e..0000000000
--- a/phpBB/language/en/email/report_closed.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Subject: Report closed - "{POST_SUBJECT}"
-
-Hello {USERNAME},
-
-You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message.
-
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/report_deleted.txt b/phpBB/language/en/email/report_deleted.txt
deleted file mode 100644
index 4292ca2239..0000000000
--- a/phpBB/language/en/email/report_deleted.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Subject: Report deleted - "{POST_SUBJECT}"
-
-Hello {USERNAME},
-
-You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was deleted by a moderator or by an administrator.
-
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt
deleted file mode 100644
index ffda378d30..0000000000
--- a/phpBB/language/en/email/topic_approved.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Subject: Topic approved - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator.
-
-If you want to view the topic, click the following link:
-{U_VIEW_TOPIC}
-
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt
deleted file mode 100644
index 49ef58bf39..0000000000
--- a/phpBB/language/en/email/topic_disapproved.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Subject: Topic disapproved - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator.
-
-The following reason was given for the disapproval:
-
-{REASON}
-
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
deleted file mode 100644
index 99587b28e0..0000000000
--- a/phpBB/language/en/email/topic_notify.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because you are watching the topic, "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
-
-If you want to view the newest post made since your last visit, click the following link:
-{U_NEWEST_POST}
-
-If you want to view the topic, click the following link:
-{U_TOPIC}
-
-If you want to view the forum, click the following link:
-{U_FORUM}
-
-If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link:
-
-{U_STOP_WATCHING_TOPIC}
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_activate.txt b/phpBB/language/en/email/user_activate.txt
deleted file mode 100644
index 7d7960c4c5..0000000000
--- a/phpBB/language/en/email/user_activate.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Subject: Reactivate your account
-
-Hello {USERNAME},
-
-Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. In order to reactivate your account you must click on the link below:
-
-{U_ACTIVATE}
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_activate_inactive.txt b/phpBB/language/en/email/user_activate_inactive.txt
deleted file mode 100644
index a90773d48c..0000000000
--- a/phpBB/language/en/email/user_activate_inactive.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Subject: Your account has been deactivated
-
-Hello {USERNAME},
-
-Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. The administrator of the board will need to activate it before you can log in. You will receive another notification when this has occurred.
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_activate_passwd.txt b/phpBB/language/en/email/user_activate_passwd.txt
deleted file mode 100644
index 695be115f8..0000000000
--- a/phpBB/language/en/email/user_activate_passwd.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject: New password activation
-
-Hello {USERNAME}
-
-You are receiving this notification because you have (or someone pretending to be you has) requested a new password be sent for your account on "{SITENAME}". If you did not request this notification then please ignore it, if you keep receiving it please contact the board administrator.
-
-To use the new password you need to activate it. To do this click the link provided below.
-
-{U_ACTIVATE}
-
-If successful you will be able to login using the following password:
-
-Password: {PASSWORD}
-
-You can of course change this password yourself via the profile page. If you have any difficulties please contact the board administrator.
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt
deleted file mode 100644
index b5639d0b7a..0000000000
--- a/phpBB/language/en/email/user_reactivate_account.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Subject: Reactivate your account on "{SITENAME}"
-
-A board administrator requested that your account be reactivated. Your account is currently inactive.
-Please follow the steps listed here to reactivate your account.
-
-Please keep this e-mail for your records. Your account information is as follows:
-
-----------------------------
-Username: {USERNAME}
-----------------------------
-
-Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Please visit the following link to reactivate your account:
-
-{U_ACTIVATE}
-
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_remind_inactive.txt b/phpBB/language/en/email/user_remind_inactive.txt
deleted file mode 100644
index 49dea02044..0000000000
--- a/phpBB/language/en/email/user_remind_inactive.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Subject: Inactive account reminder
-
-Hello {USERNAME},
-
-On {REGISTER_DATE} you registered a new account at "{SITENAME}". To date you have not activated this account which is a prerequisite for board login. For your convenience the activation link is repeated below.
-
-{U_ACTIVATE}
-
-Thank you for registering at "{SITENAME}", we look forward to your participation.
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt
deleted file mode 100644
index 5635801b80..0000000000
--- a/phpBB/language/en/email/user_resend_inactive.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Welcome to "{SITENAME}"
-
-{WELCOME_MSG}
-
-Please keep this e-mail for your records. Your account information is as follows:
-
-----------------------------
-Username: {USERNAME}
-----------------------------
-
-Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Your account is currently inactive. You cannot use it until you visit the following link:
-
-{U_ACTIVATE}
-
-
-Thank you for registering.
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt
deleted file mode 100644
index 6c3cee0b50..0000000000
--- a/phpBB/language/en/email/user_welcome.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: Welcome to "{SITENAME}"
-
-{WELCOME_MSG}
-
-Please keep this e-mail for your records. Your account information is as follows:
-
-----------------------------
-Username: {USERNAME}
-Password: {PASSWORD}
-
-Board URL: {U_BOARD}
-----------------------------
-
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Thank you for registering.
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt
deleted file mode 100644
index 4b6d96ddd8..0000000000
--- a/phpBB/language/en/email/user_welcome_inactive.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Subject: Welcome to "{SITENAME}"
-
-{WELCOME_MSG}
-
-Please keep this e-mail for your records. Your account information is as follows:
-
-----------------------------
-Username: {USERNAME}
-Password: {PASSWORD}
-
-Board URL: {U_BOARD}
-----------------------------
-
-Your account is currently inactive. You cannot use it until you visit the following link:
-
-{U_ACTIVATE}
-
-Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
-
-Thank you for registering.
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php
deleted file mode 100644
index 9f72d4070f..0000000000
--- a/phpBB/language/en/groups.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
-*
-* groups [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ALREADY_DEFAULT_GROUP'		=> 'The selected group is already your default group.',
-	'ALREADY_IN_GROUP'			=> 'You are already a member of the selected group.',
-	'ALREADY_IN_GROUP_PENDING'	=> 'You already requested joining the selected group.',
-
-	'CANNOT_JOIN_GROUP'			=> 'You are not able to join this group. You are only able to join open and freely open groups.',
-	'CANNOT_RESIGN_GROUP'		=> 'You are not able to resign from this group. You are only able to resign from open and freely open groups.',
-	'CHANGED_DEFAULT_GROUP'		=> 'Successfully changed default group.',
-
-	'GROUP_AVATAR'						=> 'Group avatar',
-	'GROUP_CHANGE_DEFAULT'				=> 'Are you sure you want to change your default membership to the group “%s”?',
-	'GROUP_CLOSED'						=> 'Closed',
-	'GROUP_DESC'						=> 'Group description',
-	'GROUP_HIDDEN'						=> 'Hidden',
-	'GROUP_INFORMATION'					=> 'Usergroup information',
-	'GROUP_IS_CLOSED'					=> 'This is a closed group, new members can only join upon invitation of a group leader.',
-	'GROUP_IS_FREE'						=> 'This is a freely open group, all new members are welcome.',
-	'GROUP_IS_HIDDEN'					=> 'This is a hidden group, only members of this group can view its membership.',
-	'GROUP_IS_OPEN'						=> 'This is an open group, members can apply to join.',
-	'GROUP_IS_SPECIAL'					=> 'This is a special group, special groups are managed by the board administrators.',
-	'GROUP_JOIN'						=> 'Join group',
-	'GROUP_JOIN_CONFIRM'				=> 'Are you sure you want to join the selected group?',
-	'GROUP_JOIN_PENDING'				=> 'Request to join group',
-	'GROUP_JOIN_PENDING_CONFIRM'		=> 'Are you sure you want to request joining the selected group?',
-	'GROUP_JOINED'						=> 'Successfully joined selected group.',
-	'GROUP_JOINED_PENDING'				=> 'Successfully requested group membership. Please wait for a group leader to approve your membership.',
-	'GROUP_LIST'						=> 'Manage users',
-	'GROUP_MEMBERS'						=> 'Group members',
-	'GROUP_NAME'						=> 'Group name',
-	'GROUP_OPEN'						=> 'Open',
-	'GROUP_RANK'						=> 'Group rank',
-	'GROUP_RESIGN_MEMBERSHIP'			=> 'Resign group membership',
-	'GROUP_RESIGN_MEMBERSHIP_CONFIRM'	=> 'Are you sure you want to resign your membership from the selected group?',
-	'GROUP_RESIGN_PENDING'				=> 'Resign a pending group membership',
-	'GROUP_RESIGN_PENDING_CONFIRM'		=> 'Are you sure you want to resign your pending membership from the selected group?',
-	'GROUP_RESIGNED_MEMBERSHIP'			=> 'You were successfully removed from the selected group.',
-	'GROUP_RESIGNED_PENDING'			=> 'Your pending membership was successfully removed from the selected group.',
-	'GROUP_TYPE'						=> 'Group type',
-	'GROUP_UNDISCLOSED'					=> 'Hidden group',
-	'FORUM_UNDISCLOSED'					=> 'Moderating hidden forum(s)',
-
-	'LOGIN_EXPLAIN_GROUP'	=> 'You need to login to view group details.',
-
-	'NO_LEADERS'					=> 'You are not a leader of any group.',
-	'NOT_LEADER_OF_GROUP'			=> 'The requested operation cannot be taken because you are not a leader of the selected group.',
-	'NOT_MEMBER_OF_GROUP'			=> 'The requested operation cannot be taken because you are not a member of the selected group or your membership has not been approved yet.',
-	'NOT_RESIGN_FROM_DEFAULT_GROUP'	=> 'You are not allowed to resign from your default group.',
-	
-	'PRIMARY_GROUP'		=> 'Primary group',
-
-	'REMOVE_SELECTED'		=> 'Remove selected',
-
-	'USER_GROUP_CHANGE'			=> 'From “%1$s” group to “%2$s”',
-	'USER_GROUP_DEMOTE'			=> 'Demote leadership',
-	'USER_GROUP_DEMOTE_CONFIRM'	=> 'Are you sure you want to demote as group leader from the selected group?',
-	'USER_GROUP_DEMOTED'		=> 'Successfully demoted your leadership.',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
deleted file mode 100644
index ed6fea96d3..0000000000
--- a/phpBB/language/en/help_bbcode.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
-*
-* help_bbcode [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-$help = array(
-	array(
-		0 => '--',
-		1 => 'Introduction'
-	),
-	array(
-		0 => 'What is BBCode?',
-		1 => 'BBCode is a special implementation of HTML. Whether you can actually use BBCode in your posts on the forum is determined by the administrator. In addition you can disable BBCode on a per post basis via the posting form. BBCode itself is similar in style to HTML, tags are enclosed in square brackets [ and ] rather than &lt; and &gt; and it offers greater control over what and how something is displayed. Depending on the template you are using you may find adding BBCode to your posts is made much easier through a clickable interface above the message area on the posting form. Even with this you may find the following guide useful.'
-	),
-	array(
-		0 => '--',
-		1 => 'Text Formatting'
-	),
-	array(
-		0 => 'How to create bold, italic and underlined text',
-		1 => 'BBCode includes tags to allow you to quickly change the basic style of your text. This is achieved in the following ways: <ul><li>To make a piece of text bold enclose it in <strong>[b][/b]</strong>, e.g. <br /><br /><strong>[b]</strong>Hello<strong>[/b]</strong><br /><br />will become <strong>Hello</strong></li><li>For underlining use <strong>[u][/u]</strong>, for example:<br /><br /><strong>[u]</strong>Good Morning<strong>[/u]</strong><br /><br />becomes <span style="text-decoration: underline">Good Morning</span></li><li>To italicise text use <strong>[i][/i]</strong>, e.g.<br /><br />This is <strong>[i]</strong>Great!<strong>[/i]</strong><br /><br />would give This is <i>Great!</i></li></ul>'
-	),
-	array(
-		0 => 'How to change the text colour or size',
-		1 => 'To alter the colour or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: <ul><li>Changing the colour of text is achieved by wrapping it in <strong>[color=][/color]</strong>. You can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, e.g. #FFFFFF, #000000. For example, to create red text you could use:<br /><br /><strong>[color=red]</strong>Hello!<strong>[/color]</strong><br /><br />or<br /><br /><strong>[color=#FF0000]</strong>Hello!<strong>[/color]</strong><br /><br />Both will output <span style="color:red">Hello!</span></li><li>Changing the text size is achieved in a similar way using <strong>[size=][/size]</strong>. This tag is dependent on the template the user has selected but the recommended format is a numerical value representing the text size in percent, starting at 20 (very small) through to 200 (very large) by default. For example:<br /><br /><strong>[size=30]</strong>SMALL<strong>[/size]</strong><br /><br />will generally be <span style="font-size:30%;">SMALL</span><br /><br />whereas:<br /><br /><strong>[size=200]</strong>HUGE!<strong>[/size]</strong><br /><br />will be <span style="font-size:200%;">HUGE!</span></li></ul>'
-	),
-	array(
-		0 => 'Can I combine formatting tags?',
-		1 => 'Yes, of course you can, for example to get someones attention you may write:<br /><br /><strong>[size=200][color=red][b]</strong>LOOK AT ME!<strong>[/b][/color][/size]</strong><br /><br />this would output <span style="color:red;font-size:200%;"><strong>LOOK AT ME!</strong></span><br /><br />We don’t recommend you output lots of text that looks like this though! Remember it is up to you, the poster, to ensure tags are closed correctly. For example the following is incorrect:<br /><br /><strong>[b][u]</strong>This is wrong<strong>[/b][/u]</strong>'
-	),
-	array(
-		0 => '--',
-		1 => 'Quoting and outputting fixed-width text'
-	),
-	array(
-		0 => 'Quoting text in replies',
-		1 => 'There are two ways you can quote text, with a reference or without.<ul><li>When you utilise the Quote function to reply to a post on the board you should notice that the post text is added to the message window enclosed in a <strong>[quote=&quot;&quot;][/quote]</strong> block. This method allows you to quote with a reference to a person or whatever else you choose to put! For example to quote a piece of text Mr. Blobby wrote you would enter:<br /><br /><strong>[quote=&quot;Mr. Blobby&quot;]</strong>The text Mr. Blobby wrote would go here<strong>[/quote]</strong><br /><br />The resulting output will automatically add &quot;Mr. Blobby wrote:&quot; before the actual text. Remember you <strong>must</strong> include the quotation marks &quot;&quot; around the name you are quoting, they are not optional.</li><li>The second method allows you to blindly quote something. To utilise this enclose the text in <strong>[quote][/quote]</strong> tags. When you view the message it will simply show the text within a quotation block.</li></ul>'
-	),
-	array(
-		0 => 'Outputting code or fixed width data',
-		1 => 'If you want to output a piece of code or in fact anything that requires a fixed width, e.g. Courier type font you should enclose the text in <strong>[code][/code]</strong> tags, e.g.<br /><br /><strong>[code]</strong>echo &quot;This is some code&quot;;<strong>[/code]</strong><br /><br />All formatting used within <strong>[code][/code]</strong> tags is retained when you later view it. PHP syntax highlighting can be enabled using <strong>[code=php][/code]</strong> and is recommended when posting PHP code samples as it improves readability.'
-	),
-	array(
-		0 => '--',
-		1 => 'Generating lists'
-	),
-	array(
-		0 => 'Creating an Unordered list',
-		1 => 'BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list outputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use <strong>[list][/list]</strong> and define each item within the list using <strong>[*]</strong>. For example to list your favourite colours you could use:<br /><br /><strong>[list]</strong><br /><strong>[*]</strong>Red<br /><strong>[*]</strong>Blue<br /><strong>[*]</strong>Yellow<br /><strong>[/list]</strong><br /><br />This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul>'
-	),
-	array(
-		0 => 'Creating an Ordered list',
-		1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>'
-	),
-	array(
-		0 => '--',
-		1 => 'Creating Links'
-	),
-	array(
-		0 => 'Linking to another site',
-		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to e-mail addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=http://www.google.com/][img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
-	),
-	array(
-		0 => '--',
-		1 => 'Showing images in posts'
-	),
-	array(
-		0 => 'Adding an image to a post',
-		1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br /><br /><strong>[img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/img]</strong><br /><br />As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br /><br /><strong>[url=http://www.google.com/][img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="http://www.google.com/"><img src="http://www.google.com/intl/en_ALL/images/logo.gif" alt="" /></a>'
-	),
-	array(
-		0 => 'Adding attachments into a post',
-		1 => 'Attachments can now be placed in any part of a post by using the new <strong>[attachment=][/attachment]</strong> BBCode, if the attachments functionality has been enabled by a board administrator and if you are given the appropriate permissions to create attachments. Within the posting screen is a drop-down box (respectively a button) for placing attachments inline.'
-	),
-	array(
-		0 => '--',
-		1 => 'Other matters'
-	),
-	array(
-		0 => 'Can I add my own tags?',
-		1 => 'If you are an administrator on this board and have the proper permissions, you can add further BBCodes through the Custom BBCodes section.'
-	)
-);
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
deleted file mode 100644
index 89ac845021..0000000000
--- a/phpBB/language/en/help_faq.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-/**
-*
-* help_faq [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-$help = array(
-	array(
-		0 => '--',
-		1 => 'Login and Registration Issues'
-	),
-	array(
-		0 => 'Why can’t I login?',
-		1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact the board owner to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.'
-	),
-	array(
-		0 => 'Why do I need to register at all?',
-		1 => 'You may not have to, it is up to the administrator of the board as to whether you need to register in order to post messages. However; registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.'
-	),
-	array(
-		0 => 'Why do I get logged off automatically?',
-		1 => 'If you do not check the <em>Log me in automatically</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.'
-	),
-	array(
-		0 => 'How do I prevent my username appearing in the online user listings?',
-		1 => 'Within your User Control Panel, under “Board preferences”, you will find the option <em>Hide your online status</em>. Enable this option with <samp>Yes</samp> and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.'
-	),
-	array(
-		0 => 'I’ve lost my password!',
-		1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I’ve forgotten my password</em>. Follow the instructions and you should be able to log in again shortly.'
-	),
-	array(
-		0 => 'I registered but cannot login!',
-		1 => 'First, check your username and password. If they are correct, then one of two things may have happened. If COPPA support is enabled and you specified being under 13 years old during registration, you will have to follow the instructions you received. Some boards will also require new registrations to be activated, either by yourself or by an administrator before you can logon; this information was present during registration. If you were sent an e-mail, follow the instructions. If you did not receive an e-mail, you may have provided an incorrect e-mail address or the e-mail may have been picked up by a spam filer. If you are sure the e-mail address you provided is correct, try contacting an administrator.'
-	),
-	array(
-		0 => 'I registered in the past but cannot login any more?!',
-		1 => 'Attempt to locate the e-mail sent to you when you first registered, check your username and password and try again. It is possible an administrator has deactivated or deleted your account for some reason. Also, many boards periodically remove users who have not posted for a long time to reduce the size of the database. If this has happened, try registering again and being more involved in discussions.'
-	),
-	array(
-		0 => 'What is COPPA?',
-		1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Group cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined below.',
-	),
-	array(
-		0 => 'Why can’t I register?',
-		1 => 'It is possible the website owner has banned your IP address or disallowed the username you are attempting to register. The website owner could have also disabled registration to prevent new visitors from signing up. Contact a board administrator for assistance.',
-	),
-	array(
-		0 => 'What does the “Delete all board cookies” do?',
-		1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.',
-	),
-	array(
-		0 => '--',
-		1 => 'User Preferences and settings'
-	),
-	array(
-		0 => 'How do I change my settings?',
-		1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found at the top of board pages. This system will allow you to change all your settings and preferences.'
-	),
-	array(
-		0 => 'The times are not correct!',
-		1 => 'It is possible the time displayed is from a timezone different from the one you are in. If this is the case, visit your User Control Panel and change your timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings, can only be done by registered users. If you are not registered, this is a good time to do so.'
-	),
-	array(
-		0 => 'I changed the timezone and the time is still wrong!',
-		1 => 'If you are sure you have set the timezone and Summer Time/DST correctly and the time is still incorrect, then the time stored on the server clock is incorrect. Please notify an administrator to correct the problem.'
-	),
-	array(
-		0 => 'My language is not in the list!',
-		1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB website (see link at the bottom of board pages).'
-	),
-	array(
-		0 => 'How do I show an image below my username?',
-		1 => 'There are two images that may appear below a username when viewing posts. Depending on the used style, the first may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. The second, usually a larger image, is known as an avatar and is generally unique or personal to each user. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.'
-	),
-	array(
-		0 => 'What is my rank and how do I change it?',
-		1 => 'Ranks, which appear below your username, indicate the number of posts you have made or identify certain users, e.g. moderators and administrators. In general, you cannot directly change the wording of any board ranks as they are set by the board administrator. Please do not abuse the board by posting unnecessarily just to increase your rank. Most boards will not tolerate this and the moderator or administrator will simply lower your post count.'
-	),
-	array(
-		0 => 'When I click the e-mail link for a user it asks me to login?',
-		1 => 'Only registered users can send e-mail to other users via the built-in e-mail form, and only if the administrator has enabled this feature. This is to prevent malicious use of the e-mail system by anonymous users.'
-	),
-	array(
-		0 => '--',
-		1 => 'Posting Issues'
-	),
-	array(
-		0 => 'How do I post a topic in a forum?',
-		1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can vote in polls, etc.'
-	),
-	array(
-		0 => 'How do I edit or delete a post?',
-		1 => 'Unless you are a board administrator or moderator, you can only edit or delete your own posts. You can edit a post by clicking the edit button for the relevant post, sometimes for only a limited time after the post was made. If someone has already replied to the post, you will find a small piece of text output below the post when you return to the topic which lists the number of times you edited it along with the date and time. This will only appear if someone has made a reply; it will not appear if a moderator or administrator edited the post, though they may leave a note as to why they’ve edited the post at their own digression. Please note that normal users cannot delete a post once someone has replied.'
-	),
-	array(
-		0 => 'How do I add a signature to my post?',
-		1 => 'To add a signature to a post you must first create one via your User Control Panel. Once created, you can check the <em>Attach a signature</em> box on the posting form to add your signature. You can also add a signature by default to all your posts by checking the appropriate radio button in your profile. If you do so, you can still prevent a signature being added to individual posts by un-checking the add signature box within the posting form.'
-	),
-	array(
-		0 => 'How do I create a poll?',
-		1 => 'When posting a new topic or editing the first post of a topic, click the “Poll creation” tab below the main posting form; if you cannot see this, you do not have appropriate permissions to create polls. Enter a title and at least two options in the appropriate fields, making sure each option is on a separate line in the textarea. You can also set the number of options users may select during voting under “Options per user”, a time limit in days for the poll (0 for infinite duration) and lastly the option to allow users to amend their votes.'
-	),
-	array(
-		0 => 'Why can’t I add more poll options?',
-		1 => 'The limit for poll options is set by the board administrator. If you feel you need to add more options to your poll then the allowed amount, contact the board administrator.'
-	),
-	array(
-		0 => 'How do I edit or delete a poll?',
-		1 => 'As with posts, polls can only be edited by the original poster, a moderator or an administrator. To edit a poll, click to edit the first post in the topic; this always has the poll associated with it. If no one has cast a vote, users can delete the poll or edit any poll option. However, if members have already placed votes, only moderators or administrators can edit or delete it. This prevents the poll’s options from being changed mid-way through a poll.'
-	),
-	array(
-		0 => 'Why can’t I access a forum?',
-		1 => 'Some forums may be limited to certain users or groups. To view, read, post or perform another action you may need special permissions. Contact a moderator or board administrator to grant you access.'
-	),
-	array(
-		0 => 'Why can’t I add attachments?',
-		1 => 'Attachment permissions are granted on a per forum, per group, or per user basis. The board administrator may not have allowed attachments to be added for the specific forum you are posting in, or perhaps only certain groups can post attachments. Contact the board administrator if you are unsure about why you are unable to add attachments.'
-	),
-	array(
-		0 => 'Why did I receive a warning?',
-		1 => 'Each board administrator has their own set of rules for their site. If you have broken a rule, you may be issued a warning. Please note that this is the board administrator’s decision, and the phpBB Group has nothing to do with the warnings on the given site. Contact the board administrator if you are unsure about why you were issued a warning.'
-	),
-	array(
-		0 => 'How can I report posts to a moderator?',
-		1 => 'If the board administrator has allowed it, you should see a button for reporting posts next to the post you wish to report. Clicking this will walk you through the steps necessary to report the post.'
-	),
-	array(
-		0 => 'What is the “Save” button for in topic posting?',
-		1 => 'This allows you to save passages to be completed and submitted at a later date. To reload a saved passage, visit the User Control Panel.'
-	),
-	array(
-		0 => 'Why does my post need to be approved?',
-		1 => 'The board administrator may have decided that posts in the forum you are posting to require review before submission. It is also possible that the administrator has placed you in a group of users whose posts require review before submission. Please contact the board administrator for further details.'
-	),
-	array(
-		0 => 'How do I bump my topic?',
-		1 => 'By clicking the “Bump topic” link when you are viewing it, you can “bump” the topic to the top of the forum on the first page. However, if you do not see this, then topic bumping may be disabled or the time allowance between bumps has not yet been reached. It is also possible to bump the topic simply by replying to it, however, be sure to follow the board rules when doing so.'
-	),
-	array(
-		0 => '--',
-		1 => 'Formatting and Topic Types'
-	),
-	array(
-		0 => 'What is BBCode?',
-		1 => 'BBCode is a special implementation of HTML, offering great formatting control on particular objects in a post. The use of BBCode is granted by the administrator, but it can also be disabled on a per post basis from the posting form. BBCode itself is similar in style to HTML, but tags are enclosed in square brackets [ and ] rather than &lt; and &gt;. For more information on BBCode see the guide which can be accessed from the posting page.'
-	),
-	array(
-		0 => 'Can I use HTML?',
-		1 => 'No. It is not possible to post HTML on this board and have it rendered as HTML. Most formatting which can be carried out using HTML can be applied using BBCode instead.'
-	),
-	array(
-		0 => 'What are Smilies?',
-		1 => 'Smilies, or Emoticons, are small images which can be used to express a feeling using a short code, e.g. :) denotes happy, while :( denotes sad. The full list of emoticons can be seen in the posting form. Try not to overuse smilies, however, as they can quickly render a post unreadable and a moderator may edit them out or remove the post altogether. The board administrator may also have set a limit to the number of smilies you may use within a post.'
-	),
-	array(
-		0 => 'Can I post images?',
-		1 => 'Yes, images can be shown in your posts. If the administrator has allowed attachments, you may be able to upload the image to the board. Otherwise, you must link to an image stored on a publicly accessible web server, e.g. http://www.example.com/my-picture.gif. You cannot link to pictures stored on your own PC (unless it is a publicly accessible server) nor images stored behind authentication mechanisms, e.g. hotmail or yahoo mailboxes, password protected sites, etc. To display the image use the BBCode [img] tag.'
-	),
-	array(
-		0 => 'What are global announcements?',
-		1 => 'Global announcements contain important information and you should read them whenever possible. They will appear at the top of every forum and within your User Control Panel. Global announcement permissions are granted by the board administrator.'
-	),
-	array(
-		0 => 'What are announcements?',
-		1 => 'Announcements often contain important information for the forum you are currently reading and you should read them whenever possible. Announcements appear at the top of every page in the forum to which they are posted. As with global announcements, announcement permissions are granted by the board administrator.'
-	),
-	array(
-		0 => 'What are sticky topics?',
-		1 => 'Sticky topics within the forum appear below announcements and only on the first page. They are often quite important so you should read them whenever possible. As with announcements and global announcements, sticky topic permissions are granted by the board administrator.'
-	),
-	array(
-		0 => 'What are locked topics?',
-		1 => 'Locked topics are topics where users can no longer reply and any poll it contained was automatically ended. Topics may be locked for many reasons and were set this way by either the forum moderator or board administrator. You may also be able to lock your own topics depending on the permissions you are granted by the board administrator.'
-	),
-	array(
-		0 => 'What are topic icons?',
-		1 => 'Topic icons are author chosen images associated with posts to indicate their content. The ability to use topic icons depends on the permissions set by the board administrator.'
-	),
-	array(
-		0 => '--',
-		1 => 'User Levels and Groups'
-	),
-	array(
-		0 => 'What are Administrators?',
-		1 => 'Administrators are members assigned with the highest level of control over the entire board. These members can control all facets of board operation, including setting permissions, banning users, creating usergroups or moderators, etc., dependent upon the board founder and what permissions he or she has given the other administrators. They may also have full moderator capabilities in all forums, depending on the settings put forth by the board founder.'
-	),
-	array(
-		0 => 'What are Moderators?',
-		1 => 'Moderators are individuals (or groups of individuals) who look after the forums from day to day. They have the authority to edit or delete posts and lock, unlock, move, delete and split topics in the forum they moderate. Generally, moderators are present to prevent users from going off-topic or posting abusive or offensive material.'
-	),
-	array(
-		0 => 'What are usergroups?',
-		1 => 'Usergroups are groups of users that divide the community into manageable sections board administrators can work with. Each user can belong to several groups and each group can be assigned individual permissions. This provides an easy way for administrators to change permissions for many users at once, such as changing moderator permissions or granting users access to a private forum.'
-	),
-	array(
-		0 => 'Where are the usergroups and how do I join one?',
-		1 => 'You can view all usergroups via the “Usergroups” link within your User Control Panel. If you would like to join one, proceed by clicking the appropriate button. Not all groups have open access, however. Some may require approval to join, some may be closed and some may even have hidden memberships. If the group is open, you can join it by clicking the appropriate button. If a group requires approval to join you may request to join by clicking the appropriate button. The user group leader will need to approve your request and may ask why you want to join the group. Please do not harass a group leader if they reject your request; they will have their reasons.'
-	),
-	array(
-		0 => 'How do I become a usergroup leader?',
-		1 => 'A usergroup leader is usually assigned when usergroups are initially created by a board administrator. If you are interested in creating a usergroup, your first point of contact should be an administrator; try sending a private message.',
-	),
-	array(
-		0 => 'Why do some usergroups appear in a different colour?',
-		1 => 'It is possible for the board administrator to assign a colour to the members of a usergroup to make it easy to identify the members of this group.'
-	),
-	array(
-		0 => 'What is a “Default usergroup”?',
-		1 => 'If you are a member of more than one usergroup, your default is used to determine which group colour and group rank should be shown for you by default. The board administrator may grant you permission to change your default usergroup via your User Control Panel.'
-	),
-	array(
-		0 => 'What is “The team” link?',
-		1 => 'This page provides you with a list of board staff, including board administrators and moderators and other details such as the forums they moderate.'
-	),
-	array(
-		0 => '--',
-		1 => 'Private Messaging'
-	),
-	array(
-		0 => 'I cannot send private messages!',
-		1 => 'There are three reasons for this; you are not registered and/or not logged on, the board administrator has disabled private messaging for the entire board, or the board administrator has prevented you from sending messages. Contact a board administrator for more information.'
-	),
-	array(
-		0 => 'I keep getting unwanted private messages!',
-		1 => 'You can block a user from sending you private messages by using message rules within your User Control Panel. If you are receiving abusive private messages from a particular user, inform a board administrator; they have the power to prevent a user from sending private messages.'
-	),
-	array(
-		0 => 'I have received a spamming or abusive e-mail from someone on this board!',
-		1 => 'We are sorry to hear that. The e-mail form feature of this board includes safeguards to try and track users who send such posts, so e-mail the board administrator with a full copy of the e-mail you received. It is very important that this includes the headers that contain the details of the user that sent the e-mail. The board administrator can then take action.'
-	),
-	array(
-		0 => '--',
-		1 => 'Friends and Foes'
-	),
-	array(
-		0 => 'What are my Friends and Foes lists?',
-		1 => 'You can use these lists to organise other members of the board. Members added to your friends list will be listed within your User Control Panel for quick access to see their online status and to send them private messages. Subject to template support, posts from these users may also be highlighted. If you add a user to your foes list, any posts they make will be hidden by default.'
-	),
-	array(
-		0 => 'How can I add / remove users to my Friends or Foes list?',
-		1 => 'You can add users to your list in two ways. Within each user’s profile, there is a link to add them to either your Friend or Foe list. Alternatively, from your User Control Panel, you can directly add users by entering their member name. You may also remove users from your list using the same page.'
-	),
-	array(
-		0 => '--',
-		1 => 'Searching the Forums'
-	),
-	array(
-		0 => 'How can I search a forum or forums?',
-		1 => 'Enter a search term in the search box located on the index, forum or topic pages. Advanced search can be accessed by clicking the “Advance Search” link which is available on all pages on the forum. How to access the search may depend on the style used.'
-	),
-	array(
-		0 => 'Why does my search return no results?',
-		1 => 'Your search was probably too vague and included many common terms which are not indexed by phpBB3. Be more specific and use the options available within Advanced search.'
-	),
-	array(
-		0 => 'Why does my search return a blank page!?',
-		1 => 'Your search returned too many results for the webserver to handle. Use “Advanced search” and be more specific in the terms used and forums that are to be searched.'
-	),
-	array(
-		0 => 'How do I search for members?',
-		1 => 'Visit to the “Members” page and click the “Find a member” link.'
-	),
-	array(
-		0 => 'How can I find my own posts and topics?',
-		1 => 'Your own posts can be retrieved either by clicking the “Search user’s posts” within the User Control Panel or via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropriately.'
-	),
-	array(
-		0 => '--',
-		1 => 'Topic Subscriptions and Bookmarks'
-	),
-	array(
-		0 => 'What is the difference between bookmarking and subscribing?',
-		1 => 'Bookmarking in phpBB3 is much like bookmarking in your web browser. You aren’t alerted when there’s an update, but you can come back to the topic later. Subscribing, however, will notify you when there is an update to the topic or forum on the board via your preferred method or methods.'
-	),
-	array(
-		0 => 'How do I subscribe to specific forums or topics?',
-		1 => 'To subscribe to a specific forum, click the “Subscribe forum” link upon entering the forum. To subscribe to a topic, reply to the topic with the subscribe checkbox checked or click the “Subscribe topic” link within the topic itself.'
-	),
-	array(
-		0 => 'How do I remove my subscriptions?',
-		1 => 'To remove your subscriptions, go to your User Control Panel and follow the links to your subscriptions.'
-	),
-	array(
-		0 => '--',
-		1 => 'Attachments'
-	),
-	array(
-		0 => 'What attachments are allowed on this board?',
-		1 => 'Each board administrator can allow or disallow certain attachment types. If you are unsure what is allowed to be uploaded, contact the board administrator for assistance.'
-	),
-	array(
-		0 => 'How do I find all my attachments?',
-		1 => 'To find your list of attachments that you have uploaded, go to your User Control Panel and follow the links to the attachments section.'
-	),
-	array(
-		0 => '--',
-		1 => 'phpBB 3 Issues'
-	),
-	array(
-		0 => 'Who wrote this bulletin board?',
-		1 => 'This software (in its unmodified form) is produced, released and is copyright <a href="http://www.phpbb.com/">phpBB Group</a>. It is made available under the GNU General Public License and may be freely distributed. See the link for more details.'
-	),
-	array(
-		0 => 'Why isn’t X feature available?',
-		1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added, please visit the phpbb.com website and see what phpBB Group have to say. Please do not post feature requests to the board at phpbb.com, the group uses SourceForge to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for a feature and then follow the procedure given there.'
-	),
-	array(
-		0 => 'Who do I contact about abusive and/or legal matters related to this board?',
-		1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a <a href="http://www.google.com/search?q=whois">whois lookup</a>) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Group has <strong>absolutely no jurisdiction</strong> and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter <strong>not directly related</strong> to the phpBB.com website or the discrete software of phpBB itself. If you do e-mail phpBB Group <strong>about any third party</strong> use of this software then you should expect a terse response or no response at all.'
-	)
-);
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
deleted file mode 100644
index 9feed02da6..0000000000
--- a/phpBB/language/en/install.php
+++ /dev/null
@@ -1,627 +0,0 @@
-<?php
-/**
-*
-* install [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ADMIN_CONFIG'				=> 'Administrator configuration',
-	'ADMIN_PASSWORD'			=> 'Administrator password',
-	'ADMIN_PASSWORD_CONFIRM'	=> 'Confirm administrator password',
-	'ADMIN_PASSWORD_EXPLAIN'	=> 'Please enter a password between 6 and 30 characters in length.',
-	'ADMIN_TEST'				=> 'Check administrator settings',
-	'ADMIN_USERNAME'			=> 'Administrator username',
-	'ADMIN_USERNAME_EXPLAIN'	=> 'Please enter a username between 3 and 20 characters in length.',
-	'APP_MAGICK'				=> 'Imagemagick support [ Attachments ]',
-	'AUTHOR_NOTES'				=> 'Author notes<br />» %s',
-	'AVAILABLE'					=> 'Available',
-	'AVAILABLE_CONVERTORS'		=> 'Available convertors',
-
-	'BEGIN_CONVERT'					=> 'Begin conversion',
-	'BLANK_PREFIX_FOUND'			=> 'A scan of your tables has shown a valid installation using no table prefix.',
-	'BOARD_NOT_INSTALLED'			=> 'No installation found',
-	'BOARD_NOT_INSTALLED_EXPLAIN'	=> 'The phpBB Unified Convertor Framework requires a default installation of phpBB3 to function, please <a href="%s">proceed by first installing phpBB3</a>.',
-
-	'CATEGORY'					=> 'Category',
-	'CACHE_STORE'				=> 'Cache type',
-	'CACHE_STORE_EXPLAIN'		=> 'The physical location where data is cached, filesystem is preferred.',
-	'CAT_CONVERT'				=> 'Convert',
-	'CAT_INSTALL'				=> 'Install',
-	'CAT_OVERVIEW'				=> 'Overview',
-	'CAT_UPDATE'				=> 'Update',
-	'CHANGE'					=> 'Change',
-	'CHECK_TABLE_PREFIX'		=> 'Please check your table prefix and try again.',
-	'CLEAN_VERIFY'				=> 'Cleaning up and verifying the final structure',
-	'CLEANING_USERNAMES'		=> 'Cleaning usernames',
-	'COLLIDING_CLEAN_USERNAME'	=> '<strong>%s</strong> is the clean username for:',
-	'COLLIDING_USERNAMES_FOUND'	=> 'Colliding usernames were found on your old board. In order to complete the conversion please delete or rename these users so that there is only one user on your old board for each clean username.',
-	'COLLIDING_USER'			=> '» user id: <strong>%d</strong> username: <strong>%s</strong> (%d posts)',
-	'CONFIG_CONVERT'			=> 'Converting the configuration',
-	'CONFIG_FILE_UNABLE_WRITE'	=> 'It was not possible to write the configuration file. Alternative methods for this file to be created are presented below.',
-	'CONFIG_FILE_WRITTEN'		=> 'The configuration file has been written. You may now proceed to the next step of the installation.',
-	'CONFIG_PHPBB_EMPTY'		=> 'The phpBB3 config variable for “%s” is empty.',
-	'CONFIG_RETRY'				=> 'Retry',
-	'CONTACT_EMAIL_CONFIRM'		=> 'Confirm contact e-mail',
-	'CONTINUE_CONVERT'			=> 'Continue conversion',
-	'CONTINUE_CONVERT_BODY'		=> 'A previous conversion attempt has been determined. You are now able to choose between starting a new conversion or continuing the conversion.',
-	'CONTINUE_LAST'				=> 'Continue last statements',
-	'CONTINUE_OLD_CONVERSION'	=> 'Continue previously started conversion',
-	'CONVERT'					=> 'Convert',
-	'CONVERT_COMPLETE'			=> 'Conversion completed',
-	'CONVERT_COMPLETE_EXPLAIN'	=> 'You have now successfully converted your board to phpBB 3.0. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>.',
-	'CONVERT_INTRO'				=> 'Welcome to the phpBB Unified Convertor Framework',
-	'CONVERT_INTRO_BODY'		=> 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.',
-	'CONVERT_NEW_CONVERSION'	=> 'New conversion',
-	'CONVERT_NOT_EXIST'			=> 'The specified convertor does not exist.',
-	'CONVERT_OPTIONS'			=> 'Options',
-	'CONVERT_SETTINGS_VERIFIED'	=> 'The information you entered has been verified. To start the conversion process, please push the button below.',
-	'CONV_ERR_FATAL'			=> 'Fatal conversion error',
-
-	'CONV_ERROR_ATTACH_FTP_DIR'			=> 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
-	'CONV_ERROR_CONFIG_EMPTY'			=> 'There is no configuration information available for the conversion.',
-	'CONV_ERROR_FORUM_ACCESS'			=> 'Unable to get forum access information.',
-	'CONV_ERROR_GET_CATEGORIES'			=> 'Unable to get categories.',
-	'CONV_ERROR_GET_CONFIG'				=> 'Could not retrieve your board configuration.',
-	'CONV_ERROR_COULD_NOT_READ'			=> 'Unable to access/read “%s”.',
-	'CONV_ERROR_GROUP_ACCESS'			=> 'Unable to get group authentication information.',
-	'CONV_ERROR_INCONSISTENT_GROUPS'	=> 'Inconsistency in groups table detected in add_bots() - you need to add all special groups if you do it manually.',
-	'CONV_ERROR_INSERT_BOT'				=> 'Unable to insert bot into users table.',
-	'CONV_ERROR_INSERT_BOTGROUP'		=> 'Unable to insert bot into bots table.',
-	'CONV_ERROR_INSERT_USER_GROUP'		=> 'Unable to insert user into user_group table.',
-	'CONV_ERROR_MESSAGE_PARSER'			=> 'Message parser error',
-	'CONV_ERROR_NO_AVATAR_PATH'			=> 'Note to developer: you must specify $convertor[\'avatar_path\'] to use %s.',
-	'CONV_ERROR_NO_FORUM_PATH'			=> 'The relative path to the source board has not been specified.',
-	'CONV_ERROR_NO_GALLERY_PATH'		=> 'Note to developer: you must specify $convertor[\'avatar_gallery_path\'] to use %s.',
-	'CONV_ERROR_NO_GROUP'				=> 'Group “%1$s” could not be found in %2$s.',
-	'CONV_ERROR_NO_RANKS_PATH'			=> 'Note to developer: you must specify $convertor[\'ranks_path\'] to use %s.',
-	'CONV_ERROR_NO_SMILIES_PATH'		=> 'Note to developer: you must specify $convertor[\'smilies_path\'] to use %s.',
-	'CONV_ERROR_NO_UPLOAD_DIR'			=> 'Note to developer: you must specify $convertor[\'upload_path\'] to use %s.',
-	'CONV_ERROR_PERM_SETTING'			=> 'Unable to insert/update permission setting.',
-	'CONV_ERROR_PM_COUNT'				=> 'Unable to select folder pm count.',
-	'CONV_ERROR_REPLACE_CATEGORY'		=> 'Unable to insert new forum replacing old category.',
-	'CONV_ERROR_REPLACE_FORUM'			=> 'Unable to insert new forum replacing old forum.',
-	'CONV_ERROR_USER_ACCESS'			=> 'Unable to get user authentication information.',
-	'CONV_ERROR_WRONG_GROUP'			=> 'Wrong group “%1$s” defined in %2$s.',
-	'CONV_OPTIONS_BODY'					=> 'This page collects the data required to access the source board. Enter the database details of your former board; the converter will not change anything in the database given below. The source board should be disabled to allow a consistent conversion.',
-	'CONV_SAVED_MESSAGES'				=> 'Saved messages',
-
-	'COULD_NOT_COPY'			=> 'Could not copy file <strong>%1$s</strong> to <strong>%2$s</strong><br /><br />Please check that the target directory exists and is writable by the webserver.',
-	'COULD_NOT_FIND_PATH'		=> 'Could not find path to your former board. Please check your settings and try again.<br />» %s was specified as the source path.',
-
-	'DBMS'						=> 'Database type',
-	'DB_CONFIG'					=> 'Database configuration',
-	'DB_CONNECTION'				=> 'Database connection',
-	'DB_ERR_INSERT'				=> 'Error while processing <code>INSERT</code> query.',
-	'DB_ERR_LAST'				=> 'Error while processing <var>query_last</var>.',
-	'DB_ERR_QUERY_FIRST'		=> 'Error while executing <var>query_first</var>.',
-	'DB_ERR_QUERY_FIRST_TABLE'	=> 'Error while executing <var>query_first</var>, %s (“%s”).',
-	'DB_ERR_SELECT'				=> 'Error while running <code>SELECT</code> query.',
-	'DB_HOST'					=> 'Database server hostname or DSN',
-	'DB_HOST_EXPLAIN'			=> 'DSN stands for Data Source Name and is relevant only for ODBC installs.',
-	'DB_NAME'					=> 'Database name',
-	'DB_PASSWORD'				=> 'Database password',
-	'DB_PORT'					=> 'Database server port',
-	'DB_PORT_EXPLAIN'			=> 'Leave this blank unless you know the server operates on a non-standard port.',
-	'DB_USERNAME'				=> 'Database username',
-	'DB_TEST'					=> 'Test connection',
-	'DEFAULT_LANG'				=> 'Default board language',
-	'DEFAULT_PREFIX_IS'			=> 'The convertor was not able to find tables with the specified prefix. Please make sure you have entered the correct details for the board you are converting from. The default table prefix for %1$s is <strong>%2$s</strong>.',
-	'DEV_NO_TEST_FILE'			=> 'No value has been specified for the test_file variable in the convertor. If you are a user of this convertor, you should not be seeing this error, please report this message to the convertor author. If you are a convertor author, you must specify the name of a file which exists in the source board to allow the path to it to be verified.',
-	'DIRECTORIES_AND_FILES'		=> 'Directory and file setup',
-	'DISABLE_KEYS'				=> 'Disabling keys',
-	'DLL_DB2'					=> 'DB2',
-	'DLL_FIREBIRD'				=> 'Firebird',
-	'DLL_FTP'					=> 'Remote FTP support [ Installation ]',
-	'DLL_GD'					=> 'GD graphics support [ Visual Confirmation ]',
-	'DLL_MBSTRING'				=> 'Multi-byte character support',
-	'DLL_MSSQL'					=> 'MSSQL Server 2000+',
-	'DLL_MSSQL_2005'			=> 'MSSQL Server 2005+',
-	'DLL_MSSQL_ODBC'			=> 'MSSQL Server 2000+ via ODBC',
-	'DLL_MYSQL'					=> 'MySQL',
-	'DLL_MYSQLI'				=> 'MySQL with MySQLi Extension',
-	'DLL_ORACLE'				=> 'Oracle',
-	'DLL_POSTGRES'				=> 'PostgreSQL 7.x/8.x',
-	'DLL_SQLITE'				=> 'SQLite',
-	'DLL_XML'					=> 'XML support [ Jabber ]',
-	'DLL_ZLIB'					=> 'zlib compression support [ gz, .tar.gz, .zip ]',
-	'DL_CONFIG'					=> 'Download config',
-	'DL_CONFIG_EXPLAIN'			=> 'You may download the complete config.php to your own PC. You will then need to upload the file manually, replacing any existing config.php in your phpBB 3.0 root directory. Please remember to upload the file in ASCII format (see your FTP application documentation if you are unsure how to achieve this). When you have uploaded the config.php please click “Done” to move to the next stage.',
-	'DL_DOWNLOAD'				=> 'Download',
-	'DONE'						=> 'Done',
-
-	'ENABLE_KEYS'				=> 'Re-enabling keys. This can take a while.',
-
-	'FILES_OPTIONAL'			=> 'Optional files and directories',
-	'FILES_OPTIONAL_EXPLAIN'	=> '<strong>Optional</strong> - These files, directories or permission settings are not required. The installation system will attempt to use various techniques to create them if they do not exist or cannot be written to. However, the presence of these will speed installation.',
-	'FILES_REQUIRED'			=> 'Files and Directories',
-	'FILES_REQUIRED_EXPLAIN'	=> '<strong>Required</strong> - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see “Not Found” you need to create the relevant file or directory. If you see “Unwritable” you need to change the permissions on the file or directory to allow phpBB to write to it.',
-	'FILLING_TABLE'				=> 'Filling table <strong>%s</strong>',
-	'FILLING_TABLES'			=> 'Filling tables',
-	'FINAL_STEP'				=> 'Process final step',
-	'FORUM_ADDRESS'				=> 'Board address',
-	'FORUM_ADDRESS_EXPLAIN'		=> 'This is the URL of your former board, for example <samp>http://www.example.com/phpBB2/</samp>. If an address is entered here and not left empty every instance of this address will be replaced by your new board address within messages, private messages and signatures.',
-	'FORUM_PATH'				=> 'Board path',
-	'FORUM_PATH_EXPLAIN'		=> 'This is the <strong>relative</strong> path on disk to your former board from the <strong>root of this phpBB3 installation</strong>.',
-	'FOUND'						=> 'Found',
-	'FTP_CONFIG'				=> 'Transfer config by FTP',
-	'FTP_CONFIG_EXPLAIN'		=> 'phpBB has detected the presence of the FTP module on this server. You may attempt to install your config.php via this if you wish. You will need to supply the information listed below. Remember your username and password are those to your server! (ask your hosting provider for details if you are unsure what these are).',
-	'FTP_PATH'					=> 'FTP path',
-	'FTP_PATH_EXPLAIN'			=> 'This is the path from your root directory to that of phpBB, e.g. <samp>htdocs/phpBB3/</samp>.',
-	'FTP_UPLOAD'				=> 'Upload',
-
-	'GPL'						=> 'General Public License',
-
-	'INITIAL_CONFIG'			=> 'Basic configuration',
-	'INITIAL_CONFIG_EXPLAIN'	=> 'Now that install has determined your server can run phpBB you need to supply some specific information. If you do not know how to connect to your database please contact your hosting provider (in the first instance) or use the phpBB support forums. When entering data please ensure you check it thoroughly before continuing.',
-	'INSTALL_CONGRATS'			=> 'Congratulations!',
-	'INSTALL_CONGRATS_EXPLAIN'	=> '
-		<p>You have now successfully installed phpBB %1$s. From here, you have two options as to what to do with your newly installed phpBB3:</p>
-		<h2>Convert an existing board to phpBB3</h2>
-		<p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed on to the convertor</a>.</p>
-		<h2>Go live with your phpBB3!</h2>
-		<p>Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>, see the <a href="%3$s">README</a> for further information.</p><p><strong>Please now delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.</strong></p>',
-	'INSTALL_INTRO'				=> 'Welcome to Installation',
-
-	'INSTALL_INTRO_BODY'		=> 'With this option, it is possible to install phpBB3 onto your server.</p><p>In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
-
-	<ul>
-		<li>The Database Type - the database you will be using.</li>
-		<li>The Database server hostname or DSN - the address of the database server.</li>
-		<li>The Database server port - the port of the database server (most of the time this is not needed).</li>
-		<li>The Database name - the name of the database on the server.</li>
-		<li>The Database username and Database password - the login data to access the database.</li>
-	</ul>
-
-	<p><strong>Note:</strong> if you are installing using SQLite, you should enter the full path to your database file in the DSN field and leave the username and password fields blank. For security reasons, you should make sure that the database file is not stored in a location accessible from the web.</p>
-
-	<p>phpBB3 supports the following databases:</p>
-	<ul>
-		<li>MySQL 4.1 or above (MySQLi supported)</li>
-		<li>PostgreSQL 7.3+</li>
-		<li>SQLite 2.8.2+</li>
-		<li>Firebird 2.0+</li>
-		<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
-		<li>Oracle</li>
-		<li>IBM DB2</li>
-	</ul>
-
-	<p>Only those databases supported on your server will be displayed.',
-	'INSTALL_INTRO_NEXT'		=> 'To commence the installation, please press the button below.',
-	'INSTALL_LOGIN'				=> 'Login',
-	'INSTALL_NEXT'				=> 'Next stage',
-	'INSTALL_NEXT_FAIL'			=> 'Some tests failed and you should correct these problems before proceeding to the next stage. Failure to do so may result in an incomplete installation.',
-	'INSTALL_NEXT_PASS'			=> 'All the basic tests have been passed and you may proceed to the next stage of installation. If you have changed any permissions, modules, etc. and wish to re-test you can do so if you wish.',
-	'INSTALL_PANEL'				=> 'Installation Panel',
-	'INSTALL_SEND_CONFIG'		=> 'Unfortunately phpBB could not write the configuration information directly to your config.php. This may be because the file does not exist or is not writable. A number of options will be listed below enabling you to complete installation of config.php.',
-	'INSTALL_START'				=> 'Start install',
-	'INSTALL_TEST'				=> 'Test again',
-	'INST_ERR'					=> 'Installation error',
-	'INST_ERR_DB_CONNECT'		=> 'Could not connect to the database, see error message below.',
-	'INST_ERR_DB_FORUM_PATH'	=> 'The database file specified is within your board directory tree. You should put this file in a non web-accessible location.',
-	'INST_ERR_DB_NO_ERROR'		=> 'No error message given.',
-
-	'INST_ERR_DB_MYSQL_VERSION'		=> 'The version of MySQL installed on the target server must be at least 4.1, phpBB 3.1 cannot be installed on an older version.',
-	'INST_ERR_DB_SQLITE_VERSION'	=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
-	'INST_ERR_DB_ORACLE_VERSION'	=> 'The version of Oracle installed on the target server must be at least 9.2, phpBB 3.1 cannot be installed on an older version.',
-	'INST_ERR_DB_FIREBIRD_VERSION'	=> 'The version of Firebird installed on this machine is older than 2.0, please upgrade to a newer version.',
-	'INST_ERR_DB_POSTGRES_VERSION'	=> 'The version of PostgreSQL installed on the target server is older than 8.2, please upgrade to a newer version.',
-	'INST_ERR_DB_DB2_VERSION'		=> 'The version of DB2 installed on the target server is older than 8.2.2, please upgrade to a newer version.',
-	'INST_ERR_DB_DB2_EXT_VERSION'	=> 'The version of the IBM_DB2 extension installed on this machine is older than 1.6.0, please install a newer version.',
-
-	'INST_ERR_DB_NO_ORACLE_NLS'		=> 'You must configure Oracle so that the <var>NLS_CHARACTERSET</var> parameter is set to <var>ALU32UTF8</var>.',
-	'INST_ERR_DB_NO_FIREBIRD_PS'	=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
-	'INST_ERR_DB_NO_POSTGRES_UTF8'	=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
-	'INST_ERR_DB_NO_NAME'		=> 'No database name specified.',
-	'INST_ERR_EMAIL_INVALID'	=> 'The e-mail address you entered is invalid.',
-	'INST_ERR_EMAIL_MISMATCH'	=> 'The e-mails you entered did not match.',
-	'INST_ERR_FATAL'			=> 'Fatal installation error',
-	'INST_ERR_FATAL_DB'			=> 'A fatal and unrecoverable database error has occurred. This may be because the specified user does not have appropriate permissions to <code>CREATE TABLES</code> or <code>INSERT</code> data, etc. Further information may be given below. Please contact your hosting provider in the first instance or the support forums of phpBB for further assistance.',
-	'INST_ERR_FTP_PATH'			=> 'Could not change to the given directory, please check the path.',
-	'INST_ERR_FTP_LOGIN'		=> 'Could not login to FTP server, check your username and password.',
-	'INST_ERR_MISSING_DATA'		=> 'You must fill out all fields in this block.',
-	'INST_ERR_NO_DB'			=> 'Cannot load the PHP module for the selected database type.',
-	'INST_ERR_PASSWORD_MISMATCH'	=> 'The passwords you entered did not match.',
-	'INST_ERR_PASSWORD_TOO_LONG'	=> 'The password you entered is too long. The maximum length is 30 characters.',
-	'INST_ERR_PASSWORD_TOO_SHORT'	=> 'The password you entered is too short. The minimum length is 6 characters.',
-	'INST_ERR_PREFIX'			=> 'Tables with the specified prefix already exist, please choose an alternative.',
-	'INST_ERR_PREFIX_INVALID'	=> 'The table prefix you have specified is invalid for your database. Please try another, removing characters such as the hyphen.',
-	'INST_ERR_PREFIX_TOO_LONG'	=> 'The table prefix you have specified is too long. The maximum length is %d characters.',
-	'INST_ERR_USER_TOO_LONG'	=> 'The username you entered is too long. The maximum length is 20 characters.',
-	'INST_ERR_USER_TOO_SHORT'	=> 'The username you entered is too short. The minimum length is 3 characters.',
-	'INVALID_PRIMARY_KEY'		=> 'Invalid primary key : %s',
-
-	'LONG_SCRIPT_EXECUTION'		=> 'Please note that this can take a while... Please do not stop the script.',
-
-	// mbstring
-	'MBSTRING_CHECK'						=> '<samp>mbstring</samp> extension check',
-	'MBSTRING_CHECK_EXPLAIN'				=> '<strong>Required</strong> - <samp>mbstring</samp> is a PHP extension that provides multibyte string functions. Certain features of mbstring are not compatible with phpBB and must be disabled.',
-	'MBSTRING_FUNC_OVERLOAD'				=> 'Function overloading',
-	'MBSTRING_FUNC_OVERLOAD_EXPLAIN'		=> '<var>mbstring.func_overload</var> must be set to either 0 or 4.',
-	'MBSTRING_ENCODING_TRANSLATION'			=> 'Transparent character encoding',
-	'MBSTRING_ENCODING_TRANSLATION_EXPLAIN'	=> '<var>mbstring.encoding_translation</var> must be set to 0.',
-	'MBSTRING_HTTP_INPUT'					=> 'HTTP input character conversion',
-	'MBSTRING_HTTP_INPUT_EXPLAIN'			=> '<var>mbstring.http_input</var> must be set to <samp>pass</samp>.',
-	'MBSTRING_HTTP_OUTPUT'					=> 'HTTP output character conversion',
-	'MBSTRING_HTTP_OUTPUT_EXPLAIN'			=> '<var>mbstring.http_output</var> must be set to <samp>pass</samp>.',
-
-	'MAKE_FOLDER_WRITABLE'		=> 'Please make sure that this folder exists and is writable by the webserver then try again:<br />»<strong>%s</strong>.',
-	'MAKE_FOLDERS_WRITABLE'		=> 'Please make sure that these folders exist and are writable by the webserver then try again:<br />»<strong>%s</strong>.',
-
-	'MYSQL_SCHEMA_UPDATE_REQUIRED'	=> 'Your MySQL database schema for phpBB is outdated. phpBB detected a schema for MySQL 3.x/4.x, but the server runs on MySQL %2s.<br /><strong>Before you proceed the update, you need to upgrade the schema.</strong><br /><br />Please refer to the <a href="http://www.phpbb.com/kb/article/doesnt-have-a-default-value-errors/">Knowledge Base article about upgrading the MySQL schema</a>. If you encounter problems, please use <a href="http://www.phpbb.com/community/viewforum.php?f=46">our support forums</a>.',
-
-	'NAMING_CONFLICT'			=> 'Naming conflict: %s and %s are both aliases<br /><br />%s',
-	'NEXT_STEP'					=> 'Proceed to next step',
-	'NOT_FOUND'					=> 'Cannot find',
-	'NOT_UNDERSTAND'			=> 'Could not understand %s #%d, table %s (“%s”)',
-	'NO_CONVERTORS'				=> 'No convertors are available for use.',
-	'NO_CONVERT_SPECIFIED'		=> 'No convertor specified.',
-	'NO_LOCATION'				=> 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel',
-	'NO_TABLES_FOUND'			=> 'No tables found.',
-
-	'OVERVIEW_BODY'				=> 'Welcome to phpBB3!<br /><br />phpBB™ is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="../docs/INSTALL.html">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
-
-	'PCRE_UTF_SUPPORT'				=> 'PCRE UTF-8 support',
-	'PCRE_UTF_SUPPORT_EXPLAIN'		=> 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.',
-	'PCRE_UNI_PROP_SUPPORT'				=> 'PCRE Unicode Property support',
-	'PCRE_UNI_PROP_SUPPORT_EXPLAIN'		=> 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with Unicode Property support in the PCRE extension.',
-	'PHP_GETIMAGESIZE_SUPPORT'			=> 'PHP function getimagesize() is available',
-	'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN'	=> '<strong>Required</strong> - In order for phpBB to function correctly, the getimagesize function needs to be available.',
-	'PHP_OPTIONAL_MODULE'			=> 'Optional modules',
-	'PHP_OPTIONAL_MODULE_EXPLAIN'	=> '<strong>Optional</strong> - These modules or applications are optional. However, if they are available they will enable extra features.',
-	'PHP_SUPPORTED_DB'				=> 'Supported databases',
-	'PHP_SUPPORTED_DB_EXPLAIN'		=> '<strong>Required</strong> - You must have support for at least one compatible database within PHP. If no database modules are shown as available you should contact your hosting provider or review the relevant PHP installation documentation for advice.',
-	'PHP_REGISTER_GLOBALS'			=> 'PHP setting <var>register_globals</var> is disabled',
-	'PHP_REGISTER_GLOBALS_EXPLAIN'	=> 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.',
-	'PHP_SAFE_MODE'					=> 'Safe mode',
-	'PHP_SETTINGS'					=> 'PHP version and settings',
-	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.2.0 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
-	'PHP_URL_FOPEN_SUPPORT'			=> 'PHP setting <var>allow_url_fopen</var> is enabled',
-	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it. ',
-	'PHP_VERSION_REQD'				=> 'PHP version >= 5.2.0',
-	'POST_ID'						=> 'Post ID',
-	'PREFIX_FOUND'					=> 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
-	'PREPROCESS_STEP'				=> 'Executing pre-processing functions/queries',
-	'PRE_CONVERT_COMPLETE'			=> 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process. Please note that you may have to manually do and adjust several things. After conversion, especially check the permissions assigned, rebuild your search index which is not converted and also make sure files got copied correctly, for example avatars and smilies.',
-	'PROCESS_LAST'					=> 'Processing last statements',
-
-	'REFRESH_PAGE'				=> 'Refresh page to continue conversion',
-	'REFRESH_PAGE_EXPLAIN'		=> 'If set to yes, the convertor will refresh the page to continue the conversion after having finished a step. If this is your first conversion for testing purposes and to determine any errors in advance, we suggest to set this to No.',
-	'REQUIREMENTS_TITLE'		=> 'Installation compatibility',
-	'REQUIREMENTS_EXPLAIN'		=> 'Before proceeding with the full installation phpBB will carry out some tests on your server configuration and files to ensure that you are able to install and run phpBB. Please ensure you read through the results thoroughly and do not proceed until all the required tests are passed. If you wish to use any of the features depending on the optional tests, you should ensure that these tests are passed also.',
-	'RETRY_WRITE'				=> 'Retry writing config',
-	'RETRY_WRITE_EXPLAIN'		=> 'If you wish you can change the permissions on config.php to allow phpBB to write to it. Should you wish to do that you can click Retry below to try again. Remember to return the permissions on config.php after phpBB has finished installation.',
-
-	'SCRIPT_PATH'				=> 'Script path',
-	'SCRIPT_PATH_EXPLAIN'		=> 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>.',
-	'SELECT_LANG'				=> 'Select language',
-	'SERVER_CONFIG'				=> 'Server configuration',
-	'SEARCH_INDEX_UNCONVERTED'	=> 'Search index was not converted',
-	'SEARCH_INDEX_UNCONVERTED_EXPLAIN'	=> 'Your old search index was not converted. Searching will always yield an empty result. To create a new search index go to the Administration Control Panel, select Maintenance and then choose Search index from the submenu.',
-	'SOFTWARE'					=> 'Board software',
-	'SPECIFY_OPTIONS'			=> 'Specify conversion options',
-	'STAGE_ADMINISTRATOR'		=> 'Administrator details',
-	'STAGE_ADVANCED'			=> 'Advanced settings',
-	'STAGE_ADVANCED_EXPLAIN'	=> 'The settings on this page are only necessary to set if you know that you require something different from the default. If you are unsure, just proceed to the next page, as these settings can be altered from the Administration Control Panel later.',
-	'STAGE_CONFIG_FILE'			=> 'Configuration file',
-	'STAGE_CREATE_TABLE'		=> 'Create database tables',
-	'STAGE_CREATE_TABLE_EXPLAIN'	=> 'The database tables used by phpBB 3.0 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.',
-	'STAGE_DATABASE'			=> 'Database settings',
-	'STAGE_FINAL'				=> 'Final stage',
-	'STAGE_INTRO'				=> 'Introduction',
-	'STAGE_IN_PROGRESS'			=> 'Conversion in progress',
-	'STAGE_REQUIREMENTS'		=> 'Requirements',
-	'STAGE_SETTINGS'			=> 'Settings',
-	'STARTING_CONVERT'			=> 'Starting conversion process',
-	'STEP_PERCENT_COMPLETED'	=> 'Step <strong>%d</strong> of <strong>%d</strong>',
-	'SUB_INTRO'					=> 'Introduction',
-	'SUB_LICENSE'				=> 'License',
-	'SUB_SUPPORT'				=> 'Support',
-	'SUCCESSFUL_CONNECT'		=> 'Successful connection',
-	'SUPPORT_BODY'				=> 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="http://www.phpbb.com/community/viewforum.php?f=65">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>MODs / Styles</h2><p>For issues relating to MODs, please post in the appropriate <a href="http://www.phpbb.com/community/viewforum.php?f=81">Modifications Forum</a>.<br />For issues relating to styles, templates and imagesets, please post in the appropriate <a href="http://www.phpbb.com/community/viewforum.php?f=80">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="http://www.phpbb.com/community/viewtopic.php?f=14&amp;t=571070">The phpBB Welcome Package</a><br /><a href="http://www.phpbb.com/support/">Support Section</a><br /><a href="http://www.phpbb.com/support/documentation/3.0/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/">subscribe to our mailing list</a>?<br /><br />',
-	'SYNC_FORUMS'				=> 'Starting to synchronise forums',
-	'SYNC_POST_COUNT'			=> 'Synchronising post_counts',
-	'SYNC_POST_COUNT_ID'		=> 'Synchronising post_counts from <var>entry</var> %1$s to %2$s.',
-	'SYNC_TOPICS'				=> 'Starting to synchronise topics',
-	'SYNC_TOPIC_ID'				=> 'Synchronising topics from <var>topic_id</var> %1$s to %2$s.',
-
-	'TABLES_MISSING'			=> 'Could not find these tables<br />» <strong>%s</strong>.',
-	'TABLE_PREFIX'				=> 'Prefix for tables in database',
-	'TABLE_PREFIX_SAME'			=> 'The table prefix needs to be the one used by the software you are converting from.<br />» Specified table prefix was %s.',
-	'TESTS_PASSED'				=> 'Tests passed',
-	'TESTS_FAILED'				=> 'Tests failed',
-
-	'UNABLE_WRITE_LOCK'			=> 'Unable to write lock file.',
-	'UNAVAILABLE'				=> 'Unavailable',
-	'UNWRITABLE'				=> 'Unwritable',
-	'UPDATE_TOPICS_POSTED'		=> 'Generating topics posted information',
-	'UPDATE_TOPICS_POSTED_ERR'	=> 'An error occured while generating topics posted information. You can retry this step in the ACP after the conversion process is completed.',
-	'VERIFY_OPTIONS'			=> 'Verifying conversion options',
-	'VERSION'					=> 'Version',
-
-	'WELCOME_INSTALL'			=> 'Welcome to phpBB3 Installation',
-	'WRITABLE'					=> 'Writable',
-));
-
-// Updater
-$lang = array_merge($lang, array(
-	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
-	'ARCHIVE_FILE'				=> 'Source file within archive',
-
-	'BACK'				=> 'Back',
-	'BINARY_FILE'		=> 'Binary file',
-	'BOT'				=> 'Spider/Robot',
-
-	'CHANGE_CLEAN_NAMES'			=> 'The method used to make sure a username is not used by multiple users has been changed. There are some users which have the same name when compared with the new method. You have to delete or rename these users to make sure that each name is only used by one user before you can proceed.',
-	'CHECK_FILES'					=> 'Check files',
-	'CHECK_FILES_EXPLAIN'			=> 'Within the next step all files will be checked against the update files - this can take a while if this is the first file check.',
-	'CHECK_FILES_UP_TO_DATE'		=> 'According to your database your version is up to date. You may want to proceed with the file check to make sure all files are really up to date with the latest phpBB version.',
-	'CHECK_UPDATE_DATABASE'			=> 'Continue update process',
-	'COLLECTED_INFORMATION'			=> 'File information',
-	'COLLECTED_INFORMATION_EXPLAIN'	=> 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
-	'COLLECTING_FILE_DIFFS'			=> 'Collecting file differences',
-	'COMPLETE_LOGIN_TO_BOARD'		=> 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
-	'CONTINUE_UPDATE'				=> 'Check files again',
-	'CONTINUE_UPDATE_NOW'			=> 'Continue the update process now',
-	'CURRENT_FILE'					=> 'Begin of Conflict - Original File code before update',
-	'CURRENT_VERSION'				=> 'Current version',
-
-	'DATABASE_TYPE'						=> 'Database type',
-	'DATABASE_UPDATE_INFO_OLD'			=> 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.',
-	'DELETE_USER_REMOVE'				=> 'Delete user and remove posts',
-	'DELETE_USER_RETAIN'				=> 'Delete user but keep posts',
-	'DESTINATION'						=> 'Destination file',
-	'DIFF_INLINE'						=> 'Inline',
-	'DIFF_RAW'							=> 'Raw unified diff',
-	'DIFF_SEP_EXPLAIN'					=> 'Code block used within the updated/new file',
-	'DIFF_SIDE_BY_SIDE'					=> 'Side by Side',
-	'DIFF_UNIFIED'						=> 'Unified diff',
-	'DO_NOT_UPDATE'						=> 'Do not update this file',
-	'DONE'								=> 'Done',
-	'DOWNLOAD'							=> 'Download',
-	'DOWNLOAD_AS'						=> 'Download as',
-	'DOWNLOAD_CONFLICTS'				=> 'Download conflicts for this file',
-	'DOWNLOAD_CONFLICTS_EXPLAIN'		=> 'Search for &lt;&lt;&lt; to spot conflicts',
-
-	'ERROR'			=> 'Error',
-	'EDIT_USERNAME'	=> 'Edit username',
-
-	'FILE_ALREADY_UP_TO_DATE'		=> 'File is already up to date.',
-	'FILE_DIFF_NOT_ALLOWED'			=> 'File not allowed to be diffed.',
-	'FILE_USED'						=> 'Information used from',			// Single file
-	'FILES_CONFLICT'				=> 'Conflict files',
-	'FILES_CONFLICT_EXPLAIN'		=> 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.',
-	'FILES_MODIFIED'				=> 'Modified files',
-	'FILES_MODIFIED_EXPLAIN'		=> 'The following files are modified and do not represent the original files from the old version. The updated file will be a merge between your modifications and the new file.',
-	'FILES_NEW'						=> 'New files',
-	'FILES_NEW_EXPLAIN'				=> 'The following files currently do not exist within your installation. These files will be added to your installation.',
-	'FILES_NEW_CONFLICT'			=> 'New conflicting files',
-	'FILES_NEW_CONFLICT_EXPLAIN'	=> 'The following files are new within the latest version but it has been determined that there is already a file with the same name within the same position. This file will be overwritten by the new file.',
-	'FILES_NOT_MODIFIED'			=> 'Not modified files',
-	'FILES_NOT_MODIFIED_EXPLAIN'	=> 'The following files are not modified and represent the original phpBB files from the version you want to update from.',
-	'FILES_UP_TO_DATE'				=> 'Already updated files',
-	'FILES_UP_TO_DATE_EXPLAIN'		=> 'The following files are already up to date and do not need to be updated.',
-
-	'INCOMPATIBLE_UPDATE_FILES'		=> 'The update files found are incompatible with your installed version. Your installed version is %1$s and the update file is for updating phpBB %2$s to %3$s.',
-	'INCOMPLETE_UPDATE_FILES'		=> 'The update files are incomplete.',
-	'INLINE_UPDATE_SUCCESSFUL'		=> 'The database update was successful. Now you need to continue the update process.',
-
-	'KEEP_OLD_NAME'		=> 'Keep username',
-
-	'LATEST_VERSION'		=> 'Latest version',
-	'LINE'					=> 'Line',
-	'LINE_ADDED'			=> 'Added',
-	'LINE_MODIFIED'			=> 'Modified',
-	'LINE_REMOVED'			=> 'Removed',
-	'LINE_UNMODIFIED'		=> 'Unmodified',
-	'LOGIN_UPDATE_EXPLAIN'	=> 'In order to update your installation you need to login first.',
-
-	'MERGE_MODIFICATIONS_OPTION'	=> 'Merge modifications',
-
-	'MERGE_NO_MERGE_NEW_OPTION'	=> 'Do not merge - use new file',
-	'MERGE_NO_MERGE_MOD_OPTION'	=> 'Do not merge - use currently installed file',
-	'MERGE_MOD_FILE_OPTION'		=> 'Merge modifications (Loose new phpBB code within conflicting block)',
-	'MERGE_NEW_FILE_OPTION'		=> 'Merge modifications (Loose modified code within conflicting block)',
-	'MERGE_SELECT_ERROR'		=> 'Conflicting file merge modes are not correctly selected.',
-	'MERGING_FILES'				=> 'Merging differences',
-	'MERGING_FILES_EXPLAIN'		=> 'Currently collecting final file changes.<br /><br />Please wait until phpBB has completed all operations on changed files.',
-
-	'NEW_FILE'						=> 'End of Conflict',
-	'NEW_USERNAME'					=> 'New username',
-	'NO_AUTH_UPDATE'				=> 'Not authorised to update',
-	'NO_ERRORS'						=> 'No errors',
-	'NO_UPDATE_FILES'				=> 'Not updating the following files',
-	'NO_UPDATE_FILES_EXPLAIN'		=> 'The following files are new or modified but the directory they normally reside in could not be found on your installation. If this list contains files to other directories than language/ or styles/ than you may have modified your directory structure and the update may be incomplete.',
-	'NO_UPDATE_FILES_OUTDATED'		=> 'No valid update directory was found, please make sure you uploaded the relevant files.<br /><br />Your installation does <strong>not</strong> seem to be up to date. Updates are available for your version of phpBB %1$s, please visit <a href="http://www.phpbb.com/downloads/" rel="external">http://www.phpbb.com/downloads/</a> to obtain the correct package to update from Version %2$s to Version %3$s.',
-	'NO_UPDATE_FILES_UP_TO_DATE'	=> 'Your version is up to date. There is no need to run the update tool. If you want to make an integrity check on your files make sure you uploaded the correct update files.',
-	'NO_UPDATE_INFO'				=> 'Update file information could not be found.',
-	'NO_UPDATES_REQUIRED'			=> 'No updates required',
-	'NO_VISIBLE_CHANGES'			=> 'No visible changes',
-	'NOTICE'						=> 'Notice',
-	'NUM_CONFLICTS'					=> 'Number of conflicts',
-	'NUMBER_OF_FILES_COLLECTED'		=> 'Currently differences of %1$d of %2$d files have been checked.<br />Please wait until all files are checked.',
-
-	'OLD_UPDATE_FILES'		=> 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
-
-	'PACKAGE_UPDATES_TO'				=> 'Current package updates to version',
-	'PERFORM_DATABASE_UPDATE'			=> 'Perform database update',
-	'PERFORM_DATABASE_UPDATE_EXPLAIN'	=> 'Below you will find a button to the database update script. The database update can take a while, so please do not stop the execution if it seems to hang. After the database update has been performed just follow the instructions to continue the update process.',
-	'PREVIOUS_VERSION'					=> 'Previous version',
-	'PROGRESS'							=> 'Progress',
-
-	'RESULT'					=> 'Result',
-	'RUN_DATABASE_SCRIPT'		=> 'Update my database now',
-
-	'SELECT_DIFF_MODE'			=> 'Select diff mode',
-	'SELECT_DOWNLOAD_FORMAT'	=> 'Select download archive format',
-	'SHOW_DIFF_CONFLICT'		=> 'Show differences/conflicts',
-	'SHOW_DIFF_FINAL'			=> 'Show resulting file',
-	'SHOW_DIFF_MODIFIED'		=> 'Show merged differences',
-	'SHOW_DIFF_NEW'				=> 'Show file contents',
-	'SHOW_DIFF_NEW_CONFLICT'	=> 'Show differences',
-	'SHOW_DIFF_NOT_MODIFIED'	=> 'Show differences',
-	'SOME_QUERIES_FAILED'		=> 'Some queries failed, the statements and errors are listing below.',
-	'SQL'						=> 'SQL',
-	'SQL_FAILURE_EXPLAIN'		=> 'This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our support forums. See <a href="../docs/README.html">README</a> for details on how to obtain advice.',
-	'STAGE_FILE_CHECK'			=> 'Check files',
-	'STAGE_UPDATE_DB'			=> 'Update database',
-	'STAGE_UPDATE_FILES'		=> 'Update files',
-	'STAGE_VERSION_CHECK'		=> 'Version check',
-	'STATUS_CONFLICT'			=> 'Modified file producing conflicts',
-	'STATUS_MODIFIED'			=> 'Modified file',
-	'STATUS_NEW'				=> 'New file',
-	'STATUS_NEW_CONFLICT'		=> 'Conflicting new file',
-	'STATUS_NOT_MODIFIED'		=> 'Not modified file',
-	'STATUS_UP_TO_DATE'			=> 'Already updated file',
-
-	'TOGGLE_DISPLAY'			=> 'View/Hide file list',
-
-	'UPDATE_COMPLETED'				=> 'Update completed',
-	'UPDATE_DATABASE'				=> 'Update database',
-	'UPDATE_DATABASE_EXPLAIN'		=> 'Within the next step the database will be updated.',
-	'UPDATE_DATABASE_SCHEMA'		=> 'Updating database schema',
-	'UPDATE_FILES_NOTICE'			=> 'Please make sure you have updated your board files too, this file is only updating your database.',
-	'UPDATE_INSTALLATION'			=> 'Update phpBB installation',
-	'UPDATE_INSTALLATION_EXPLAIN'	=> 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />',
-	'UPDATE_INSTRUCTIONS'			=> '
-
-		<h1>Release announcement</h1>
-
-		<p>Please read <a href="%1$s" title="%1$s"><strong>the release announcement for the latest version</strong></a> before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.</p>
-
-		<br />
-
-		<h1>How to update your installation with the Automatic Update Package</h1>
-
-		<p>The recommended way of updating your installation listed here is only valid for the automatic update package. You are also able to update your installation using the methods listed within the INSTALL.html document. The steps for updating phpBB3 automatically are:</p>
-
-		<ul style="margin-left: 20px; font-size: 1.1em;">
-			<li>Go to the <a href="http://www.phpbb.com/downloads/" title="http://www.phpbb.com/downloads/">phpBB.com downloads page</a> and download the "Automatic Update Package" archive.<br /><br /></li>
-			<li>Unpack the archive.<br /><br /></li>
-			<li>Upload the complete uncompressed install folder to your phpBB root directory (where your config.php file is).<br /><br /></li>
-		</ul>
-
-		<p>Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.<br /><br />
-		<strong><a href="%2$s" title="%2$s">Now start the update process by pointing your browser to the install folder</a>.</strong><br />
-		<br />
-		You will then be guided through the update process. You will be notified once the update is complete.
-		</p>
-	',
-	'UPDATE_INSTRUCTIONS_INCOMPLETE'	=> '
-
-		<h1>Incomplete update detected</h1>
-
-		<p>phpBB detected an incomplete automatic update. Please make sure you followed every step within the automatic update tool. Below you will find the link again, or go directly to your install directory.</p>
-	',
-	'UPDATE_METHOD'					=> 'Update method',
-	'UPDATE_REQUIRES_FILE'			=> 'The updater requires that the following file is present: %s',
-	'UPDATE_SUCCESS_EXPLAIN'		=> 'Successfully updated all files. The next step involves checking all files again to make sure the files got updated correctly.',
-	'UPDATE_VERSION_OPTIMIZE'		=> 'Updating version and optimising tables',
-	'UPDATING_DATA'					=> 'Updating data',
-	'UPDATING_TO_LATEST_STABLE'		=> 'Updating database to latest stable release',
-	'UPDATED_VERSION'				=> 'Updated version',
-	'UPLOAD_METHOD'					=> 'Upload method',
-
-	'UPDATE_DB_SUCCESS'				=> 'Database update was successful.',
-	'USER_ACTIVE'					=> 'Active user',
-	'USER_INACTIVE'					=> 'Inactive user',
-
-	'VERSION_CHECK'				=> 'Version check',
-	'VERSION_CHECK_EXPLAIN'		=> 'Checks to see if the version of phpBB you are currently running is up to date.',
-	'VERSION_NOT_UP_TO_DATE'	=> 'Your version of phpBB is not up to date. Please continue the update process.',
-	'VERSION_NOT_UP_TO_DATE_ACP'=> 'Your version of phpBB is not up to date.<br />Below you will find a link to the release announcement for the latest version as well as instructions on how to perform the update.',
-	'VERSION_UP_TO_DATE'		=> 'Your installation is up to date, no updates are available for your version of phpBB. You may want to continue anyway to perform a file validity check.',
-	'VERSION_UP_TO_DATE_ACP'	=> 'Your installation is up to date, no updates are available for your version of phpBB. You do not need to update your installation.',
-	'VIEWING_FILE_CONTENTS'		=> 'Viewing file contents',
-	'VIEWING_FILE_DIFF'			=> 'Viewing file differences',
-
-	'WRONG_INFO_FILE_FORMAT'	=> 'Wrong info file format',
-));
-
-// Default database schema entries...
-$lang = array_merge($lang, array(
-	'CONFIG_BOARD_EMAIL_SIG'		=> 'Thanks, The Management',
-	'CONFIG_SITE_DESC'				=> 'A short text to describe your forum',
-	'CONFIG_SITENAME'				=> 'yourdomain.com',
-
-	'DEFAULT_INSTALL_POST'			=> 'This is an example post in your phpBB3 installation. Everything seems to be working. You may delete this post if you like and continue to set up your board. During the installation process your first category and your first forum are assigned an appropriate set of permissions for the predefined usergroups administrators, bots, global moderators, guests, registered users and registered COPPA users. If you also choose to delete your first category and your first forum, do not forget to assign permissions for all these usergroups for all new categories and forums you create. It is recommended to rename your first category and your first forum and copy permissions from these while creating new categories and forums. Have fun!',
-
-	'EXT_GROUP_ARCHIVES'			=> 'Archives',
-	'EXT_GROUP_DOCUMENTS'			=> 'Documents',
-	'EXT_GROUP_DOWNLOADABLE_FILES'	=> 'Downloadable Files',
-	'EXT_GROUP_FLASH_FILES'			=> 'Flash Files',
-	'EXT_GROUP_IMAGES'				=> 'Images',
-	'EXT_GROUP_PLAIN_TEXT'			=> 'Plain Text',
-	'EXT_GROUP_QUICKTIME_MEDIA'		=> 'Quicktime Media',
-	'EXT_GROUP_REAL_MEDIA'			=> 'Real Media',
-	'EXT_GROUP_WINDOWS_MEDIA'		=> 'Windows Media',
-
-	'FORUMS_FIRST_CATEGORY'			=> 'Your first category',
-	'FORUMS_TEST_FORUM_DESC'		=> 'Description of your first forum.',
-	'FORUMS_TEST_FORUM_TITLE'		=> 'Your first forum',
-
-	'RANKS_SITE_ADMIN_TITLE'		=> 'Site Admin',
-	'REPORT_WAREZ'					=> 'The post contains links to illegal or pirated software.',
-	'REPORT_SPAM'					=> 'The reported post has the only purpose to advertise for a website or another product.',
-	'REPORT_OFF_TOPIC'				=> 'The reported post is off topic.',
-	'REPORT_OTHER'					=> 'The reported post does not fit into any other category, please use the further information field.',
-
-	'SMILIES_ARROW'					=> 'Arrow',
-	'SMILIES_CONFUSED'				=> 'Confused',
-	'SMILIES_COOL'					=> 'Cool',
-	'SMILIES_CRYING'				=> 'Crying or Very Sad',
-	'SMILIES_EMARRASSED'			=> 'Embarrassed',
-	'SMILIES_EVIL'					=> 'Evil or Very Mad',
-	'SMILIES_EXCLAMATION'			=> 'Exclamation',
-	'SMILIES_GEEK'					=> 'Geek',
-	'SMILIES_IDEA'					=> 'Idea',
-	'SMILIES_LAUGHING'				=> 'Laughing',
-	'SMILIES_MAD'					=> 'Mad',
-	'SMILIES_MR_GREEN'				=> 'Mr. Green',
-	'SMILIES_NEUTRAL'				=> 'Neutral',
-	'SMILIES_QUESTION'				=> 'Question',
-	'SMILIES_RAZZ'					=> 'Razz',
-	'SMILIES_ROLLING_EYES'			=> 'Rolling Eyes',
-	'SMILIES_SAD'					=> 'Sad',
-	'SMILIES_SHOCKED'				=> 'Shocked',
-	'SMILIES_SMILE'					=> 'Smile',
-	'SMILIES_SURPRISED'				=> 'Surprised',
-	'SMILIES_TWISTED_EVIL'			=> 'Twisted Evil',
-	'SMILIES_UBER_GEEK'				=> 'Uber Geek',
-	'SMILIES_VERY_HAPPY'			=> 'Very Happy',
-	'SMILIES_WINK'					=> 'Wink',
-
-	'TOPICS_TOPIC_TITLE'			=> 'Welcome to phpBB3',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/iso.txt b/phpBB/language/en/iso.txt
deleted file mode 100644
index c421dd4316..0000000000
--- a/phpBB/language/en/iso.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-British English
-British English
-phpBB Group
\ No newline at end of file
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
deleted file mode 100644
index 93b694be77..0000000000
--- a/phpBB/language/en/mcp.php
+++ /dev/null
@@ -1,376 +0,0 @@
-<?php
-/**
-*
-* mcp [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ACTION'				=> 'Action',
-	'ACTION_NOTE'			=> 'Action/Note',
-	'ADD_FEEDBACK'			=> 'Add feedback',
-	'ADD_FEEDBACK_EXPLAIN'	=> 'If you would like to add a report on this please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.',
-	'ADD_WARNING'			=> 'Add warning',
-	'ADD_WARNING_EXPLAIN'	=> 'To send a warning to this user please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.',
-	'ALL_ENTRIES'			=> 'All entries',
-	'ALL_NOTES_DELETED'		=> 'Successfully removed all user notes.',
-	'ALL_REPORTS'			=> 'All reports',
-	'ALREADY_REPORTED'		=> 'This post has already been reported.',
-	'ALREADY_WARNED'		=> 'A warning has already been issued for this post.',
-	'APPROVE'				=> 'Approve',
-	'APPROVE_POST'			=> 'Approve post',
-	'APPROVE_POST_CONFIRM'	=> 'Are you sure you want to approve this post?',
-	'APPROVE_POSTS'			=> 'Approve posts',
-	'APPROVE_POSTS_CONFIRM'	=> 'Are you sure you want to approve the selected posts?',
-
-	'CANNOT_MOVE_SAME_FORUM'=> 'You cannot move a topic to the forum it’s already in.',
-	'CANNOT_WARN_ANONYMOUS'	=> 'You cannot warn unregistered guest users.',
-	'CANNOT_WARN_SELF'		=> 'You cannot warn yourself.',
-	'CAN_LEAVE_BLANK'		=> 'This can be left blank.',
-	'CHANGE_POSTER'			=> 'Change poster',
-	'CLOSE_REPORT'			=> 'Close report',
-	'CLOSE_REPORT_CONFIRM'	=> 'Are you sure you want to close the selected report?',
-	'CLOSE_REPORTS'			=> 'Close reports',
-	'CLOSE_REPORTS_CONFIRM'	=> 'Are you sure you want to close the selected reports?',
-
-	'DELETE_POSTS'				=> 'Delete posts',
-	'DELETE_POSTS_CONFIRM'		=> 'Are you sure you want to delete these posts?',
-	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
-	'DELETE_REPORT'				=> 'Delete report',
-	'DELETE_REPORT_CONFIRM'		=> 'Are you sure you want to delete the selected report?',
-	'DELETE_REPORTS'			=> 'Delete reports',
-	'DELETE_REPORTS_CONFIRM'	=> 'Are you sure you want to delete the selected reports?',
-	'DELETE_SHADOW_TOPIC'		=> 'Delete shadow topic',
-	'DELETE_TOPICS'				=> 'Delete selected topics',
-	'DELETE_TOPICS_CONFIRM'		=> 'Are you sure you want to delete these topics?',
-	'DELETE_TOPIC_CONFIRM'		=> 'Are you sure you want to delete this topic?',
-	'DISAPPROVE'				=> 'Disapprove',
-	'DISAPPROVE_REASON'			=> 'Reason for disapproval',
-	'DISAPPROVE_POST'			=> 'Disapprove post',
-	'DISAPPROVE_POST_CONFIRM'	=> 'Are you sure you want to disapprove this post?',
-	'DISAPPROVE_POSTS'			=> 'Disapprove posts',
-	'DISAPPROVE_POSTS_CONFIRM'	=> 'Are you sure you want to disapprove the selected posts?',
-	'DISPLAY_LOG'				=> 'Display entries from previous',
-	'DISPLAY_OPTIONS'			=> 'Display options',
-
-	'EMPTY_REPORT'					=> 'You must enter a description when selecting this reason.',
-	'EMPTY_TOPICS_REMOVED_WARNING'	=> 'Please note that one or several topics have been removed from the database because they were or become empty.',
-
-	'FEEDBACK'				=> 'Feedback',
-	'FORK'					=> 'Copy',
-	'FORK_TOPIC'			=> 'Copy topic',
-	'FORK_TOPIC_CONFIRM'	=> 'Are you sure you want to copy this topic?',
-	'FORK_TOPICS'			=> 'Copy selected topics',
-	'FORK_TOPICS_CONFIRM'	=> 'Are you sure you want to copy the selected topics?',
-	'FORUM_DESC'			=> 'Description',
-	'FORUM_NAME'			=> 'Forum name',
-	'FORUM_NOT_EXIST'		=> 'The forum you selected does not exist.',
-	'FORUM_NOT_POSTABLE'	=> 'The forum you selected cannot be posted to.',
-	'FORUM_STATUS'			=> 'Forum status',
-	'FORUM_STYLE'			=> 'Forum style',
-
-	'GLOBAL_ANNOUNCEMENT'	=> 'Global announcement',
-
-	'IP_INFO'				=> 'IP address information',
-	'IPS_POSTED_FROM'		=> 'IP addresses this user has posted from',
-
-	'LATEST_LOGS'				=> 'Latest 5 logged actions',
-	'LATEST_REPORTED'			=> 'Latest 5 reports',
-	'LATEST_UNAPPROVED'			=> 'Latest 5 posts awaiting approval',
-	'LATEST_WARNING_TIME'		=> 'Latest warning issued',
-	'LATEST_WARNINGS'			=> 'Latest 5 warnings',
-	'LEAVE_SHADOW'				=> 'Leave shadow topic in place',
-	'LIST_REPORT'				=> '1 report',
-	'LIST_REPORTS'				=> '%d reports',
-	'LOCK'						=> 'Lock',
-	'LOCK_POST_POST'			=> 'Lock post',
-	'LOCK_POST_POST_CONFIRM'	=> 'Are you sure you want to prevent editing this post?',
-	'LOCK_POST_POSTS'			=> 'Lock selected posts',
-	'LOCK_POST_POSTS_CONFIRM'	=> 'Are you sure you want to prevent editing the selected posts?',
-	'LOCK_TOPIC_CONFIRM'		=> 'Are you sure you want to lock this topic?',
-	'LOCK_TOPICS'				=> 'Lock selected topics',
-	'LOCK_TOPICS_CONFIRM'		=> 'Are you sure you want to lock all selected topics?',
-	'LOGS_CURRENT_TOPIC'		=> 'Currently viewing logs of:',
-	'LOGIN_EXPLAIN_MCP'			=> 'To moderate this forum you must login.',
-	'LOGVIEW_VIEWTOPIC'			=> 'View topic',
-	'LOGVIEW_VIEWLOGS'			=> 'View topic log',
-	'LOGVIEW_VIEWFORUM'			=> 'View forum',
-	'LOOKUP_ALL'				=> 'Look up all IPs',
-	'LOOKUP_IP'					=> 'Look up IP',
-
-	'MARKED_NOTES_DELETED'		=> 'Successfully removed all marked user notes.',
-
-	'MCP_ADD'						=> 'Add a warning',
-
-	'MCP_BAN'					=> 'Banning',
-	'MCP_BAN_EMAILS'			=> 'Ban e-mails',
-	'MCP_BAN_IPS'				=> 'Ban IPs',
-	'MCP_BAN_USERNAMES'			=> 'Ban Usernames',
-
-	'MCP_LOGS'						=> 'Moderator logs',
-	'MCP_LOGS_FRONT'				=> 'Front page',
-	'MCP_LOGS_FORUM_VIEW'			=> 'Forum logs',
-	'MCP_LOGS_TOPIC_VIEW'			=> 'Topic logs',
-
-	'MCP_MAIN'						=> 'Main',
-	'MCP_MAIN_FORUM_VIEW'			=> 'View forum',
-	'MCP_MAIN_FRONT'				=> 'Front page',
-	'MCP_MAIN_POST_DETAILS'			=> 'Post details',
-	'MCP_MAIN_TOPIC_VIEW'			=> 'View topic',
-	'MCP_MAKE_ANNOUNCEMENT'			=> 'Modify to “Announcement”',
-	'MCP_MAKE_ANNOUNCEMENT_CONFIRM'	=> 'Are you sure you want to change this topic to an “Announcement”?',
-	'MCP_MAKE_ANNOUNCEMENTS'		=> 'Modify to “Announcements”',
-	'MCP_MAKE_ANNOUNCEMENTS_CONFIRM'=> 'Are you sure you want to change the selected topics to “Announcements”?',
-	'MCP_MAKE_GLOBAL'				=> 'Modify to “Global announcement”',
-	'MCP_MAKE_GLOBAL_CONFIRM'		=> 'Are you sure you want to change this topic to a “Global announcement”?',
-	'MCP_MAKE_GLOBALS'				=> 'Modify to “Global announcements”',
-	'MCP_MAKE_GLOBALS_CONFIRM'		=> 'Are you sure you want to change the selected topics to “Global announcements”?',
-	'MCP_MAKE_STICKY'				=> 'Modify to “Sticky”',
-	'MCP_MAKE_STICKY_CONFIRM'		=> 'Are you sure you want to change this topic to a “Sticky”?',
-	'MCP_MAKE_STICKIES'				=> 'Modify to “Stickies”',
-	'MCP_MAKE_STICKIES_CONFIRM'		=> 'Are you sure you want to change the selected topics to “Stickies”?',
-	'MCP_MAKE_NORMAL'				=> 'Modify to “Standard Topic”',
-	'MCP_MAKE_NORMAL_CONFIRM'		=> 'Are you sure you want to change this topic to a “Standard Topic”?',
-	'MCP_MAKE_NORMALS'				=> 'Modify to “Standard Topics”',
-	'MCP_MAKE_NORMALS_CONFIRM'		=> 'Are you sure you want to change the selected topics to “Standard Topics”?',
-
-	'MCP_NOTES'						=> 'User notes',
-	'MCP_NOTES_FRONT'				=> 'Front page',
-	'MCP_NOTES_USER'				=> 'User details',
-
-	'MCP_POST_REPORTS'				=> 'Reports issued on this post',
-
-	'MCP_REPORTS'					=> 'Reported posts',
-	'MCP_REPORT_DETAILS'			=> 'Report details',
-	'MCP_REPORTS_CLOSED'			=> 'Closed reports',
-	'MCP_REPORTS_CLOSED_EXPLAIN'	=> 'This is a list of all reports about posts which have previously been resolved.',
-	'MCP_REPORTS_OPEN'				=> 'Open reports',
-	'MCP_REPORTS_OPEN_EXPLAIN'		=> 'This is a list of all reported posts which are still to be handled.',
-
-	'MCP_QUEUE'								=> 'Moderation queue',
-	'MCP_QUEUE_APPROVE_DETAILS'				=> 'Approve details',
-	'MCP_QUEUE_UNAPPROVED_POSTS'			=> 'Posts awaiting approval',
-	'MCP_QUEUE_UNAPPROVED_POSTS_EXPLAIN'	=> 'This is a list of all posts which require approving before they will be visible to users.',
-	'MCP_QUEUE_UNAPPROVED_TOPICS'			=> 'Topics awaiting approval',
-	'MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN'	=> 'This is a list of all topics which require approving before they will be visible to users.',
-
-	'MCP_VIEW_USER'			=> 'View warnings for a specific user',
-
-	'MCP_WARN'				=> 'Warnings',
-	'MCP_WARN_FRONT'		=> 'Front page',
-	'MCP_WARN_LIST'			=> 'List warnings',
-	'MCP_WARN_POST'			=> 'Warn for specific post',
-	'MCP_WARN_USER'			=> 'Warn user',
-
-	'MERGE_POSTS'			=> 'Merge posts',
-	'MERGE_POSTS_CONFIRM'	=> 'Are you sure you want to merge the selected posts?',
-	'MERGE_TOPIC_EXPLAIN'	=> 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on “Select topic” to search for one.',
-	'MERGE_TOPIC_ID'		=> 'Destination topic identification number',
-	'MERGE_TOPICS'			=> 'Merge topics',
-	'MERGE_TOPICS_CONFIRM'	=> 'Are you sure you want to merge the selected topics?',
-	'MODERATE_FORUM'		=> 'Moderate forum',
-	'MODERATE_TOPIC'		=> 'Moderate topic',
-	'MODERATE_POST'			=> 'Moderate post',
-	'MOD_OPTIONS'			=> 'Moderator options',
-	'MORE_INFO'				=> 'Further information',
-	'MOST_WARNINGS'			=> 'Users with most warnings',
-	'MOVE_TOPIC_CONFIRM'	=> 'Are you sure you want to move the topic into a new forum?',
-	'MOVE_TOPICS'			=> 'Move selected topics',
-	'MOVE_TOPICS_CONFIRM'	=> 'Are you sure you want to move the selected topics into a new forum?',
-
-	'NOTIFY_POSTER_APPROVAL'		=> 'Notify poster about approval?',
-	'NOTIFY_POSTER_DISAPPROVAL'		=> 'Notify poster about disapproval?',
-	'NOTIFY_USER_WARN'				=> 'Notify user about warning?',
-	'NOT_MODERATOR'					=> 'You are not a moderator of this forum.',
-	'NO_DESTINATION_FORUM'			=> 'Please select a forum for destination.',
-	'NO_DESTINATION_FORUM_FOUND'	=> 'There is no destination forum available.',
-	'NO_ENTRIES'					=> 'No log entries for this period.',
-	'NO_FEEDBACK'					=> 'No feedback exists for this user.',
-	'NO_FINAL_TOPIC_SELECTED'		=> 'You have to select a destination topic for merging posts.',
-	'NO_MATCHES_FOUND'				=> 'No matches found.',
-	'NO_POST'						=> 'You have to select a post in order to warn the user for a post.',
-	'NO_POST_REPORT'				=> 'This post was not reported.',
-	'NO_POST_SELECTED'				=> 'You must select at least one post to perform this action.',
-	'NO_REASON_DISAPPROVAL'			=> 'Please give an appropriate reason for disapproval.',
-	'NO_REPORT'						=> 'No report found',
-	'NO_REPORTS'					=> 'No reports found',
-	'NO_REPORT_SELECTED'			=> 'You must select at least one report to perform this action.',
-	'NO_TOPIC_ICON'					=> 'None',
-	'NO_TOPIC_SELECTED'				=> 'You must select at least one topic to perform this action.',
-	'NO_TOPICS_QUEUE'				=> 'There are no topics waiting for approval.',
-
-	'ONLY_TOPIC'			=> 'Only topic “%s”',
-	'OTHER_USERS'			=> 'Other users posting from this IP',
-
-	'POSTER'					=> 'Poster',
-	'POSTS_APPROVED_SUCCESS'	=> 'The selected posts have been approved.',
-	'POSTS_DELETED_SUCCESS'		=> 'The selected posts have been successfully removed from the database.',
-	'POSTS_DISAPPROVED_SUCCESS'	=> 'The selected posts have been disapproved.',
-	'POSTS_LOCKED_SUCCESS'		=> 'The selected posts have been locked successfully.',
-	'POSTS_MERGED_SUCCESS'		=> 'The selected posts have been merged.',
-	'POSTS_UNLOCKED_SUCCESS'	=> 'The selected posts have been unlocked successfully.',
-	'POSTS_PER_PAGE'			=> 'Posts per page',
-	'POSTS_PER_PAGE_EXPLAIN'	=> '(Set to 0 to view all posts.)',
-	'POST_APPROVED_SUCCESS'		=> 'The selected post has been approved.',
-	'POST_DELETED_SUCCESS'		=> 'The selected post has been successfully removed from the database.',
-	'POST_DISAPPROVED_SUCCESS'	=> 'The selected post has been disapproved.',
-	'POST_LOCKED_SUCCESS'		=> 'Post locked successfully.',
-	'POST_NOT_EXIST'			=> 'The post you requested does not exist.',
-	'POST_REPORTED_SUCCESS'		=> 'This post has been successfully reported.',
-	'POST_UNLOCKED_SUCCESS'		=> 'Post unlocked successfully.',
-
-	'READ_USERNOTES'			=> 'User notes',
-	'READ_WARNINGS'				=> 'User warnings',
-	'REPORTER'					=> 'Reporter',
-	'REPORTED'					=> 'Reported',
-	'REPORTED_BY'				=> 'Reported by',
-	'REPORTED_ON_DATE'			=> 'on',
-	'REPORTS_CLOSED_SUCCESS'	=> 'The selected reports have been closed successfully.',
-	'REPORTS_DELETED_SUCCESS'	=> 'The selected reports have been deleted successfully.',
-	'REPORTS_TOTAL'				=> 'In total there are <strong>%d</strong> reports to review.',
-	'REPORTS_ZERO_TOTAL'		=> 'There are no reports to review.',
-	'REPORT_CLOSED'				=> 'This report has already been closed.',
-	'REPORT_CLOSED_SUCCESS'		=> 'The selected report has been closed successfully.',
-	'REPORT_DELETED_SUCCESS'	=> 'The selected report has been deleted successfully.',
-	'REPORT_DETAILS'			=> 'Report details',
-	'REPORT_MESSAGE'			=> 'Report this message',
-	'REPORT_MESSAGE_EXPLAIN'	=> 'Use this form to report the selected message. Reporting should generally be used only if the message breaks forum rules.',
-	'REPORT_NOTIFY'				=> 'Notify me',
-	'REPORT_NOTIFY_EXPLAIN'		=> 'Informs you when your report is dealt with.',
-	'REPORT_POST_EXPLAIN'		=> 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
-	'REPORT_REASON'				=> 'Report reason',
-	'REPORT_TIME'				=> 'Report time',
-	'REPORT_TOTAL'				=> 'In total there is <strong>1</strong> report to review.',
-	'RESYNC'					=> 'Resync',
-	'RETURN_MESSAGE'			=> '%sReturn to the message%s',
-	'RETURN_NEW_FORUM'			=> '%sGo to the new forum%s',
-	'RETURN_NEW_TOPIC'			=> '%sGo to the new topic%s',
-	'RETURN_POST'				=> '%sReturn to the post%s',
-	'RETURN_QUEUE'				=> '%sReturn to the queue%s',
-	'RETURN_REPORTS'			=> '%sReturn to the reports%s',
-	'RETURN_TOPIC_SIMPLE'		=> '%sReturn to the topic%s',
-
-	'SEARCH_POSTS_BY_USER'				=> 'Search posts by',
-	'SELECT_ACTION'						=> 'Select desired action',
-	'SELECT_FORUM_GLOBAL_ANNOUNCEMENT'	=> 'Please select the forum you wish this global announcement to be displayed.',
-	'SELECT_FORUM_GLOBAL_ANNOUNCEMENTS'	=> 'One or more of the selected topics are global announcements. Please select the forum you wish these to be displayed.',
-	'SELECT_MERGE'						=> 'Select for merge',
-	'SELECT_TOPICS_FROM'				=> 'Select topics from',
-	'SELECT_TOPIC'						=> 'Select topic',
-	'SELECT_USER'						=> 'Select user',
-	'SORT_ACTION'						=> 'Log action',
-	'SORT_DATE'							=> 'Date',
-	'SORT_IP'							=> 'IP address',
-	'SORT_WARNINGS'						=> 'Warnings',
-	'SPLIT_AFTER'						=> 'Split topic from selected post onwards',
-	'SPLIT_FORUM'						=> 'Forum for new topic',
-	'SPLIT_POSTS'						=> 'Split selected posts',
-	'SPLIT_SUBJECT'						=> 'New topic title',
-	'SPLIT_TOPIC_ALL'					=> 'Split topic from selected posts',
-	'SPLIT_TOPIC_ALL_CONFIRM'			=> 'Are you sure you want to split this topic?',
-	'SPLIT_TOPIC_BEYOND'				=> 'Split topic at selected post',
-	'SPLIT_TOPIC_BEYOND_CONFIRM'		=> 'Are you sure you want to split this topic at the selected post?',
-	'SPLIT_TOPIC_EXPLAIN'				=> 'Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post.',
-
-	'THIS_POST_IP'				=> 'IP for this post',
-	'TOPICS_APPROVED_SUCCESS'	=> 'The selected topics have been approved.',
-	'TOPICS_DELETED_SUCCESS'	=> 'The selected topics have been successfully removed from the database.',
-	'TOPICS_DISAPPROVED_SUCCESS'=> 'The selected topics have been disapproved.',
-	'TOPICS_FORKED_SUCCESS'		=> 'The selected topics have been copied successfully.',
-	'TOPICS_LOCKED_SUCCESS'		=> 'The selected topics have been locked.',
-	'TOPICS_MOVED_SUCCESS'		=> 'The selected topics have been moved successfully.',
-	'TOPICS_RESYNC_SUCCESS'		=> 'The selected topics have been resynchronised.',
-	'TOPICS_TYPE_CHANGED'		=> 'Topic types changed successfully.',
-	'TOPICS_UNLOCKED_SUCCESS'	=> 'The selected topics have been unlocked.',
-	'TOPIC_APPROVED_SUCCESS'	=> 'The selected topic has been approved.',
-	'TOPIC_DELETED_SUCCESS'		=> 'The selected topic has been successfully removed from the database.',
-	'TOPIC_DISAPPROVED_SUCCESS'	=> 'The selected topic has been disapproved.',
-	'TOPIC_FORKED_SUCCESS'		=> 'The selected topic has been copied successfully.',
-	'TOPIC_LOCKED_SUCCESS'		=> 'The selected topic has been locked.',
-	'TOPIC_MOVED_SUCCESS'		=> 'The selected topic has been moved successfully.',
-	'TOPIC_NOT_EXIST'			=> 'The topic you selected does not exist.',
-	'TOPIC_RESYNC_SUCCESS'		=> 'The selected topic has been resynchronised.',
-	'TOPIC_SPLIT_SUCCESS'		=> 'The selected topic has been split successfully.',
-	'TOPIC_TIME'				=> 'Topic time',
-	'TOPIC_TYPE_CHANGED'		=> 'Topic type changed successfully.',
-	'TOPIC_UNLOCKED_SUCCESS'	=> 'The selected topic has been unlocked.',
-	'TOTAL_WARNINGS'			=> 'Total Warnings',
-
-	'UNAPPROVED_POSTS_TOTAL'		=> 'In total there are <strong>%d</strong> posts waiting for approval.',
-	'UNAPPROVED_POSTS_ZERO_TOTAL'	=> 'There are no posts waiting for approval.',
-	'UNAPPROVED_POST_TOTAL'			=> 'In total there is <strong>1</strong> post waiting for approval.',
-	'UNLOCK'						=> 'Unlock',
-	'UNLOCK_POST'					=> 'Unlock post',
-	'UNLOCK_POST_EXPLAIN'			=> 'Allow editing',
-	'UNLOCK_POST_POST'				=> 'Unlock post',
-	'UNLOCK_POST_POST_CONFIRM'		=> 'Are you sure you want to allow editing this post?',
-	'UNLOCK_POST_POSTS'				=> 'Unlock selected posts',
-	'UNLOCK_POST_POSTS_CONFIRM'		=> 'Are you sure you want to allow editing the selected posts?',
-	'UNLOCK_TOPIC'					=> 'Unlock topic',
-	'UNLOCK_TOPIC_CONFIRM'			=> 'Are you sure you want to unlock this topic?',
-	'UNLOCK_TOPICS'					=> 'Unlock selected topics',
-	'UNLOCK_TOPICS_CONFIRM'			=> 'Are you sure you want to unlock all selected topics?',
-	'USER_CANNOT_POST'				=> 'You cannot post in this forum.',
-	'USER_CANNOT_REPORT'			=> 'You cannot report posts in this forum.',
-	'USER_FEEDBACK_ADDED'			=> 'User feedback added successfully.',
-	'USER_WARNING_ADDED'			=> 'User warned successfully.',
-
-	'VIEW_DETAILS'			=> 'View details',
-	'VIEW_POST'				=> 'View post',
-
-	'WARNED_USERS'			=> 'Warned users',
-	'WARNED_USERS_EXPLAIN'	=> 'This is a list of users with unexpired warnings issued to them.',
-	'WARNING_PM_BODY'		=> 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]',
-	'WARNING_PM_SUBJECT'	=> 'Board warning issued',
-	'WARNING_POST_DEFAULT'	=> 'This is a warning regarding the following post made by you: %s .',
-	'WARNINGS_ZERO_TOTAL'	=> 'No warnings exist.',
-
-	'YOU_SELECTED_TOPIC'	=> 'You selected topic number %d: %s.',
-
-	'report_reasons'		=> array(
-		'TITLE'	=> array(
-			'WAREZ'		=> 'Warez',
-			'SPAM'		=> 'Spam',
-			'OFF_TOPIC'	=> 'Off-topic',
-			'OTHER'		=> 'Other',
-		),
-		'DESCRIPTION' => array(
-			'WAREZ'		=> 'The post contains links to illegal or pirated software.',
-			'SPAM'		=> 'The reported post has the only purpose to advertise for a website or another product.',
-			'OFF_TOPIC'	=> 'The reported post is off topic.',
-			'OTHER'		=> 'The reported post does not fit into any other category, please use the further information field.',
-		)
-	),
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
deleted file mode 100644
index b5b8434776..0000000000
--- a/phpBB/language/en/memberlist.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
-*
-* memberlist [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ABOUT_USER'			=> 'Profile',
-	'ACTIVE_IN_FORUM'		=> 'Most active forum',
-	'ACTIVE_IN_TOPIC'		=> 'Most active topic',
-	'ADD_FOE'				=> 'Add foe',
-	'ADD_FRIEND'			=> 'Add friend',
-	'AFTER'					=> 'After',
-
-	'ALL'					=> 'All',
-
-	'BEFORE'				=> 'Before',
-
-	'CC_EMAIL'				=> 'Send a copy of this e-mail to yourself.',
-	'CONTACT_USER'			=> 'Contact',
-
-	'DEST_LANG'				=> 'Language',
-	'DEST_LANG_EXPLAIN'		=> 'Select an appropriate language (if available) for the recipient of this message.',
-
-	'EMAIL_BODY_EXPLAIN'	=> 'This message will be sent as plain text, do not include any HTML or BBCode. The return address for this message will be set to your e-mail address.',
-	'EMAIL_DISABLED'		=> 'Sorry but all e-mail related functions have been disabled.',
-	'EMAIL_SENT'			=> 'The e-mail has been sent.',
-	'EMAIL_TOPIC_EXPLAIN'	=> 'This message will be sent as plain text, do not include any HTML or BBCode. Please note that the topic information is already included in the message. The return address for this message will be set to your e-mail address.',
-	'EMPTY_ADDRESS_EMAIL'	=> 'You must provide a valid e-mail address for the recipient.',
-	'EMPTY_MESSAGE_EMAIL'	=> 'You must enter a message to be emailed.',
-	'EMPTY_MESSAGE_IM'		=> 'You must enter a message to be send.',
-	'EMPTY_NAME_EMAIL'		=> 'You must enter the real name of the recipient.',
-	'EMPTY_SUBJECT_EMAIL'	=> 'You must specify a subject for the e-mail.',
-	'EQUAL_TO'				=> 'Equal to',
-
-	'FIND_USERNAME_EXPLAIN'	=> 'Use this form to search for specific members. You do not need to fill out all fields. To match partial data use * as a wildcard. When entering dates use the format <kbd>YYYY-MM-DD</kbd>, e.g. <samp>2004-02-29</samp>. Use the mark checkboxes to select one or more usernames (several usernames may be accepted depending on the form itself) and click the Select Marked button to return to the previous form.',
-	'FLOOD_EMAIL_LIMIT'		=> 'You cannot send another e-mail at this time. Please try again later.',
-
-	'GROUP_LEADER'			=> 'Group leader',
-
-	'HIDE_MEMBER_SEARCH'	=> 'Hide member search',
-
-	'IM_ADD_CONTACT'		=> 'Add Contact',
-	'IM_AIM'				=> 'Please note that you need AOL Instant Messenger installed to use this.',
-	'IM_AIM_EXPRESS'		=> 'AIM Express',
-	'IM_DOWNLOAD_APP'		=> 'Download application',
-	'IM_ICQ'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
-	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
-	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
-	'IM_MESSAGE'			=> 'Your message',
-	'IM_MSNM'				=> 'Please note that you need Windows Messenger installed to use this.',
-	'IM_MSNM_BROWSER'		=> 'Your browser does not support this.',
-	'IM_MSNM_CONNECT'		=> 'MSNM is not connected.\nYou have to connect to MSNM to continue.',		
-	'IM_NAME'				=> 'Your Name',
-	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
-	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
-	'IM_RECIPIENT'			=> 'Recipient',
-	'IM_SEND'				=> 'Send message',
-	'IM_SEND_MESSAGE'		=> 'Send message',
-	'IM_SENT_JABBER'		=> 'Your message to %1$s has been sent successfully.',
-	'IM_USER'				=> 'Send an instant message',
-	
-	'LAST_ACTIVE'				=> 'Last active',
-	'LESS_THAN'					=> 'Less than',
-	'LIST_USER'					=> '1 user',
-	'LIST_USERS'				=> '%d users',
-	'LOGIN_EXPLAIN_LEADERS'		=> 'The board requires you to be registered and logged in to view the team listing.',
-	'LOGIN_EXPLAIN_MEMBERLIST'	=> 'The board requires you to be registered and logged in to access the memberlist.',
-	'LOGIN_EXPLAIN_SEARCHUSER'	=> 'The board requires you to be registered and logged in to search users.',
-	'LOGIN_EXPLAIN_VIEWPROFILE'	=> 'The board requires you to be registered and logged in to view profiles.',
-
-	'MORE_THAN'				=> 'More than',
-
-	'NO_EMAIL'				=> 'You are not permitted to send e-mail to this user.',
-	'NO_VIEW_USERS'			=> 'You are not authorised to view the member list or profiles.',
-
-	'ORDER'					=> 'Order',
-	'OTHER'					=> 'Other',
-
-	'POST_IP'				=> 'Posted from IP/domain',
-
-	'RANK'					=> 'Rank',
-	'REAL_NAME'				=> 'Recipient name',
-	'RECIPIENT'				=> 'Recipient',
-	'REMOVE_FOE'			=> 'Remove foe',
-	'REMOVE_FRIEND'			=> 'Remove friend',
-
-	'SEARCH_USER_POSTS'		=> 'Search user’s posts',
-	'SELECT_MARKED'			=> 'Select marked',
-	'SELECT_SORT_METHOD'	=> 'Select sort method',
-	'SEND_AIM_MESSAGE'		=> 'Send AIM message',
-	'SEND_ICQ_MESSAGE'		=> 'Send ICQ message',
-	'SEND_IM'				=> 'Instant messaging',
-	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
-	'SEND_MESSAGE'			=> 'Message',
-	'SEND_MSNM_MESSAGE'		=> 'Send MSNM/WLM message',
-	'SEND_YIM_MESSAGE'		=> 'Send YIM message',
-	'SORT_EMAIL'			=> 'E-mail',
-	'SORT_LAST_ACTIVE'		=> 'Last active',
-	'SORT_POST_COUNT'		=> 'Post count',
-
-	'USERNAME_BEGINS_WITH'	=> 'Username begins with',
-	'USER_ADMIN'			=> 'Administrate user',
-	'USER_BAN'				=> 'Banning',
-	'USER_FORUM'			=> 'User statistics',
-	'USER_ONLINE'			=> 'Online',
-	'USER_PRESENCE'			=> 'Board presence',
-
-	'VIEWING_PROFILE'		=> 'Viewing profile - %s',
-	'VISITED'				=> 'Last visited',
-
-	'WWW'					=> 'Website',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
deleted file mode 100644
index b3acb7f290..0000000000
--- a/phpBB/language/en/posting.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/**
-*
-* posting [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ADD_ATTACHMENT'			=> 'Upload attachment',
-	'ADD_ATTACHMENT_EXPLAIN'	=> 'If you wish to attach one or more files enter the details below.',
-	'ADD_FILE'					=> 'Add the file',
-	'ADD_POLL'					=> 'Poll creation',
-	'ADD_POLL_EXPLAIN'			=> 'If you do not want to add a poll to your topic leave the fields blank.',
-	'ALREADY_DELETED'			=> 'Sorry but this message is already deleted.',
-	'ATTACH_QUOTA_REACHED'		=> 'Sorry, the board attachment quota has been reached.',
-	'ATTACH_SIG'				=> 'Attach a signature (signatures can be altered via the UCP)',
-
-	'BBCODE_A_HELP'				=> 'Inline uploaded attachment: [attachment=]filename.ext[/attachment]',
-	'BBCODE_B_HELP'				=> 'Bold text: [b]text[/b]',
-	'BBCODE_C_HELP'				=> 'Code display: [code]code[/code]',
-	'BBCODE_E_HELP'				=> 'List: Add list element',
-	'BBCODE_F_HELP'				=> 'Font size: [size=85]small text[/size]',
-	'BBCODE_IS_OFF'				=> '%sBBCode%s is <em>OFF</em>',
-	'BBCODE_IS_ON'				=> '%sBBCode%s is <em>ON</em>',
-	'BBCODE_I_HELP'				=> 'Italic text: [i]text[/i]',
-	'BBCODE_L_HELP'				=> 'List: [list]text[/list]',
-	'BBCODE_LISTITEM_HELP'		=> 'List item: [*]text[/*]',
-	'BBCODE_O_HELP'				=> 'Ordered list: [list=]text[/list]',
-	'BBCODE_P_HELP'				=> 'Insert image: [img]http://image_url[/img]',
-	'BBCODE_Q_HELP'				=> 'Quote text: [quote]text[/quote]',
-	'BBCODE_S_HELP'				=> 'Font colour: [color=red]text[/color]  Tip: you can also use color=#FF0000',
-	'BBCODE_U_HELP'				=> 'Underline text: [u]text[/u]',
-	'BBCODE_W_HELP'				=> 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]',
-	'BBCODE_D_HELP'				=> 'Flash: [flash=width,height]http://url[/flash]',
-	'BUMP_ERROR'				=> 'You cannot bump this topic so soon after the last post.',
-
-	'CANNOT_DELETE_REPLIED'		=> 'Sorry but you may only delete posts which have not been replied to.',
-	'CANNOT_EDIT_POST_LOCKED'	=> 'This post has been locked. You can no longer edit that post.',
-	'CANNOT_EDIT_TIME'			=> 'You can no longer edit or delete that post.',
-	'CANNOT_POST_ANNOUNCE'		=> 'Sorry but you cannot post announcements.',
-	'CANNOT_POST_STICKY'		=> 'Sorry but you cannot post sticky topics.',
-	'CHANGE_TOPIC_TO'			=> 'Change topic type to',
-	'CLOSE_TAGS'				=> 'Close tags',
-	'CURRENT_TOPIC'				=> 'Current topic',
-
-	'DELETE_FILE'				=> 'Delete file',
-	'DELETE_MESSAGE'			=> 'Delete message',
-	'DELETE_MESSAGE_CONFIRM'	=> 'Are you sure you want to delete this message?',
-	'DELETE_OWN_POSTS'			=> 'Sorry but you can only delete your own posts.',
-	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
-	'DELETE_POST_WARN'			=> 'Once deleted the post cannot be recovered',
-	'DISABLE_BBCODE'			=> 'Disable BBCode',
-	'DISABLE_MAGIC_URL'			=> 'Do not automatically parse URLs',
-	'DISABLE_SMILIES'			=> 'Disable smilies',
-	'DISALLOWED_CONTENT'		=> 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
-	'DISALLOWED_EXTENSION'		=> 'The extension %s is not allowed.',
-	'DRAFT_LOADED'				=> 'Draft loaded into posting area, you may want to finish your post now.<br />Your draft will be deleted after submitting this post.',
-	'DRAFT_LOADED_PM'			=> 'Draft loaded into message area, you may want to finish your private message now.<br />Your draft will be deleted after submitting this private message.',
-	'DRAFT_SAVED'				=> 'Draft successfully saved.',
-	'DRAFT_TITLE'				=> 'Draft title',
-
-	'EDIT_REASON'				=> 'Reason for editing this post',
-	'EMPTY_FILEUPLOAD'			=> 'The uploaded file is empty.',
-	'EMPTY_MESSAGE'				=> 'You must enter a message when posting.',
-	'EMPTY_REMOTE_DATA'			=> 'File could not be uploaded, please try uploading the file manually.',
-
-	'FLASH_IS_OFF'				=> '[flash] is <em>OFF</em>',
-	'FLASH_IS_ON'				=> '[flash] is <em>ON</em>',
-	'FLOOD_ERROR'				=> 'You cannot make another post so soon after your last.',
-	'FONT_COLOR'				=> 'Font colour',
-	'FONT_COLOR_HIDE'			=> 'Hide font colour',
-	'FONT_HUGE'					=> 'Huge',
-	'FONT_LARGE'				=> 'Large',
-	'FONT_NORMAL'				=> 'Normal',
-	'FONT_SIZE'					=> 'Font size',
-	'FONT_SMALL'				=> 'Small',
-	'FONT_TINY'					=> 'Tiny',
-
-	'GENERAL_UPLOAD_ERROR'		=> 'Could not upload attachment to %s.',
-
-	'IMAGES_ARE_OFF'			=> '[img] is <em>OFF</em>',
-	'IMAGES_ARE_ON'				=> '[img] is <em>ON</em>',
-	'INVALID_FILENAME'			=> '%s is an invalid filename.',
-
-	'LOAD'						=> 'Load',
-	'LOAD_DRAFT'				=> 'Load draft',
-	'LOAD_DRAFT_EXPLAIN'		=> 'Here you are able to select the draft you want to continue writing. Your current post will be cancelled, all current post contents will be deleted. View, edit and delete drafts within your User Control Panel.',
-	'LOGIN_EXPLAIN_BUMP'		=> 'You need to login in order to bump topics within this forum.',
-	'LOGIN_EXPLAIN_DELETE'		=> 'You need to login in order to delete posts within this forum.',
-	'LOGIN_EXPLAIN_POST'		=> 'You need to login in order to post within this forum.',
-	'LOGIN_EXPLAIN_QUOTE'		=> 'You need to login in order to quote posts within this forum.',
-	'LOGIN_EXPLAIN_REPLY'		=> 'You need to login in order to reply to topics within this forum.',
-
-	'MAX_FONT_SIZE_EXCEEDED'	=> 'You may only use fonts up to size %1$d.',
-	'MAX_FLASH_HEIGHT_EXCEEDED'	=> 'Your flash files may only be up to %1$d pixels high.',
-	'MAX_FLASH_WIDTH_EXCEEDED'	=> 'Your flash files may only be up to %1$d pixels wide.',
-	'MAX_IMG_HEIGHT_EXCEEDED'	=> 'Your images may only be up to %1$d pixels high.',
-	'MAX_IMG_WIDTH_EXCEEDED'	=> 'Your images may only be up to %1$d pixels wide.',
-
-	'MESSAGE_BODY_EXPLAIN'		=> 'Enter your message here, it may contain no more than <strong>%d</strong> characters.',
-	'MESSAGE_DELETED'			=> 'This message has been deleted successfully.',
-	'MORE_SMILIES'				=> 'View more smilies',
-
-	'NOTIFY_REPLY'				=> 'Notify me when a reply is posted',
-	'NOT_UPLOADED'				=> 'File could not be uploaded.',
-	'NO_DELETE_POLL_OPTIONS'	=> 'You cannot delete existing poll options.',
-	'NO_PM_ICON'				=> 'No PM icon',
-	'NO_POLL_TITLE'				=> 'You have to enter a poll title.',
-	'NO_POST'					=> 'The requested post does not exist.',
-	'NO_POST_MODE'				=> 'No post mode specified.',
-
-	'PARTIAL_UPLOAD'			=> 'The uploaded file was only partially uploaded.',
-	'PHP_SIZE_NA'				=> 'The attachment’s file size is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
-	'PHP_SIZE_OVERRUN'			=> 'The attachment’s file size is too large, the maximum upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
-	'PLACE_INLINE'				=> 'Place inline',
-	'POLL_DELETE'				=> 'Delete poll',
-	'POLL_FOR'					=> 'Run poll for',
-	'POLL_FOR_EXPLAIN'			=> 'Enter 0 or leave blank for a never ending poll.',
-	'POLL_MAX_OPTIONS'			=> 'Options per user',
-	'POLL_MAX_OPTIONS_EXPLAIN'	=> 'This is the number of options each user may select when voting.',
-	'POLL_OPTIONS'				=> 'Poll options',
-	'POLL_OPTIONS_EXPLAIN'		=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options.',
-	'POLL_OPTIONS_EDIT_EXPLAIN'	=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options. If you remove or add options all previous votes will be reset.',
-	'POLL_QUESTION'				=> 'Poll question',
-	'POLL_TITLE_TOO_LONG'		=> 'The poll title must contain fewer than 100 characters.',
-	'POLL_TITLE_COMP_TOO_LONG'	=> 'The parsed size of your poll title is too large, consider removing BBCodes or smilies.',
-	'POLL_VOTE_CHANGE'			=> 'Allow re-voting',
-	'POLL_VOTE_CHANGE_EXPLAIN'	=> 'If enabled users are able to change their vote.',
-	'POSTED_ATTACHMENTS'		=> 'Posted attachments',
-	'POST_APPROVAL_NOTIFY'		=> 'You will be notified when your post has been approved.',
-	'POST_CONFIRMATION'			=> 'Confirmation of post',
-	'POST_CONFIRM_EXPLAIN'		=> 'To prevent automated posts the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
-	'POST_DELETED'				=> 'This message has been deleted successfully.',
-	'POST_EDITED'				=> 'This message has been edited successfully.',
-	'POST_EDITED_MOD'			=> 'This message has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.',
-	'POST_GLOBAL'				=> 'Global',
-	'POST_ICON'					=> 'Post icon',
-	'POST_NORMAL'				=> 'Normal',
-	'POST_REVIEW'				=> 'Post review',
-	'POST_REVIEW_EXPLAIN'		=> 'At least one new post has been made to this topic. You may wish to review your post in light of this.',
-	'POST_STORED'				=> 'This message has been posted successfully.',
-	'POST_STORED_MOD'			=> 'This message has been submitted successfully, but it will need to be approved by a moderator before it is publicly viewable.',
-	'POST_TOPIC_AS'				=> 'Post topic as',
-	'PROGRESS_BAR'				=> 'Progress bar',
-
-	'QUOTE_DEPTH_EXCEEDED'		=> 'You may embed only %1$d quotes within each other.',
-
-	'SAVE'						=> 'Save',
-	'SAVE_DATE'					=> 'Saved at',
-	'SAVE_DRAFT'				=> 'Save draft',
-	'SAVE_DRAFT_CONFIRM'		=> 'Please note that saved drafts only include the subject and the message, any other element will be removed. Do you want to save your draft now?',
-	'SMILIES'					=> 'Smilies',
-	'SMILIES_ARE_OFF'			=> 'Smilies are <em>OFF</em>',
-	'SMILIES_ARE_ON'			=> 'Smilies are <em>ON</em>',
-	'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement time limit',
-	'STICK_TOPIC_FOR'			=> 'Stick topic for',
-	'STICK_TOPIC_FOR_EXPLAIN'	=> 'Enter 0 or leave blank for a never ending Sticky/Announcement.',
-	'STYLES_TIP'				=> 'Tip: Styles can be applied quickly to selected text.',
-
-	'TOO_FEW_CHARS'				=> 'Your message contains too few characters.',
-	'TOO_FEW_POLL_OPTIONS'		=> 'You must enter at least two poll options.',
-	'TOO_MANY_ATTACHMENTS'		=> 'Cannot add another attachment, %d is the maximum.',
-	'TOO_MANY_CHARS'			=> 'Your message contains too many characters.',
-	'TOO_MANY_CHARS_POST'		=> 'Your message contains %1$d characters. The maximum number of allowed characters is %2$d.',
-	'TOO_MANY_CHARS_SIG'		=> 'Your signature contains %1$d characters. The maximum number of allowed characters is %2$d.',
-	'TOO_MANY_POLL_OPTIONS'		=> 'You have tried to enter too many poll options.',
-	'TOO_MANY_SMILIES'			=> 'Your message contains too many smilies. The maximum number of smilies allowed is %d.',
-	'TOO_MANY_URLS'				=> 'Your message contains too many URLs. The maximum number of URLs allowed is %d.',
-	'TOO_MANY_USER_OPTIONS'		=> 'You cannot specify more options per user than existing poll options.',
-	'TOPIC_BUMPED'				=> 'Topic has been bumped successfully.',
-
-	'UNAUTHORISED_BBCODE'		=> 'You cannot use certain BBCodes: %s.',
-	'UNGLOBALISE_EXPLAIN'		=> 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.',
-	'UPDATE_COMMENT'			=> 'Update comment',
-	'URL_INVALID'				=> 'The URL you specified is invalid.',
-	'URL_NOT_FOUND'				=> 'The file specified could not be found.',
-	'URL_IS_OFF'				=> '[url] is <em>OFF</em>',
-	'URL_IS_ON'					=> '[url] is <em>ON</em>',
-	'USER_CANNOT_BUMP'			=> 'You cannot bump topics in this forum.',
-	'USER_CANNOT_DELETE'		=> 'You cannot delete posts in this forum.',
-	'USER_CANNOT_EDIT'			=> 'You cannot edit posts in this forum.',
-	'USER_CANNOT_REPLY'			=> 'You cannot reply in this forum.',
-	'USER_CANNOT_FORUM_POST'	=> 'You are not able to do posting operations on this forum due to the forum type not supporting it.',
-
-	'VIEW_MESSAGE'				=> '%sView your submitted message%s',
-	'VIEW_PRIVATE_MESSAGE'		=> '%sView your submitted private message%s',
-
-	'WRONG_FILESIZE'			=> 'The file is too big, maximum allowed size is %1d %2s.',
-	'WRONG_SIZE'				=> 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high. The submitted image is %5$d pixels wide and %6$d pixels high.',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/recaptcha.php b/phpBB/language/en/recaptcha.php
deleted file mode 100644
index 140e300b7b..0000000000
--- a/phpBB/language/en/recaptcha.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
-*
-* recaptcha [English]
-*
-* @package language
-* @version $Id: groups.php 8477 2008-03-29 00:08:34Z naderman $
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'RECAPTCHA_LANG'				=> 'en',
-	'RECAPTCHA_NOT_AVAILABLE'		=> 'You have to register for reCaptcha at <a href="http://recaptcha.net">reCaptcha.net</a>.',
-	'CAPTCHA_RECAPTCHA'				=> 'reCaptcha',
-	'RECAPTCHA_INCORRECT'			=> 'The entered visual confirmation was incorrect',
-
-	'RECAPTCHA_PUBLIC'				=> 'Public reCaptcha key',
-	'RECAPTCHA_PUBLIC_EXPLAIN'		=> 'Your public reCaptcha key. You can obtain keys from <a href="http://recaptcha.net">reCaptcha.net</a>.',
-	'RECAPTCHA_PRIVATE'				=> 'Private reCaptcha key',
-	'RECAPTCHA_PRIVATE_EXPLAIN'		=> 'Your private reCaptcha key. You can obtain keys from <a href="http://recaptcha.net">reCaptcha.net</a>.',
-
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
deleted file mode 100644
index 4618a585b3..0000000000
--- a/phpBB/language/en/search.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
-*
-* search [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ALL_AVAILABLE'			=> 'All available',
-	'ALL_RESULTS'			=> 'All results',
-
-	'DISPLAY_RESULTS'		=> 'Display results as',
-
-	'FOUND_SEARCH_MATCH'		=> 'Search found %d match',
-	'FOUND_SEARCH_MATCHES'		=> 'Search found %d matches',
-	'FOUND_MORE_SEARCH_MATCHES'	=> 'Search found more than %d matches',
-
-	'GLOBAL'				=> 'Global announcement',
-
-	'IGNORED_TERMS'			=> 'ignored',
-	'IGNORED_TERMS_EXPLAIN'	=> 'The following words in your search query were ignored because they are too common words: <strong>%s</strong>.',
-
-	'JUMP_TO_POST'			=> 'Jump to post',
-
-	'LOGIN_EXPLAIN_EGOSEARCH'	=> 'The board requires you to be registered and logged in to view your own posts.',
-
-	'MAX_NUM_SEARCH_KEYWORDS_REFINE'	=> 'You specified too many words to search for. Please do not enter more than %1$d words.',
-
-	'NO_KEYWORDS'			=> 'You must specify at least one word to search for. Each word must consist of at least %d characters and must not contain more than %d characters excluding wildcards.',
-	'NO_RECENT_SEARCHES'	=> 'No searches have been carried out recently.',
-	'NO_SEARCH'				=> 'Sorry but you are not permitted to use the search system.',
-	'NO_SEARCH_RESULTS'		=> 'No suitable matches were found.',
-	'NO_SEARCH_TIME'		=> 'Sorry but you cannot use search at this time. Please try again in a few minutes.',
-	'WORD_IN_NO_POST'		=> 'No posts were found because the word <strong>%s</strong> is not contained in any post.',
-	'WORDS_IN_NO_POST'		=> 'No posts were found because the words <strong>%s</strong> are not contained in any post.',
-
-	'POST_CHARACTERS'		=> 'characters of posts',
-
-	'RECENT_SEARCHES'		=> 'Recent searches',
-	'RESULT_DAYS'			=> 'Limit results to previous',
-	'RESULT_SORT'			=> 'Sort results by',
-	'RETURN_FIRST'			=> 'Return first',
-	'RETURN_TO_SEARCH_ADV'	=> 'Return to advanced search',
-
-	'SEARCHED_FOR'				=> 'Search term used',
-	'SEARCHED_TOPIC'			=> 'Searched topic',
-	'SEARCH_ALL_TERMS'			=> 'Search for all terms or use query as entered',
-	'SEARCH_ANY_TERMS'			=> 'Search for any terms',
-	'SEARCH_AUTHOR'				=> 'Search for author',
-	'SEARCH_AUTHOR_EXPLAIN'		=> 'Use * as a wildcard for partial matches.',
-	'SEARCH_FIRST_POST'			=> 'First post of topics only',
-	'SEARCH_FORUMS'				=> 'Search in forums',
-	'SEARCH_FORUMS_EXPLAIN'		=> 'Select the forum or forums you wish to search in. Subforums are searched automatically if you do not disable “search subforums“ below.',
-	'SEARCH_IN_RESULTS'			=> 'Search these results',
-	'SEARCH_KEYWORDS_EXPLAIN'	=> 'Place <strong>+</strong> in front of a word which must be found and <strong>-</strong> in front of a word which must not be found. Put a list of words separated by <strong>|</strong> into brackets if only one of the words must be found. Use * as a wildcard for partial matches.',
-	'SEARCH_MSG_ONLY'			=> 'Message text only',
-	'SEARCH_OPTIONS'			=> 'Search options',
-	'SEARCH_QUERY'				=> 'Search query',
-	'SEARCH_SUBFORUMS'			=> 'Search subforums',
-	'SEARCH_TITLE_MSG'			=> 'Post subjects and message text',
-	'SEARCH_TITLE_ONLY'			=> 'Topic titles only',
-	'SEARCH_WITHIN'				=> 'Search within',
-	'SORT_ASCENDING'			=> 'Ascending',
-	'SORT_AUTHOR'				=> 'Author',
-	'SORT_DESCENDING'			=> 'Descending',
-	'SORT_FORUM'				=> 'Forum',
-	'SORT_POST_SUBJECT'			=> 'Post subject',
-	'SORT_TIME'					=> 'Post time',
-
-	'TOO_FEW_AUTHOR_CHARS'	=> 'You must specify at least %d characters of the authors name.',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php
deleted file mode 100644
index 2dfdc0df13..0000000000
--- a/phpBB/language/en/search_ignore_words.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
-*
-* search_ignore_words [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-$words = array(
-	'a',
-	'about',
-	'after',
-	'ago',
-	'all',
-	'almost',
-	'along',
-	'alot',
-	'also',
-	'am',
-	'an',
-	'and',
-	'answer',
-	'any',
-	'anybody',
-	'anybodys',
-	'anywhere',
-	'are',
-	'arent',
-	'around',
-	'as',
-	'ask',
-	'askd',
-	'at',
-	'bad',
-	'be',
-	'because',
-	'been',
-	'before',
-	'being',
-	'best',
-	'better',
-	'between',
-	'big',
-	'btw',
-	'but',
-	'by',
-	'can',
-	'cant',
-	'come',
-	'could',
-	'couldnt',
-	'day',
-	'days',
-	'days',
-	'did',
-	'didnt',
-	'do',
-	'does',
-	'doesnt',
-	'dont',
-	'down',
-	'each',
-	'etc',
-	'either',
-	'else',
-	'even',
-	'ever',
-	'every',
-	'everybody',
-	'everybodys',
-	'everyone',
-	'far',
-	'find',
-	'for',
-	'found',
-	'from',
-	'get',
-	'go',
-	'going',
-	'gone',
-	'good',
-	'got',
-	'gotten',
-	'had',
-	'has',
-	'have',
-	'havent',
-	'having',
-	'her',
-	'here',
-	'hers',
-	'him',
-	'his',
-	'home',
-	'how',
-	'hows',
-	'href',
-	'I',
-	'Ive',
-	'if',
-	'in',
-	'ini',
-	'into',
-	'is',
-	'isnt',
-	'it',
-	'its',
-	'its',
-	'just',
-	'know',
-	'large',
-	'less',
-	'like',
-	'liked',
-	'little',
-	'looking',
-	'look',
-	'looked',
-	'looking',
-	'lot',
-	'maybe',
-	'many',
-	'me',
-	'more',
-	'most',
-	'much',
-	'must',
-	'mustnt',
-	'my',
-	'near',
-	'need',
-	'never',
-	'new',
-	'news',
-	'no',
-	'none',
-	'not',
-	'nothing',
-	'now',
-	'of',
-	'off',
-	'often',
-	'old',
-	'on',
-	'once',
-	'only',
-	'oops',
-	'or',
-	'other',
-	'our',
-	'ours',
-	'out',
-	'over',
-	'page',
-	'please',
-	'put',
-	'question',
-	'questions',
-	'questioned',
-	'quote',
-	'rather',
-	'really',
-	'recent',
-	'said',
-	'saw',
-	'say',
-	'says',
-	'she',
-	'see',
-	'sees',
-	'should',
-	'sites',
-	'small',
-	'so',
-	'some',
-	'something',
-	'sometime',
-	'somewhere',
-	'soon',
-	'take',
-	'than',
-	'true',
-	'thank',
-	'that',
-	'thatd',
-	'thats',
-	'the',
-	'their',
-	'theirs',
-	'theres',
-	'theirs',
-	'them',
-	'then',
-	'there',
-	'these',
-	'they',
-	'theyll',
-	'theyd',
-	'theyre',
-	'this',
-	'those',
-	'though',
-	'through',
-	'thus',
-	'time',
-	'times',
-	'to',
-	'too',
-	'under',
-	'until',
-	'untrue',
-	'up',
-	'upon',
-	'use',
-	'users',
-	'version',
-	'very',
-	'via',
-	'want',
-	'was',
-	'way',
-	'we',
-	'well',
-	'went',
-	'were',
-	'werent',
-	'what',
-	'when',
-	'where',
-	'which',
-	'who',
-	'whom',
-	'whose',
-	'why',
-	'wide',
-	'will',
-	'with',
-	'within',
-	'without',
-	'wont',
-	'world',
-	'worse',
-	'worst',
-	'would',
-	'wrote',
-	'www',
-	'yes',
-	'yet',
-	'you',
-	'youd',
-	'youll',
-	'your',
-	'youre',
-	'yours',
-	'AFAIK',
-	'IIRC',
-	'LOL',
-	'ROTF',
-	'ROTFLMAO',
-	'YMMV',
-);
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php
deleted file mode 100644
index b85c39e5d5..0000000000
--- a/phpBB/language/en/search_synonyms.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
-*
-* search_synonyms [English]
-*
-* @package language
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-$synonyms = array(
-	'abcense'			=> 'absence',
-	'abridgement'		=> 'abridgment',
-	'accomodate'		=> 'accommodate',
-	'acknowledgment'	=> 'acknowledgement',
-	'airplane'			=> 'aeroplane',
-	'allright'			=> 'alright ',
-	'andy'				=> 'andrew',
-	'anemia'			=> 'anaemia',
-	'anemic'			=> 'anaemic',
-	'anesthesia'		=> 'anaesthesia',
-	'appologize'		=> 'appologise',
-	'archean'			=> 'archaean',
-	'archeology'		=> 'archaeology',
-	'archeozoic'		=> 'archaeozoic',
-	'armor'				=> 'armour',
-	'artic'				=> 'arctic',
-	'attachment'		=> 'attachement',
-	'attendence'		=> 'attendance',
-
-	'barbecue'	=> 'barbeque',
-	'behavior'	=> 'behaviour',
-	'biassed'	=> 'biased',
-	'biol'		=> 'biology',
-	'buletin'	=> 'bulletin',
-
-	'calender'	=> 'calendar',
-	'canceled'	=> 'cancelled',
-	'car'		=> 'automobile',
-	'catalog'	=> 'catalogue',
-	'cenozoic'	=> 'caenozoic',
-	'center'	=> 'centre',
-	'check'		=> 'cheque',
-	'color'		=> 'colour',
-	'comission'	=> 'commission',
-	'comittee'	=> 'committee',
-	'commitee'	=> 'committee',
-	'conceed'	=> 'concede',
-	'creating'	=> 'createing',
-	'curiculum'	=> 'curriculum',
-
-	'defense'		=> 'defence',
-	'develope'		=> 'develop',
-	'discription'	=> 'description',
-	'dulness'		=> 'dullness',
-
-	'encyclopedia'	=> 'encyclopaedia',
-	'enroll'		=> 'enrol',
-	'esthetic'		=> 'aesthetic',
-	'etiology'		=> 'aetiology',
-	'exhorbitant'	=> 'exorbitant',
-	'exhuberant'	=> 'exuberant',
-	'existance'		=> 'existence',
-
-	'favorite'		=> 'favourite',
-	'fetus'			=> 'foetus',
-	'ficticious'	=> 'fictitious',
-	'flavor'		=> 'flavour',
-	'flourescent'	=> 'fluorescent',
-	'foriegn'		=> 'foreign',
-	'fourty'		=> 'forty',
-
-	'gage'			=> 'guage',
-	'geneology'		=> 'genealogy',
-	'grammer'		=> 'grammar',
-	'gray'			=> 'grey',
-	'guerilla'		=> 'guerrilla',
-	'gynecology'	=> 'gynaecology',
-
-	'harbor'		=> 'harbour',
-	'heighth'		=> 'height',
-	'hemaglobin'	=> 'haemaglobin',
-	'hematin'		=> 'haematin',
-	'hematite'		=> 'haematite',
-	'hematology'	=> 'haematology',
-	'honor'			=> 'honour',
-
-	'innoculate'	=> 'inoculate',
-	'installment'	=> 'instalment',
-	'irrelevent'	=> 'irrelevant',
-	'irrevelant'	=> 'irrelevant',
-
-	'jeweler'	=> 'jeweller',
-	'judgement'	=> 'judgment',
-
-	'labeled'	=> 'labelled',
-	'labor'		=> 'labour',
-	'laborer'	=> 'labourer',
-	'laborers'	=> 'labourers',
-	'laboring'	=> 'labouring',
-	'licence'	=> 'license',
-	'liesure'	=> 'leisure',
-	'liquify'	=> 'liquefy',
-
-	'maintainance'	=> 'maintenance',
-	'maintenence'	=> 'maintenance',
-	'medieval'		=> 'mediaeval',
-	'meter'			=> 'metre',
-	'milage'		=> 'mileage',
-	'millipede'		=> 'millepede',
-	'miscelaneous'	=> 'miscellaneous',
-	'morgage'		=> 'mortgage',
-
-	'noticable'	=> 'noticeable',
-
-	'occurence'	=> 'occurrence',
-	'offense'	=> 'offence',
-	'ommision'	=> 'omission',
-	'ommission'	=> 'omission',
-	'optimize'	=> 'optimise',
-	'organize'	=> 'organise',
-
-	'pajamas'			=> 'pyjamas',
-	'paleography'		=> 'palaeography',
-	'paleolithic'		=> 'palaeolithic',
-	'paleontological'	=> 'palaeontological',
-	'paleontologist'	=> 'palaeontologist',
-	'paleontology'		=> 'palaeontology',
-	'paleozoic'			=> 'palaeozoic',
-	'pamplet'			=> 'pamphlet',
-	'paralell'			=> 'parallel',
-	'parl'				=> 'parliament',
-	'parlt'				=> 'parliament',
-	'pediatric'			=> 'paediatric',
-	'pediatrician'		=> 'paediatrician',
-	'pediatrics'		=> 'paediatrics',
-	'pedodontia'		=> 'paedodontia',
-	'pedodontics'		=> 'paedodontics',
-	'personel'			=> 'personnel',
-	'practise'			=> 'practice',
-	'program'			=> 'programme',
-	'psych'				=> 'psychology',
-
-	'questionaire'	=> 'questionnaire',
-
-	'rarify'		=> 'rarefy',
-	'reccomend'		=> 'recommend',
-	'recieve'		=> 'receive',
-	'resistence'	=> 'resistance',
-	'restaraunt'	=> 'restaurant',
-
-	'savior'			=> 'saviour',
-	'sep'				=> 'september',
-	'seperate'			=> 'separate',
-	'sept'				=> 'september',
-	'sieze'				=> 'seize',
-	'summarize'			=> 'summarise',
-	'summerize'			=> 'summarise',
-	'superceed'			=> 'supercede',
-	'superintendant'	=> 'superintendent',
-	'supersede'			=> 'supercede',
-	'suprise'			=> 'surprise',
-	'surprize'			=> 'surprise',
-	'synchronise'		=> 'synchronize',
-
-	'temperary'		=> 'temporary',
-	'theater'		=> 'theatre',
-	'threshhold'	=> 'threshold',
-	'transfered'	=> 'transferred',
-	'truely'		=> 'truly',
-	'truley'		=> 'truly',
-
-	'useable'	=> 'usable',
-
-	'valor'	=> 'valour',
-	'vigor'	=> 'vigour',
-	'vol'	=> 'volume',
-
-	'whack'		=> 'wack',
-	'withold'	=> 'withhold',
-
-	'yeild'	=> 'yield',
-);
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
deleted file mode 100644
index ccb6fbdbb4..0000000000
--- a/phpBB/language/en/ucp.php
+++ /dev/null
@@ -1,547 +0,0 @@
-<?php
-/**
-*
-* ucp [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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
-
-// Privacy policy and T&C
-$lang = array_merge($lang, array(
-	'TERMS_OF_USE_CONTENT'	=> 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended.<br />
-	<br />
-	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://opensource.org/licenses/gpl-license.php">General Public License</a>” (hereinafter “GPL”) and can be downloaded from <a href="http://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet based discussions, the phpBB Group are not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="http://www.phpbb.com/">http://www.phpbb.com/</a>.<br />
-	<br />
-	You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised.
-	',
-
-	'PRIVACY_POLICY'		=> 'This policy explains in detail how “%1$s” along with its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) use any information collected during any session of usage by you (hereinafter “your information”).<br />
-	<br />
-	Your information is collected via two ways. Firstly, by browsing “%1$s” will cause the phpBB software to create a number of cookies, which are small text files that are downloaded on to your computer’s web browser temporary files. The first two cookies just contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), automatically assigned to you by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s” and is used to store which topics have been read, thereby improving your user experience.<br />
-	<br />
-	We may also create cookies external to the phpBB software whilst browsing “%1$s”, though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”) and posts submitted by you after registration and whilst logged in (hereinafter “your posts”).<br />
-	<br />
-	Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid e-mail address (hereinafter “your e-mail”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password, and your e-mail address required by “%1$s” during the registration process is either mandatory or optional, at the discretion of “%1$s”. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated e-mails from the phpBB software.<br />
-	<br />
-	Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your e-mail, then the phpBB software will generate a new password to reclaim your account.<br />
-	',
-));
-
-// Common language entries
-$lang = array_merge($lang, array(
-	'ACCOUNT_ACTIVE'				=> 'Your account has now been activated. Thank you for registering.',
-	'ACCOUNT_ACTIVE_ADMIN'			=> 'The account has now been activated.',
-	'ACCOUNT_ACTIVE_PROFILE'		=> 'Your account has now been successfully reactivated.',
-	'ACCOUNT_ADDED'					=> 'Thank you for registering, your account has been created. You may now login with your username and password.',
-	'ACCOUNT_COPPA'					=> 'Your account has been created but has to be approved, please check your e-mail for details.',
-	'ACCOUNT_EMAIL_CHANGED'			=> 'Your account has been updated. However, this board requires account reactivation on e-mail changes. An activation key has been sent to the new e-mail address you provided. Please check your e-mail for further information.',
-	'ACCOUNT_EMAIL_CHANGED_ADMIN'	=> 'Your account has been updated. However, this board requires account reactivation by the administrators on e-mail changes. An e-mail has been sent to them and you will be informed when your account has been reactivated.',
-	'ACCOUNT_INACTIVE'				=> 'Your account has been created. However, this board requires account activation, an activation key has been sent to the e-mail address you provided. Please check your e-mail for further information.',
-	'ACCOUNT_INACTIVE_ADMIN'		=> 'Your account has been created. However, this board requires account activation by the administrator group. An e-mail has been sent to them and you will be informed when your account has been activated.',
-	'ACTIVATION_EMAIL_SENT'			=> 'The activation e-mail has been sent to your e-mail address.',
-	'ACTIVATION_EMAIL_SENT_ADMIN'	=> 'The activation e-mail has been sent to the administrators e-mail addresses.',
-	'ADD'							=> 'Add',
-	'ADD_BCC'						=> 'Add [BCC]',
-	'ADD_FOES'						=> 'Add new foes',
-	'ADD_FOES_EXPLAIN'				=> 'You may enter several usernames each on a different line.',
-	'ADD_FOLDER'					=> 'Add folder',
-	'ADD_FRIENDS'					=> 'Add new friends',
-	'ADD_FRIENDS_EXPLAIN'			=> 'You may enter several usernames each on a different line.',
-	'ADD_NEW_RULE'					=> 'Add new rule',
-	'ADD_RULE'						=> 'Add rule',
-	'ADD_TO'						=> 'Add [To]',
-	'ADMIN_EMAIL'					=> 'Administrators can e-mail me information',
-	'AGREE'							=> 'I agree to these terms',
-	'ALLOW_PM'						=> 'Allow users to send you private messages',
-	'ALLOW_PM_EXPLAIN'				=> 'Note that administrators and moderators will always be able to send you messages.',
-	'ALREADY_ACTIVATED'				=> 'You have already activated your account.',
-	'ATTACHMENTS_EXPLAIN'			=> 'This is a list of attachments you have made in posts to this board.',
-	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
-	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
-	'AVATAR_CATEGORY'				=> 'Category',
-	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$.2f KiB.',
-	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
-	'AVATAR_GALLERY'				=> 'Local gallery',
-	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',
-	'AVATAR_PAGE'					=> 'Page',
-
-	'BACK_TO_DRAFTS'			=> 'Back to saved drafts',
-	'BACK_TO_LOGIN'				=> 'Back to login screen',
-	'BIRTHDAY'					=> 'Birthday',
-	'BIRTHDAY_EXPLAIN'			=> 'Setting a year will list your age when it is your birthday.',
-	'BOARD_DATE_FORMAT'			=> 'My date format',
-	'BOARD_DATE_FORMAT_EXPLAIN'	=> 'The syntax used is identical to the PHP <a href="http://www.php.net/date">date()</a> function.',
-	'BOARD_DST'					=> 'Summer Time/<abbr title="Daylight Saving Time">DST</abbr> is in effect',
-	'BOARD_LANGUAGE'			=> 'My language',
-	'BOARD_STYLE'				=> 'My board style',
-	'BOARD_TIMEZONE'			=> 'My timezone',
-	'BOOKMARKS'					=> 'Bookmarks',
-	'BOOKMARKS_EXPLAIN'			=> 'You can bookmark topics for future reference. Select the checkbox for any bookmark you wish to delete, then press the <em>Remove marked bookmarks</em> button.',
-	'BOOKMARKS_DISABLED'		=> 'Bookmarks are disabled on this board.',
-	'BOOKMARKS_REMOVED'			=> 'Bookmarks removed successfully.',
-
-	'CANNOT_EDIT_MESSAGE_TIME'	=> 'You can no longer edit or delete that message.',
-	'CANNOT_MOVE_TO_SAME_FOLDER'=> 'Messages cannot be moved to the folder you want to remove.',
-	'CANNOT_MOVE_FROM_SPECIAL'	=> 'Messages cannot be moved from the outbox.',
-	'CANNOT_RENAME_FOLDER'		=> 'This folder cannot be renamed.',
-	'CANNOT_REMOVE_FOLDER'		=> 'This folder cannot be removed.',
-	'CHANGE_DEFAULT_GROUP'		=> 'Change default group',
-	'CHANGE_PASSWORD'			=> 'Change password',
-	'CLICK_RETURN_FOLDER'		=> '%1$sReturn to your “%3$s” folder%2$s',
-	'CONFIRMATION'				=> 'Confirmation of registration',
-	'CONFIRM_CHANGES'			=> 'Confirm changes',
-	'CONFIRM_EMAIL'				=> 'Confirm e-mail address',
-	'CONFIRM_EMAIL_EXPLAIN'		=> 'You only need to specify this if you are changing your e-mail address.',
-	'CONFIRM_EXPLAIN'			=> 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
-	'VC_REFRESH'				=> 'Refresh confirmation code',
-	'VC_REFRESH_EXPLAIN'		=> 'If you cannot read the code you can request a new one by clicking the button.',
-
-	'CONFIRM_PASSWORD'			=> 'Confirm password',
-	'CONFIRM_PASSWORD_EXPLAIN'	=> 'You only need to confirm your password if you changed it above.',
-	'COPPA_BIRTHDAY'			=> 'To continue with the registration procedure please tell us when you were born.',
-	'COPPA_COMPLIANCE'			=> 'COPPA compliance',
-	'COPPA_EXPLAIN'				=> 'Please note that clicking submit will create your account. However it cannot be activated until a parent or guardian approves your registration. You will be emailed a copy of the necessary form with details of where to send it.',
-	'CREATE_FOLDER'				=> 'Add folder…',
-	'CURRENT_IMAGE'				=> 'Current image',
-	'CURRENT_PASSWORD'			=> 'Current password',
-	'CURRENT_PASSWORD_EXPLAIN'	=> 'You must confirm your current password if you wish to change it, alter your e-mail address or username.',
-	'CUR_PASSWORD_ERROR'		=> 'The current password you entered is incorrect.',
-	'CUSTOM_DATEFORMAT'			=> 'Custom…',
-
-	'DEFAULT_ACTION'			=> 'Default action',
-	'DEFAULT_ACTION_EXPLAIN'	=> 'This action will be triggered if none of the above is applicable.',
-	'DEFAULT_ADD_SIG'			=> 'Attach my signature by default',
-	'DEFAULT_BBCODE'			=> 'Enable BBCode by default',
-	'DEFAULT_NOTIFY'			=> 'Notify me upon replies by default',
-	'DEFAULT_SMILIES'			=> 'Enable smilies by default',
-	'DEFINED_RULES'				=> 'Defined rules',
-	'DELETED_TOPIC'				=> 'Topic has been removed.',
-	'DELETE_ATTACHMENT'			=> 'Delete attachment',
-	'DELETE_ATTACHMENTS'		=> 'Delete attachments',
-	'DELETE_ATTACHMENT_CONFIRM'	=> 'Are you sure you want to delete this attachment?',
-	'DELETE_ATTACHMENTS_CONFIRM'=> 'Are you sure you want to delete these attachments?',
-	'DELETE_AVATAR'				=> 'Delete image',
-	'DELETE_COOKIES_CONFIRM'	=> 'Are you sure you want to delete all cookies set by this board?',
-	'DELETE_MARKED_PM'			=> 'Delete marked messages',
-	'DELETE_MARKED_PM_CONFIRM'	=> 'Are you sure you want to delete all marked messages?',
-	'DELETE_OLDEST_MESSAGES'	=> 'Delete oldest messages',
-	'DELETE_MESSAGE'			=> 'Delete message',
-	'DELETE_MESSAGE_CONFIRM'	=> 'Are you sure you want to delete this private message?',
-	'DELETE_MESSAGES_IN_FOLDER'	=> 'Delete all messages within removed folder',
-	'DELETE_RULE'				=> 'Delete rule',
-	'DELETE_RULE_CONFIRM'		=> 'Are you sure you want to delete this rule?',
-	'DEMOTE_SELECTED'			=> 'Demote selected',
-	'DISABLE_CENSORS'			=> 'Enable word censoring',
-	'DISPLAY_GALLERY'			=> 'Display gallery',
-	'DOMAIN_NO_MX_RECORD_EMAIL'	=> 'The entered e-mail domain has no valid MX record.',
-	'DOWNLOADS'					=> 'Downloads',
-	'DRAFTS_DELETED'			=> 'All selected drafts were successfully deleted.',
-	'DRAFTS_EXPLAIN'			=> 'Here you can view, edit and delete your saved drafts.',
-	'DRAFT_UPDATED'				=> 'Draft successfully updated.',
-
-	'EDIT_DRAFT_EXPLAIN'		=> 'Here you are able to edit your draft. Drafts do not contain attachment and poll information.',
-	'EMAIL_BANNED_EMAIL'		=> 'The e-mail address you entered is not allowed to be used.',
-	'EMAIL_INVALID_EMAIL'		=> 'The e-mail address you entered is invalid.',
-	'EMAIL_REMIND'				=> 'This must be the e-mail address associated with your account. If you have not changed this via your user control panel then it is the e-mail address you registered your account with.',
-	'EMAIL_TAKEN_EMAIL'			=> 'The entered e-mail address is already in use.',
-	'EMPTY_DRAFT'				=> 'You must enter a message to submit your changes.',
-	'EMPTY_DRAFT_TITLE'			=> 'You must enter a draft title.',
-	'EXPORT_AS_XML'				=> 'Export as XML',
-	'EXPORT_AS_CSV'				=> 'Export as CSV',
-	'EXPORT_AS_CSV_EXCEL'		=> 'Export as CSV (Excel)',
-	'EXPORT_AS_TXT'				=> 'Export as TXT',
-	'EXPORT_AS_MSG'				=> 'Export as MSG',
-	'EXPORT_FOLDER'				=> 'Export this view',
-
-	'FIELD_REQUIRED'					=> 'The field “%s” must be completed.',
-	'FIELD_TOO_SHORT'					=> 'The field “%1$s” is too short, a minimum of %2$d characters is required.',
-	'FIELD_TOO_LONG'					=> 'The field “%1$s” is too long, a maximum of %2$d characters is allowed.',
-	'FIELD_TOO_SMALL'					=> 'The value of “%1$s” is too small, a minimum value of %2$d is required.',
-	'FIELD_TOO_LARGE'					=> 'The value of “%1$s” is too large, a maximum value of %2$d is allowed.',
-	'FIELD_INVALID_CHARS_NUMBERS_ONLY'	=> 'The field “%s” has invalid characters, only numbers are allowed.',
-	'FIELD_INVALID_CHARS_ALPHA_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric characters are allowed.',
-	'FIELD_INVALID_CHARS_SPACERS_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
-	'FIELD_INVALID_DATE'				=> 'The field “%s” has an invalid date.',
-
-	'FOE_MESSAGE'				=> 'Message from foe',
-	'FOES_EXPLAIN'				=> 'Foes are users which will be ignored by default. Posts by these users will not be fully visible. Personal messages from foes are still permitted. Please note that you cannot ignore moderators or administrators.',
-	'FOES_UPDATED'				=> 'Your foes list has been updated successfully.',
-	'FOLDER_ADDED'				=> 'Folder successfully added.',
-	'FOLDER_MESSAGE_STATUS'		=> '%1$d from %2$d messages stored',
-	'FOLDER_NAME_EXIST'			=> 'Folder <strong>%s</strong> already exists.',
-	'FOLDER_OPTIONS'			=> 'Folder options',
-	'FOLDER_RENAMED'			=> 'Folder successfully renamed.',
-	'FOLDER_REMOVED'			=> 'Folder successfully removed.',
-	'FOLDER_STATUS_MSG'			=> 'Folder is %1$d%% full (%2$d from %3$d messages stored)',
-	'FORWARD_PM'				=> 'Forward PM',
-	'FORCE_PASSWORD_EXPLAIN'	=> 'Before you may continue browsing the board you are required to change your password.',
-	'FRIEND_MESSAGE'			=> 'Message from friend',
-	'FRIENDS'					=> 'Friends',
-	'FRIENDS_EXPLAIN'			=> 'Friends enable you quick access to members you communicate with frequently. If the template has relevant support any posts made by a friend may be highlighted.',
-	'FRIENDS_OFFLINE'			=> 'Offline',
-	'FRIENDS_ONLINE'			=> 'Online',
-	'FRIENDS_UPDATED'			=> 'Your friends list has been updated successfully.',
-	'FULL_FOLDER_OPTION_CHANGED'=> 'The action to take when a folder is full has been changed successfully.',
-	'FWD_ORIGINAL_MESSAGE'		=> '-------- Original Message --------',
-	'FWD_SUBJECT'				=> 'Subject: %s',
-	'FWD_DATE'					=> 'Date: %s',
-	'FWD_FROM'					=> 'From: %s',
-	'FWD_TO'					=> 'To: %s',
-
-	'GLOBAL_ANNOUNCEMENT'		=> 'Global announcement',
-
-	'HIDE_ONLINE'				=> 'Hide my online status',
-	'HIDE_ONLINE_EXPLAIN'		=> 'Changing this setting won’t become effective until your next visit to the board.',
-	'HOLD_NEW_MESSAGES'			=> 'Do not accept new messages (New messages will be held back until enough space is available)',
-	'HOLD_NEW_MESSAGES_SHORT'	=> 'New messages will be held back',
-
-	'IF_FOLDER_FULL'			=> 'If folder is full',
-	'IMPORTANT_NEWS'			=> 'Important announcements',
-	'INVALID_USER_BIRTHDAY'			=> 'The entered birthday is not a valid date.',
-	'INVALID_CHARS_USERNAME'	=> 'The username contains forbidden characters.',
-	'INVALID_CHARS_NEW_PASSWORD'=> 'The password does not contain the required characters.',
-	'ITEMS_REQUIRED'			=> 'The items marked with * are required profile fields and need to be filled out.',
-
-	'JOIN_SELECTED'				=> 'Join selected',
-
-	'LANGUAGE'					=> 'Language',
-	'LINK_REMOTE_AVATAR'		=> 'Link off-site',
-	'LINK_REMOTE_AVATAR_EXPLAIN'=> 'Enter the URL of the location containing the avatar image you wish to link to.',
-	'LINK_REMOTE_SIZE'			=> 'Avatar dimensions',
-	'LINK_REMOTE_SIZE_EXPLAIN'	=> 'Specify the width and height of the avatar, leave blank to attempt automatic verification.',
-	'LOGIN_EXPLAIN_UCP'			=> 'Please login in order to access the User Control Panel.',
-	'LOGIN_REDIRECT'			=> 'You have been successfully logged in.',
-	'LOGOUT_FAILED'				=> 'You were not logged out, as the request did not match your session. Please contact the board administrator if you continue to experience problems.',
-	'LOGOUT_REDIRECT'			=> 'You have been successfully logged out.',
-
-	'MARK_IMPORTANT'				=> 'Mark/Unmark as important',
-	'MARKED_MESSAGE'				=> 'Marked message',
-	'MAX_FOLDER_REACHED'			=> 'Maximum number of allowed user defined folders reached.',
-	'MESSAGE_BY_AUTHOR'				=> 'by',
-	'MESSAGE_COLOURS'				=> 'Message colours',
-	'MESSAGE_DELETED'				=> 'Message successfully deleted.',
-	'MESSAGE_HISTORY'				=> 'Message history',
-	'MESSAGE_REMOVED_FROM_OUTBOX'	=> 'This message has been removed by its author before it was delivered.',
-	'MESSAGE_SENT_ON'				=> 'on',
-	'MESSAGE_STORED'				=> 'This message has been sent successfully.',
-	'MESSAGE_TO'					=> 'To',
-	'MESSAGES_DELETED'				=> 'Messages successfully deleted',
-	'MOVE_DELETED_MESSAGES_TO'		=> 'Move messages from removed folder to',
-	'MOVE_DOWN'						=> 'Move down',
-	'MOVE_MARKED_TO_FOLDER'			=> 'Move marked to %s',
-	'MOVE_PM_ERROR'					=> 'An error occurred while moving the messages to the new folder, only %1d from %2d messages were moved.',
-	'MOVE_TO_FOLDER'				=> 'Move to folder',
-	'MOVE_UP'						=> 'Move up',
-
-	'NEW_EMAIL_ERROR'				=> 'The e-mail addresses you entered do not match.',
-	'NEW_FOLDER_NAME'				=> 'New folder name',
-	'NEW_PASSWORD'					=> 'New password',
-	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
-	'NOTIFY_METHOD'					=> 'Notification method',
-	'NOTIFY_METHOD_BOTH'			=> 'Both',
-	'NOTIFY_METHOD_EMAIL'			=> 'E-mail only',
-	'NOTIFY_METHOD_EXPLAIN'			=> 'Method for sending messages sent via this board.',
-	'NOTIFY_METHOD_IM'				=> 'Jabber only',
-	'NOTIFY_ON_PM'					=> 'Notify me on new private messages',
-	'NOT_ADDED_FRIENDS_ANONYMOUS'	=> 'You cannot add the anonymous user to your friends list.',
-	'NOT_ADDED_FRIENDS_FOES'		=> 'You cannot add users to your friends list who are on your foes list.',
-	'NOT_ADDED_FRIENDS_SELF'		=> 'You cannot add yourself to the friends list.',
-	'NOT_ADDED_FOES_MOD_ADMIN'		=> 'You cannot add administrators and moderators to your foes list.',
-	'NOT_ADDED_FOES_ANONYMOUS'		=> 'You cannot add the anonymous user to your foes list.',
-	'NOT_ADDED_FOES_FRIENDS'		=> 'You cannot add users to your foes list who are on your friends list.',
-	'NOT_ADDED_FOES_SELF'			=> 'You cannot add yourself to the foes list.',
-	'NOT_AGREE'						=> 'I do not agree to these terms',
-	'NOT_ENOUGH_SPACE_FOLDER'		=> 'The destination folder “%s” seems to be full. The requested action has not been taken.',
-	'NOT_MOVED_MESSAGE'				=> 'You have 1 private message currently on hold because of full folder.',
-	'NOT_MOVED_MESSAGES'			=> 'You have %d private messages currently on hold because of full folder.',
-	'NO_ACTION_MODE'				=> 'No message action specified.',
-	'NO_AUTHOR'						=> 'No author defined for this message',
-	'NO_AVATAR_CATEGORY'			=> 'None',
-
-	'NO_AUTH_DELETE_MESSAGE'		=> 'You are not authorised to delete private messages.',
-	'NO_AUTH_EDIT_MESSAGE'			=> 'You are not authorised to edit private messages.',
-	'NO_AUTH_FORWARD_MESSAGE'		=> 'You are not authorised to forward private messages.',
-	'NO_AUTH_GROUP_MESSAGE'			=> 'You are not authorised to send private messages to groups.',
-	'NO_AUTH_PASSWORD_REMINDER'		=> 'You are not authorised to request a new password.',
-	'NO_AUTH_READ_HOLD_MESSAGE'		=> 'You are not authorised to read private messages that are on hold.',
-	'NO_AUTH_READ_MESSAGE'			=> 'You are not authorised to read private messages.',
-	'NO_AUTH_READ_REMOVED_MESSAGE'	=> 'You are not able to read this message because it was removed by the author.',
-	'NO_AUTH_SEND_MESSAGE'			=> 'You are not authorised to send private messages.',
-	'NO_AUTH_SIGNATURE'				=> 'You are not authorised to define a signature.',
-
-	'NO_BCC_RECIPIENT'			=> 'None',
-	'NO_BOOKMARKS'				=> 'You have no bookmarks.',
-	'NO_BOOKMARKS_SELECTED'		=> 'You have selected no bookmarks.',
-	'NO_EDIT_READ_MESSAGE'		=> 'Private message cannot be edited because it has already been read.',
-	'NO_EMAIL_USER'				=> 'The e-mail/username information submitted could not be found.',
-	'NO_FOES'					=> 'No foes currently defined',
-	'NO_FRIENDS'				=> 'No friends currently defined',
-	'NO_FRIENDS_OFFLINE'		=> 'No friends offline',
-	'NO_FRIENDS_ONLINE'			=> 'No friends online',
-	'NO_GROUP_SELECTED'			=> 'No group specified.',
-	'NO_IMPORTANT_NEWS'			=> 'No important announcements present.',
-	'NO_MESSAGE'				=> 'Private message could not be found.',
-	'NO_NEW_FOLDER_NAME'		=> 'You have to specify a new folder name.',
-	'NO_NEWER_PM'				=> 'No newer messages.',
-	'NO_OLDER_PM'				=> 'No older messages.',
-	'NO_PASSWORD_SUPPLIED'		=> 'You cannot login without a password.',
-	'NO_RECIPIENT'				=> 'No recipient defined.',
-	'NO_RULES_DEFINED'			=> 'No rules defined.',
-	'NO_SAVED_DRAFTS'			=> 'No drafts saved.',
-	'NO_TO_RECIPIENT'			=> 'None',
-	'NO_WATCHED_FORUMS'			=> 'You are not subscribed to any forums.',
-	'NO_WATCHED_SELECTED'		=> 'You have not selected any subscribed topics or forums.',
-	'NO_WATCHED_TOPICS'			=> 'You are not subscribed to any topics.',
-
-	'PASS_TYPE_ALPHA_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case and must contain numbers.',
-	'PASS_TYPE_ANY_EXPLAIN'		=> 'Must be between %1$d and %2$d characters.',
-	'PASS_TYPE_CASE_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long and must contain letters in mixed case.',
-	'PASS_TYPE_SYMBOL_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case, must contain numbers and must contain symbols.',
-	'PASSWORD'					=> 'Password',
-	'PASSWORD_ACTIVATED'		=> 'Your new password has been activated.',
-	'PASSWORD_UPDATED'			=> 'A new password was sent to your registered email address.',
-	'PERMISSIONS_RESTORED'		=> 'Successfully restored original permissions.',
-	'PERMISSIONS_TRANSFERRED'	=> 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
-	'PM_DISABLED'				=> 'Private messaging has been disabled on this board.',
-	'PM_FROM'					=> 'From',
-	'PM_FROM_REMOVED_AUTHOR'	=> 'This message was sent by a user no longer registered.',
-	'PM_ICON'					=> 'PM icon',
-	'PM_INBOX'					=> 'Inbox',
-	'PM_NO_USERS'				=> 'The requested users to be added do not exist.',
-	'PM_OUTBOX'					=> 'Outbox',
-	'PM_SENTBOX'				=> 'Sent messages',
-	'PM_SUBJECT'				=> 'Message subject',
-	'PM_TO'						=> 'Send to',
-	'PM_USERS_REMOVED_NO_PM'	=> 'Some users couldn’t be added as they have disabled private message receipt.',
-	'POPUP_ON_PM'				=> 'Pop up window on new private message',
-	'POST_EDIT_PM'				=> 'Edit message',
-	'POST_FORWARD_PM'			=> 'Forward message',
-	'POST_NEW_PM'				=> 'Compose message',
-	'POST_PM_LOCKED'			=> 'Private messaging is locked',
-	'POST_PM_POST'				=> 'Quote post',
-	'POST_QUOTE_PM'				=> 'Quote message',
-	'POST_REPLY_PM'				=> 'Reply to message',
-	'PRINT_PM'					=> 'Print view',
-	'PREFERENCES_UPDATED'		=> 'Your preferences have been updated.',
-	'PROFILE_INFO_NOTICE'		=> 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
-	'PROFILE_UPDATED'			=> 'Your profile has been updated.',
-
-	'RECIPIENT'							=> 'Recipient',
-	'RECIPIENTS'						=> 'Recipients',
-	'REGISTRATION'						=> 'Registration',
-	'RELEASE_MESSAGES'					=> '%sRelease all on-hold messages%s… they will be re-sorted into the appropriate folder if enough space is made available.',
-	'REMOVE_ADDRESS'					=> 'Remove address',
-	'REMOVE_SELECTED_BOOKMARKS'			=> 'Remove selected bookmarks',
-	'REMOVE_SELECTED_BOOKMARKS_CONFIRM'	=> 'Are you sure you want to delete all selected bookmarks?',
-	'REMOVE_BOOKMARK_MARKED'			=> 'Remove marked bookmarks',
-	'REMOVE_FOLDER'						=> 'Remove folder',
-	'REMOVE_FOLDER_CONFIRM'				=> 'Are you sure you want to remove this folder?',
-	'RENAME'							=> 'Rename',
-	'RENAME_FOLDER'						=> 'Rename folder',
-	'REPLIED_MESSAGE'					=> 'Replied to message',
-	'RESIGN_SELECTED'					=> 'Resign selected',
-	'RETURN_FOLDER'						=> '%1$sReturn to previous folder%2$s',
-	'RETURN_UCP'						=> '%sReturn to the User Control Panel%s',
-	'RULE_ADDED'						=> 'Rule successfully added.',
-	'RULE_ALREADY_DEFINED'				=> 'This rule was defined previously.',
-	'RULE_DELETED'						=> 'Rule successfully removed.',
-	'RULE_NOT_DEFINED'					=> 'Rule not correctly specified.',
-	'RULE_REMOVED_MESSAGE'				=> 'One private message had been removed due to private message filters.',
-	'RULE_REMOVED_MESSAGES'				=> '%d private messages were removed due to private message filters.',
-
-	'SAME_PASSWORD_ERROR'		=> 'The new password you entered is the same as your current password.',
-	'SEARCH_YOUR_POSTS'			=> 'Show your posts',
-	'SEND_PASSWORD'				=> 'Send password',
-	'SENT_AT'					=> 'Sent',			// Used before dates in private messages
-	'SHOW_EMAIL'				=> 'Users can contact me by e-mail',
-	'SIGNATURE_EXPLAIN'			=> 'This is a block of text that can be added to posts you make. There is a %d character limit.',
-	'SIGNATURE_PREVIEW'			=> 'Your signature will appear like this in posts',
-	'SIGNATURE_TOO_LONG'		=> 'Your signature is too long.',
-	'SORT'						=> 'Sort',
-	'SORT_COMMENT'				=> 'File comment',
-	'SORT_DOWNLOADS'			=> 'Downloads',
-	'SORT_EXTENSION'			=> 'Extension',
-	'SORT_FILENAME'				=> 'Filename',
-	'SORT_POST_TIME'			=> 'Post time',
-	'SORT_SIZE'					=> 'File size',
-
-	'TIMEZONE'					=> 'Timezone',
-	'TO'						=> 'To',
-	'TOO_MANY_RECIPIENTS'		=> 'You tried to send a private message to too many recipients.',
-	'TOO_MANY_REGISTERS'		=> 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',
-
-	'UCP'						=> 'User Control Panel',
-	'UCP_ACTIVATE'				=> 'Activate account',
-	'UCP_ADMIN_ACTIVATE'		=> 'Please note that you will need to enter a valid e-mail address before your account is activated. The administrator will review your account and if approved you will receive an e-mail at the address you specified.',
-	'UCP_AIM'					=> 'AOL Instant Messenger',
-	'UCP_ATTACHMENTS'			=> 'Attachments',
-	'UCP_COPPA_BEFORE'			=> 'Before %s',
-	'UCP_COPPA_ON_AFTER'		=> 'On or after %s',
-	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid e-mail address before your account is activated. You will receive an e-mail at the address you provide that contains an account activation link.',
-	'UCP_ICQ'					=> 'ICQ number',
-	'UCP_JABBER'				=> 'Jabber address',
-
-	'UCP_MAIN'					=> 'Overview',
-	'UCP_MAIN_ATTACHMENTS'		=> 'Manage attachments',
-	'UCP_MAIN_BOOKMARKS'		=> 'Manage bookmarks',
-	'UCP_MAIN_DRAFTS'			=> 'Manage drafts',
-	'UCP_MAIN_FRONT'			=> 'Front page',
-	'UCP_MAIN_SUBSCRIBED'		=> 'Manage subscriptions',
-
-	'UCP_MSNM'					=> 'MSN Messenger',
-	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
-
-	'UCP_PREFS'					=> 'Board preferences',
-	'UCP_PREFS_PERSONAL'		=> 'Edit global settings',
-	'UCP_PREFS_POST'			=> 'Edit posting defaults',
-	'UCP_PREFS_VIEW'			=> 'Edit display options',
-
-	'UCP_PM'					=> 'Private messages',
-	'UCP_PM_COMPOSE'			=> 'Compose message',
-	'UCP_PM_DRAFTS'				=> 'Manage PM drafts',
-	'UCP_PM_OPTIONS'			=> 'Rules, folders &amp; settings',
-	'UCP_PM_POPUP'				=> 'Private messages',
-	'UCP_PM_POPUP_TITLE'		=> 'Private message popup',
-	'UCP_PM_UNREAD'				=> 'Unread messages',
-	'UCP_PM_VIEW'				=> 'View messages',
-
-	'UCP_PROFILE'				=> 'Profile',
-	'UCP_PROFILE_AVATAR'		=> 'Edit avatar',
-	'UCP_PROFILE_PROFILE_INFO'	=> 'Edit profile',
-	'UCP_PROFILE_REG_DETAILS'	=> 'Edit account settings',
-	'UCP_PROFILE_SIGNATURE'		=> 'Edit signature',
-
-	'UCP_USERGROUPS'			=> 'Usergroups',
-	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
-	'UCP_USERGROUPS_MANAGE'		=> 'Manage groups',
-
-	'UCP_REGISTER_DISABLE'			=> 'Creating a new account is currently not possible.',
-	'UCP_REMIND'					=> 'Send password',
-	'UCP_RESEND'					=> 'Send activation e-mail',
-	'UCP_WELCOME'					=> 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',
-	'UCP_YIM'						=> 'Yahoo Messenger',
-	'UCP_ZEBRA'						=> 'Friends &amp; Foes',
-	'UCP_ZEBRA_FOES'				=> 'Manage foes',
-	'UCP_ZEBRA_FRIENDS'				=> 'Manage friends',
-	'UNKNOWN_FOLDER'				=> 'Unknown folder',
-	'UNWATCH_MARKED'				=> 'Unwatch marked',
-	'UPLOAD_AVATAR_FILE'			=> 'Upload from your machine',
-	'UPLOAD_AVATAR_URL'				=> 'Upload from a URL',
-	'UPLOAD_AVATAR_URL_EXPLAIN'		=> 'Enter the URL of the location containing the image. The image will be copied to this site.',
-	'USERNAME_ALPHA_ONLY_EXPLAIN'	=> 'Username must be between %1$d and %2$d chars long and use only alphanumeric characters.',
-	'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.',
-	'USERNAME_ASCII_EXPLAIN'		=> 'Username must be between %1$d and %2$d chars long and use only ASCII characters, so no special symbols.',
-	'USERNAME_LETTER_NUM_EXPLAIN'	=> 'Username must be between %1$d and %2$d chars long and use only letter or number characters.',
-	'USERNAME_LETTER_NUM_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use letter, number, space or -+_[] characters.',
-	'USERNAME_CHARS_ANY_EXPLAIN'	=> 'Length must be between %1$d and %2$d characters.',
-	'USERNAME_TAKEN_USERNAME'		=> 'The username you entered is already in use, please select an alternative.',
-	'USERNAME_DISALLOWED_USERNAME'	=> 'The username you entered has been disallowed or contains a disallowed word. Please choose a different name.',
-	'USER_NOT_FOUND_OR_INACTIVE'	=> 'The usernames you specified could either not be found or are not activated users.',
-
-	'VIEW_AVATARS'				=> 'Display avatars',
-	'VIEW_EDIT'					=> 'View/Edit',
-	'VIEW_FLASH'				=> 'Display Flash animations',
-	'VIEW_IMAGES'				=> 'Display images within posts',
-	'VIEW_NEXT_HISTORY'			=> 'Next PM in history',
-	'VIEW_NEXT_PM'				=> 'Next PM',
-	'VIEW_PM'					=> 'View message',
-	'VIEW_PM_INFO'				=> 'Message details',
-	'VIEW_PM_MESSAGE'			=> '1 message',
-	'VIEW_PM_MESSAGES'			=> '%d messages',
-	'VIEW_PREVIOUS_HISTORY'		=> 'Previous PM in history',
-	'VIEW_PREVIOUS_PM'			=> 'Previous PM',
-	'VIEW_SIGS'					=> 'Display signatures',
-	'VIEW_SMILIES'				=> 'Display smilies as images',
-	'VIEW_TOPICS_DAYS'			=> 'Display topics from previous days',
-	'VIEW_TOPICS_DIR'			=> 'Display topic order direction',
-	'VIEW_TOPICS_KEY'			=> 'Display topics ordering by',
-	'VIEW_POSTS_DAYS'			=> 'Display posts from previous days',
-	'VIEW_POSTS_DIR'			=> 'Display post order direction',
-	'VIEW_POSTS_KEY'			=> 'Display posts ordering by',
-
-	'WATCHED_EXPLAIN'			=> 'Below is a list of forums and topics you are subscribed to. You will be notified of new posts in either. To unsubscribe mark the forum or topic and then press the <em>Unwatch marked</em> button.',
-	'WATCHED_FORUMS'			=> 'Watched forums',
-	'WATCHED_TOPICS'			=> 'Watched topics',
-	'WRONG_ACTIVATION'			=> 'The activation key you supplied does not match any in the database.',
-
-	'YOUR_DETAILS'				=> 'Your activity',
-	'YOUR_FOES'					=> 'Your foes',
-	'YOUR_FOES_EXPLAIN'			=> 'To remove usernames select them and click submit.',
-	'YOUR_FRIENDS'				=> 'Your friends',
-	'YOUR_FRIENDS_EXPLAIN'		=> 'To remove usernames select them and click submit.',
-	'YOUR_WARNINGS'				=> 'Your warning level',
-
-	'PM_ACTION' => array(
-		'PLACE_INTO_FOLDER'	=> 'Place into folder',
-		'MARK_AS_READ'		=> 'Mark as read',
-		'MARK_AS_IMPORTANT'	=> 'Mark message',
-		'DELETE_MESSAGE'	=> 'Delete message'
-	),
-	'PM_CHECK' => array(
-		'SUBJECT'	=> 'Subject',
-		'SENDER'	=> 'Sender',
-		'MESSAGE'	=> 'Message',
-		'STATUS'	=> 'Message status',
-		'TO'		=> 'Sent To'
-	),
-	'PM_RULE' => array(
-		'IS_LIKE'		=> 'is like',
-		'IS_NOT_LIKE'	=> 'is not like',
-		'IS'			=> 'is',
-		'IS_NOT'		=> 'is not',
-		'BEGINS_WITH'	=> 'begins with',
-		'ENDS_WITH'		=> 'ends with',
-		'IS_FRIEND'		=> 'is friend',
-		'IS_FOE'		=> 'is foe',
-		'IS_USER'		=> 'is user',
-		'IS_GROUP'		=> 'is in usergroup',
-		'ANSWERED'		=> 'answered',
-		'FORWARDED'		=> 'forwarded',
-		'TO_GROUP'		=> 'to my default usergroup',
-		'TO_ME'			=> 'to me'
-	),
-
-
-	'GROUPS_EXPLAIN'	=> 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you additional permissions to view content or increase your capabilities in other areas.',
-	'GROUP_LEADER'		=> 'Leaderships',
-	'GROUP_MEMBER'		=> 'Memberships',
-	'GROUP_PENDING'		=> 'Pending memberships',
-	'GROUP_NONMEMBER'	=> 'Non-memberships',
-	'GROUP_DETAILS'		=> 'Group details',
-
-	'NO_LEADER'		=> 'No group leaderships',
-	'NO_MEMBER'		=> 'No group memberships',
-	'NO_PENDING'	=> 'No pending memberships',
-	'NO_NONMEMBER'	=> 'No non-member groups',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
deleted file mode 100644
index 546f91587d..0000000000
--- a/phpBB/language/en/viewforum.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
-*
-* viewforum [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ACTIVE_TOPICS'			=> 'Active topics',
-	'ANNOUNCEMENTS'			=> 'Announcements',
-
-	'FORUM_PERMISSIONS'		=> 'Forum permissions',
-
-	'ICON_ANNOUNCEMENT'		=> 'Announcement',
-	'ICON_STICKY'			=> 'Sticky',
-
-	'LOGIN_NOTIFY_FORUM'	=> 'You have been notified about this forum, please login to view it.',
-
-	'MARK_TOPICS_READ'		=> 'Mark topics read',
-
-	'NEW_POSTS_HOT'			=> 'New posts [ Popular ]',
-	'NEW_POSTS_LOCKED'		=> 'New posts [ Locked ]',
-	'NO_NEW_POSTS_HOT'		=> 'No new posts [ Popular ]',
-	'NO_NEW_POSTS_LOCKED'	=> 'No new posts [ Locked ]',
-	'NO_READ_ACCESS'		=> 'You do not have the required permissions to read topics within this forum.',
-
-	'POST_FORUM_LOCKED'		=> 'Forum is locked',
-
-	'TOPICS_MARKED'			=> 'The topics for this forum have now been marked read.',
-
-	'VIEW_FORUM'			=> 'View forum',
-	'VIEW_FORUM_TOPIC'		=> '1 topic',
-	'VIEW_FORUM_TOPICS'		=> '%d topics',
-));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
deleted file mode 100644
index 4252fa7542..0000000000
--- a/phpBB/language/en/viewtopic.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
-*
-* viewtopic [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 (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'ATTACHMENT'						=> 'Attachment',
-	'ATTACHMENT_FUNCTIONALITY_DISABLED'	=> 'The attachments feature has been disabled.',
-
-	'BOOKMARK_ADDED'		=> 'Bookmarked topic successfully.',
-	'BOOKMARK_ERR'			=> 'Bookmarking the topic failed. Please try again.',
-	'BOOKMARK_REMOVED'		=> 'Removed bookmarked topic successfully.',
-	'BOOKMARK_TOPIC'		=> 'Bookmark topic',
-	'BOOKMARK_TOPIC_REMOVE'	=> 'Remove from bookmarks',
-	'BUMPED_BY'				=> 'Last bumped by %1$s on %2$s.',
-	'BUMP_TOPIC'			=> 'Bump topic',
-
-	'CODE'					=> 'Code',
-
-	'DELETE_TOPIC'			=> 'Delete topic',
-	'DOWNLOAD_NOTICE'		=> 'You do not have the required permissions to view the files attached to this post.',
-
-	'EDITED_TIMES_TOTAL'	=> 'Last edited by %1$s on %2$s, edited %3$d times in total.',
-	'EDITED_TIME_TOTAL'		=> 'Last edited by %1$s on %2$s, edited %3$d time in total.',
-	'EMAIL_TOPIC'			=> 'E-mail friend',
-	'ERROR_NO_ATTACHMENT'	=> 'The selected attachment does not exist anymore.',
-
-	'FILE_NOT_FOUND_404'	=> 'The file <strong>%s</strong> does not exist.',
-	'FORK_TOPIC'			=> 'Copy topic',
-
-	'LINKAGE_FORBIDDEN'		=> 'You are not authorised to view, download or link from/to this site.',
-	'LOGIN_NOTIFY_TOPIC'	=> 'You have been notified about this topic, please login to view it.',
-	'LOGIN_VIEWTOPIC'		=> 'The board requires you to be registered and logged in to view this topic.',
-
-	'MAKE_ANNOUNCE'				=> 'Change to “Announcement”',
-	'MAKE_GLOBAL'				=> 'Change to “Global”',
-	'MAKE_NORMAL'				=> 'Change to “Standard Topic”',
-	'MAKE_STICKY'				=> 'Change to “Sticky”',
-	'MAX_OPTIONS_SELECT'		=> 'You may select up to <strong>%d</strong> options',
-	'MAX_OPTION_SELECT'			=> 'You may select <strong>1</strong> option',
-	'MISSING_INLINE_ATTACHMENT'	=> 'The attachment <strong>%s</strong> is no longer available',
-	'MOVE_TOPIC'				=> 'Move topic',
-
-	'NO_ATTACHMENT_SELECTED'=> 'You haven’t selected an attachment to download or view.',
-	'NO_NEWER_TOPICS'		=> 'There are no newer topics in this forum.',
-	'NO_OLDER_TOPICS'		=> 'There are no older topics in this forum.',
-	'NO_UNREAD_POSTS'		=> 'There are no new unread posts for this topic.',
-	'NO_VOTE_OPTION'		=> 'You must specify an option when voting.',
-	'NO_VOTES'				=> 'No votes',
-
-	'POLL_ENDED_AT'			=> 'Poll ended at %s',
-	'POLL_RUN_TILL'			=> 'Poll runs till %s',
-	'POLL_VOTED_OPTION'		=> 'You voted for this option',
-	'PRINT_TOPIC'			=> 'Print view',
-
-	'QUICK_MOD'				=> 'Quick-mod tools',
-	'QUOTE'					=> 'Quote',
-
-	'REPLY_TO_TOPIC'		=> 'Reply to topic',
-	'RETURN_POST'			=> '%sReturn to the post%s',
-
-	'SUBMIT_VOTE'			=> 'Submit vote',
-
-	'TOTAL_VOTES'			=> 'Total votes',
-
-	'UNLOCK_TOPIC'			=> 'Unlock topic',
-
-	'VIEW_INFO'				=> 'Post details',
-	'VIEW_NEXT_TOPIC'		=> 'Next topic',
-	'VIEW_PREVIOUS_TOPIC'	=> 'Previous topic',
-	'VIEW_RESULTS'			=> 'View results',
-	'VIEW_TOPIC_POST'		=> '1 post',
-	'VIEW_TOPIC_POSTS'		=> '%d posts',
-	'VIEW_UNREAD_POST'		=> 'First unread post',
-	'VISIT_WEBSITE'			=> 'WWW',
-	'VOTE_SUBMITTED'		=> 'Your vote has been cast.',
-	'VOTE_CONVERTED'		=> 'Changing votes is not supported for converted polls.',
-
-));
-
-?>
\ No newline at end of file
-- 
cgit v1.2.1


From 2e17e448deed073f8614bb555a8ef20c57291c2a Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 4 Oct 2009 18:14:59 +0000
Subject: Copy 3.0.x branch to trunk

git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/acp/attachments.php              | 164 ++++
 phpBB/language/en/acp/ban.php                      |  82 ++
 phpBB/language/en/acp/board.php                    | 532 +++++++++++++
 phpBB/language/en/acp/bots.php                     |  73 ++
 phpBB/language/en/acp/common.php                   | 741 ++++++++++++++++++
 phpBB/language/en/acp/database.php                 |  76 ++
 phpBB/language/en/acp/email.php                    |  67 ++
 phpBB/language/en/acp/forums.php                   | 160 ++++
 phpBB/language/en/acp/groups.php                   | 132 ++++
 phpBB/language/en/acp/index.htm                    |  10 +
 phpBB/language/en/acp/language.php                 | 102 +++
 phpBB/language/en/acp/modules.php                  |  84 ++
 phpBB/language/en/acp/permissions.php              | 289 +++++++
 phpBB/language/en/acp/permissions_phpbb.php        | 241 ++++++
 phpBB/language/en/acp/posting.php                  | 276 +++++++
 phpBB/language/en/acp/profile.php                  | 156 ++++
 phpBB/language/en/acp/prune.php                    |  91 +++
 phpBB/language/en/acp/search.php                   | 107 +++
 phpBB/language/en/acp/styles.php                   | 434 +++++++++++
 phpBB/language/en/acp/users.php                    | 141 ++++
 phpBB/language/en/captcha_qa.php                   |  63 ++
 phpBB/language/en/captcha_recaptcha.php            |  52 ++
 phpBB/language/en/common.php                       | 866 +++++++++++++++++++++
 phpBB/language/en/email/admin_activate.txt         |  14 +
 phpBB/language/en/email/admin_send_email.txt       |  14 +
 .../language/en/email/admin_welcome_activated.txt  |   7 +
 phpBB/language/en/email/admin_welcome_inactive.txt |  19 +
 phpBB/language/en/email/coppa_resend_inactive.txt  |  42 +
 phpBB/language/en/email/coppa_welcome_inactive.txt |  42 +
 phpBB/language/en/email/email_notify.txt           |  17 +
 phpBB/language/en/email/forum_notify.txt           |  19 +
 phpBB/language/en/email/group_added.txt            |  11 +
 phpBB/language/en/email/group_approved.txt         |  10 +
 phpBB/language/en/email/group_request.txt          |  10 +
 phpBB/language/en/email/index.htm                  |  10 +
 phpBB/language/en/email/installed.txt              |  19 +
 phpBB/language/en/email/newtopic_notify.txt        |  13 +
 phpBB/language/en/email/pm_report_closed.txt       |   8 +
 phpBB/language/en/email/pm_report_deleted.txt      |   8 +
 phpBB/language/en/email/post_approved.txt          |  14 +
 phpBB/language/en/email/post_disapproved.txt       |  12 +
 phpBB/language/en/email/privmsg_notify.txt         |  15 +
 phpBB/language/en/email/profile_send_email.txt     |  13 +
 phpBB/language/en/email/profile_send_im.txt        |  13 +
 phpBB/language/en/email/report_closed.txt          |   8 +
 phpBB/language/en/email/report_deleted.txt         |   8 +
 phpBB/language/en/email/topic_approved.txt         |  11 +
 phpBB/language/en/email/topic_disapproved.txt      |  12 +
 phpBB/language/en/email/topic_notify.txt           |  20 +
 phpBB/language/en/email/user_activate.txt          |   9 +
 phpBB/language/en/email/user_activate_inactive.txt |   7 +
 phpBB/language/en/email/user_activate_passwd.txt   |  17 +
 .../language/en/email/user_reactivate_account.txt  |  19 +
 phpBB/language/en/email/user_remind_inactive.txt   |  11 +
 phpBB/language/en/email/user_resend_inactive.txt   |  20 +
 phpBB/language/en/email/user_welcome.txt           |  17 +
 phpBB/language/en/email/user_welcome_inactive.txt  |  21 +
 phpBB/language/en/groups.php                       |  96 +++
 phpBB/language/en/help_bbcode.php                  | 116 +++
 phpBB/language/en/help_faq.php                     | 344 ++++++++
 phpBB/language/en/index.htm                        |  10 +
 phpBB/language/en/install.php                      | 635 +++++++++++++++
 phpBB/language/en/iso.txt                          |   3 +
 phpBB/language/en/mcp.php                          | 402 ++++++++++
 phpBB/language/en/memberlist.php                   | 150 ++++
 phpBB/language/en/mods/index.htm                   |   0
 phpBB/language/en/posting.php                      | 225 ++++++
 phpBB/language/en/search.php                       | 104 +++
 phpBB/language/en/search_ignore_words.php          | 272 +++++++
 phpBB/language/en/search_synonyms.php              | 191 +++++
 phpBB/language/en/ucp.php                          | 555 +++++++++++++
 phpBB/language/en/viewforum.php                    |  66 ++
 phpBB/language/en/viewtopic.php                    | 117 +++
 73 files changed, 8735 insertions(+)
 create mode 100644 phpBB/language/en/acp/attachments.php
 create mode 100644 phpBB/language/en/acp/ban.php
 create mode 100644 phpBB/language/en/acp/board.php
 create mode 100644 phpBB/language/en/acp/bots.php
 create mode 100644 phpBB/language/en/acp/common.php
 create mode 100644 phpBB/language/en/acp/database.php
 create mode 100644 phpBB/language/en/acp/email.php
 create mode 100644 phpBB/language/en/acp/forums.php
 create mode 100644 phpBB/language/en/acp/groups.php
 create mode 100644 phpBB/language/en/acp/index.htm
 create mode 100644 phpBB/language/en/acp/language.php
 create mode 100644 phpBB/language/en/acp/modules.php
 create mode 100644 phpBB/language/en/acp/permissions.php
 create mode 100644 phpBB/language/en/acp/permissions_phpbb.php
 create mode 100644 phpBB/language/en/acp/posting.php
 create mode 100644 phpBB/language/en/acp/profile.php
 create mode 100644 phpBB/language/en/acp/prune.php
 create mode 100644 phpBB/language/en/acp/search.php
 create mode 100644 phpBB/language/en/acp/styles.php
 create mode 100644 phpBB/language/en/acp/users.php
 create mode 100644 phpBB/language/en/captcha_qa.php
 create mode 100644 phpBB/language/en/captcha_recaptcha.php
 create mode 100644 phpBB/language/en/common.php
 create mode 100644 phpBB/language/en/email/admin_activate.txt
 create mode 100644 phpBB/language/en/email/admin_send_email.txt
 create mode 100644 phpBB/language/en/email/admin_welcome_activated.txt
 create mode 100644 phpBB/language/en/email/admin_welcome_inactive.txt
 create mode 100644 phpBB/language/en/email/coppa_resend_inactive.txt
 create mode 100644 phpBB/language/en/email/coppa_welcome_inactive.txt
 create mode 100644 phpBB/language/en/email/email_notify.txt
 create mode 100644 phpBB/language/en/email/forum_notify.txt
 create mode 100644 phpBB/language/en/email/group_added.txt
 create mode 100644 phpBB/language/en/email/group_approved.txt
 create mode 100644 phpBB/language/en/email/group_request.txt
 create mode 100644 phpBB/language/en/email/index.htm
 create mode 100644 phpBB/language/en/email/installed.txt
 create mode 100644 phpBB/language/en/email/newtopic_notify.txt
 create mode 100644 phpBB/language/en/email/pm_report_closed.txt
 create mode 100644 phpBB/language/en/email/pm_report_deleted.txt
 create mode 100644 phpBB/language/en/email/post_approved.txt
 create mode 100644 phpBB/language/en/email/post_disapproved.txt
 create mode 100644 phpBB/language/en/email/privmsg_notify.txt
 create mode 100644 phpBB/language/en/email/profile_send_email.txt
 create mode 100644 phpBB/language/en/email/profile_send_im.txt
 create mode 100644 phpBB/language/en/email/report_closed.txt
 create mode 100644 phpBB/language/en/email/report_deleted.txt
 create mode 100644 phpBB/language/en/email/topic_approved.txt
 create mode 100644 phpBB/language/en/email/topic_disapproved.txt
 create mode 100644 phpBB/language/en/email/topic_notify.txt
 create mode 100644 phpBB/language/en/email/user_activate.txt
 create mode 100644 phpBB/language/en/email/user_activate_inactive.txt
 create mode 100644 phpBB/language/en/email/user_activate_passwd.txt
 create mode 100644 phpBB/language/en/email/user_reactivate_account.txt
 create mode 100644 phpBB/language/en/email/user_remind_inactive.txt
 create mode 100644 phpBB/language/en/email/user_resend_inactive.txt
 create mode 100644 phpBB/language/en/email/user_welcome.txt
 create mode 100644 phpBB/language/en/email/user_welcome_inactive.txt
 create mode 100644 phpBB/language/en/groups.php
 create mode 100644 phpBB/language/en/help_bbcode.php
 create mode 100644 phpBB/language/en/help_faq.php
 create mode 100644 phpBB/language/en/index.htm
 create mode 100644 phpBB/language/en/install.php
 create mode 100644 phpBB/language/en/iso.txt
 create mode 100644 phpBB/language/en/mcp.php
 create mode 100644 phpBB/language/en/memberlist.php
 create mode 100644 phpBB/language/en/mods/index.htm
 create mode 100644 phpBB/language/en/posting.php
 create mode 100644 phpBB/language/en/search.php
 create mode 100644 phpBB/language/en/search_ignore_words.php
 create mode 100644 phpBB/language/en/search_synonyms.php
 create mode 100644 phpBB/language/en/ucp.php
 create mode 100644 phpBB/language/en/viewforum.php
 create mode 100644 phpBB/language/en/viewtopic.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
new file mode 100644
index 0000000000..f6369b6739
--- /dev/null
+++ b/phpBB/language/en/acp/attachments.php
@@ -0,0 +1,164 @@
+<?php
+/**
+*
+* acp_attachments [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ACP_ATTACHMENT_SETTINGS_EXPLAIN'	=> 'Here you can configure the main settings for attachments and the associated special categories.',
+	'ACP_EXTENSION_GROUPS_EXPLAIN'		=> 'Here you can add, delete, modify or disable your extension groups. Further options include the assignment of a special category to them, changing the download mechanism and defining an upload icon which will be displayed in front of the attachment which belongs to the group.',
+	'ACP_MANAGE_EXTENSIONS_EXPLAIN'		=> 'Here you can manage your allowed extensions. To activate your extensions, please refer to the extension groups management panel. We strongly recommend not to allow scripting extensions (such as <code>php</code>, <code>php3</code>, <code>php4</code>, <code>phtml</code>, <code>pl</code>, <code>cgi</code>, <code>py</code>, <code>rb</code>, <code>asp</code>, <code>aspx</code>, and so forth…).',
+	'ACP_ORPHAN_ATTACHMENTS_EXPLAIN'	=> 'Here you are able to see orphaned files. This happens mostly if users are attaching files but not submitting the post. You are able to delete the files or attach them to existing posts. Attaching to posts requires a valid post ID, you have to determine this ID by yourself. This will assign the already uploaded attachment to the post you entered.',
+	'ADD_EXTENSION'						=> 'Add extension',
+	'ADD_EXTENSION_GROUP'				=> 'Add extension group',
+	'ADMIN_UPLOAD_ERROR'				=> 'Errors while trying to attach file: “%s”.',
+	'ALLOWED_FORUMS'					=> 'Allowed forums',
+	'ALLOWED_FORUMS_EXPLAIN'			=> 'Able to post the assigned extensions at the selected (or all if selected) forums.',
+	'ALLOWED_IN_PM_POST'				=> 'Allowed',
+	'ALLOW_ATTACHMENTS'					=> 'Allow attachments',
+	'ALLOW_ALL_FORUMS'					=> 'Allow all forums',
+	'ALLOW_IN_PM'						=> 'Allowed in private messaging',
+	'ALLOW_PM_ATTACHMENTS'				=> 'Allow attachments in private messages',
+	'ALLOW_SELECTED_FORUMS'				=> 'Only forums selected below',
+	'ASSIGNED_EXTENSIONS'				=> 'Assigned extensions',
+	'ASSIGNED_GROUP'					=> 'Assigned extension group',
+	'ATTACH_EXTENSIONS_URL'				=> 'Extensions',
+	'ATTACH_EXT_GROUPS_URL'				=> 'Extension groups',
+	'ATTACH_ID'							=> 'ID',
+	'ATTACH_MAX_FILESIZE'				=> 'Maximum file size',
+	'ATTACH_MAX_FILESIZE_EXPLAIN'		=> 'Maximum size of each file, with 0 being unlimited.',
+	'ATTACH_MAX_PM_FILESIZE'			=> 'Maximum file size messaging',
+	'ATTACH_MAX_PM_FILESIZE_EXPLAIN'	=> 'Maximum size of each file, with 0 being unlimited, attached to a private message.',
+	'ATTACH_ORPHAN_URL'					=> 'Orphan attachments',
+	'ATTACH_POST_ID'					=> 'Post ID',
+	'ATTACH_QUOTA'						=> 'Total attachment quota',
+	'ATTACH_QUOTA_EXPLAIN'				=> 'Maximum drive space available for attachments for the whole board, with 0 being unlimited.',
+	'ATTACH_TO_POST'					=> 'Attach file to post',
+
+	'CAT_FLASH_FILES'			=> 'Flash files',
+	'CAT_IMAGES'				=> 'Images',
+	'CAT_QUICKTIME_FILES'		=> 'Quicktime media files',
+	'CAT_RM_FILES'				=> 'RealMedia media files',
+	'CAT_WM_FILES'				=> 'Windows Media media files',
+	'CHECK_CONTENT'				=> 'Check attachment files',
+	'CHECK_CONTENT_EXPLAIN'		=> 'Some browsers can be tricked to assume an incorrect mimetype for uploaded files. This option ensures that such files likely to cause this are rejected.',
+	'CREATE_GROUP'				=> 'Create new group',
+	'CREATE_THUMBNAIL'			=> 'Create thumbnail',
+	'CREATE_THUMBNAIL_EXPLAIN'	=> 'Create a thumbnail in all possible situations.',
+
+	'DEFINE_ALLOWED_IPS'			=> 'Define allowed IPs/hostnames',
+	'DEFINE_DISALLOWED_IPS'			=> 'Define disallowed IPs/hostnames',
+	'DOWNLOAD_ADD_IPS_EXPLAIN'		=> 'To specify several different IPs or hostnames enter each on a new line. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use “*”.',
+	'DOWNLOAD_REMOVE_IPS_EXPLAIN'	=> 'You can remove (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IPs have a blue background.',
+	'DISPLAY_INLINED'				=> 'Display images inline',
+	'DISPLAY_INLINED_EXPLAIN'		=> 'If set to No image attachments will show as a link.',
+	'DISPLAY_ORDER'					=> 'Attachment display order',
+	'DISPLAY_ORDER_EXPLAIN'			=> 'Display attachments ordered by time.',
+	
+	'EDIT_EXTENSION_GROUP'			=> 'Edit extension group',
+	'EXCLUDE_ENTERED_IP'			=> 'Enable this to exclude the entered IP/hostname.',
+	'EXCLUDE_FROM_ALLOWED_IP'		=> 'Exclude IP from allowed IPs/hostnames',
+	'EXCLUDE_FROM_DISALLOWED_IP'	=> 'Exclude IP from disallowed IPs/hostnames',
+	'EXTENSIONS_UPDATED'			=> 'Extensions successfully updated.',
+	'EXTENSION_EXIST'				=> 'The extension %s already exists.',
+	'EXTENSION_GROUP'				=> 'Extension group',
+	'EXTENSION_GROUPS'				=> 'Extension groups',
+	'EXTENSION_GROUP_DELETED'		=> 'Extension group successfully deleted.',
+	'EXTENSION_GROUP_EXIST'			=> 'The extension group %s already exists.',
+
+	'GO_TO_EXTENSIONS'		=> 'Go to extension management screen',
+	'GROUP_NAME'			=> 'Group name',
+
+	'IMAGE_LINK_SIZE'			=> 'Image link dimensions',
+	'IMAGE_LINK_SIZE_EXPLAIN'	=> 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.',
+	'IMAGICK_PATH'				=> 'Imagemagick path',
+	'IMAGICK_PATH_EXPLAIN'		=> 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>.',
+
+	'MAX_ATTACHMENTS'				=> 'Maximum number of attachments per post',
+	'MAX_ATTACHMENTS_PM'			=> 'Maximum number of attachments per private message',
+	'MAX_EXTGROUP_FILESIZE'			=> 'Maximum file size',
+	'MAX_IMAGE_SIZE'				=> 'Maximum image dimensions',
+	'MAX_IMAGE_SIZE_EXPLAIN'		=> 'Maximum size of image attachments. Set both values to 0px by 0px to disable dimension checking.',
+	'MAX_THUMB_WIDTH'				=> 'Maximum thumbnail width in pixel',
+	'MAX_THUMB_WIDTH_EXPLAIN'		=> 'A generated thumbnail will not exceed the width set here.',
+	'MIN_THUMB_FILESIZE'			=> 'Minimum thumbnail file size',
+	'MIN_THUMB_FILESIZE_EXPLAIN'	=> 'Do not create a thumbnail for images smaller than this.',
+	'MODE_INLINE'					=> 'Inline',
+	'MODE_PHYSICAL'					=> 'Physical',
+
+	'NOT_ALLOWED_IN_PM'			=> 'Only allowed in posts',
+	'NOT_ALLOWED_IN_PM_POST'	=> 'Not allowed',
+	'NOT_ASSIGNED'				=> 'Not assigned',
+	'NO_EXT_GROUP'				=> 'None',
+	'NO_EXT_GROUP_NAME'			=> 'No group name entered',
+	'NO_EXT_GROUP_SPECIFIED'	=> 'No extension group specified.',
+	'NO_FILE_CAT'				=> 'None',
+	'NO_IMAGE'					=> 'No image',
+	'NO_THUMBNAIL_SUPPORT'		=> 'Thumbnail support has been disabled. For proper functionality either the GD extension need to be available or imagemagick being installed. Both were not found.',
+	'NO_UPLOAD_DIR'				=> 'The upload directory you specified does not exist.',
+	'NO_WRITE_UPLOAD'			=> 'The upload directory you specified cannot be written to. Please alter the permissions to allow the webserver to write to it.',
+
+	'ONLY_ALLOWED_IN_PM'	=> 'Only allowed in private messages',
+	'ORDER_ALLOW_DENY'		=> 'Allow',
+	'ORDER_DENY_ALLOW'		=> 'Deny',
+
+	'REMOVE_ALLOWED_IPS'		=> 'Remove or un-exclude <em>allowed</em> IPs/hostnames',
+	'REMOVE_DISALLOWED_IPS'		=> 'Remove or un-exclude <em>disallowed</em> IPs/hostnames',
+
+	'SEARCH_IMAGICK'				=> 'Search for Imagemagick',
+	'SECURE_ALLOW_DENY'				=> 'Allow/Deny list',
+	'SECURE_ALLOW_DENY_EXPLAIN'		=> 'Change the default behaviour when secure downloads are enabled of the Allow/Deny list to that of a <strong>whitelist</strong> (Allow) or a <strong>blacklist</strong> (Deny).',
+	'SECURE_DOWNLOADS'				=> 'Enable secure downloads',
+	'SECURE_DOWNLOADS_EXPLAIN'		=> 'With this option enabled, downloads are limited to IP’s/hostnames you define.',
+	'SECURE_DOWNLOAD_NOTICE'		=> 'Secure Downloads are not enabled. The settings below will be applied after enabling secure downloads.',
+	'SECURE_DOWNLOAD_UPDATE_SUCCESS'=> 'The IP list has been updated successfully.',
+	'SECURE_EMPTY_REFERRER'			=> 'Allow empty referrer',
+	'SECURE_EMPTY_REFERRER_EXPLAIN'	=> 'Secure downloads are based on referrers. Do you want to allow downloads for those omitting the referrer?',
+	'SETTINGS_CAT_IMAGES'			=> 'Image category settings',
+	'SPECIAL_CATEGORY'				=> 'Special category',
+	'SPECIAL_CATEGORY_EXPLAIN'		=> 'Special categories differ between the way presented within posts.',
+	'SUCCESSFULLY_UPLOADED'			=> 'Successfully uploaded.',
+	'SUCCESS_EXTENSION_GROUP_ADD'	=> 'Extension group successfully added.',
+	'SUCCESS_EXTENSION_GROUP_EDIT'	=> 'Extension group successfully updated.',
+
+	'UPLOADING_FILES'				=> 'Uploading files',
+	'UPLOADING_FILE_TO'				=> 'Uploading file “%1$s” to post number %2$d…',
+	'UPLOAD_DENIED_FORUM'			=> 'You do not have the permission to upload files to forum “%s”.',
+	'UPLOAD_DIR'					=> 'Upload directory',
+	'UPLOAD_DIR_EXPLAIN'			=> 'Storage path for attachments. Please note that if you change this directory while already having uploaded attachments you need to manually copy the files to their new location.',
+	'UPLOAD_ICON'					=> 'Upload icon',
+	'UPLOAD_NOT_DIR'				=> 'The upload location you specified does not appear to be a directory.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
new file mode 100644
index 0000000000..099834d1e4
--- /dev/null
+++ b/phpBB/language/en/acp/ban.php
@@ -0,0 +1,82 @@
+<?php
+/**
+*
+* acp_ban [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+// Banning
+$lang = array_merge($lang, array(
+	'1_HOUR'		=> '1 hour',
+	'30_MINS'		=> '30 minutes',
+	'6_HOURS'		=> '6 hours',
+
+	'ACP_BAN_EXPLAIN'	=> 'Here you can control the banning of users by name, IP or e-mail address. These methods prevent a user reaching any part of the board. You can give a short (maximum 3000 characters) reason for the ban if you wish. This will be displayed in the admin log. The duration of a ban can also be specified. If you want the ban to end on a specific date rather than after a set time period select <span style="text-decoration: underline;">Until -&gt;</span> for the ban length and enter a date in <kbd>YYYY-MM-DD</kbd> format.',
+
+	'BAN_EXCLUDE'			=> 'Exclude from banning',
+	'BAN_LENGTH'			=> 'Length of ban',
+	'BAN_REASON'			=> 'Reason for ban',
+	'BAN_GIVE_REASON'		=> 'Reason shown to the banned',
+	'BAN_UPDATE_SUCCESSFUL'	=> 'The banlist has been updated successfully.',
+	'BANNED_UNTIL_DATE'		=> 'until %s', // Example: "until Mon 13.Jul.2009, 14:44"
+	'BANNED_UNTIL_DURATION'	=> '%1$s (until %2$s)', // Example: "7 days (until Tue 14.Jul.2009, 14:44)"
+
+	'EMAIL_BAN'					=> 'Ban one or more e-mail addresses',
+	'EMAIL_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered e-mail address from all current bans.',
+	'EMAIL_BAN_EXPLAIN'			=> 'To specify more than one e-mail address enter each on a new line. To match partial addresses use * as the wildcard, e.g. <samp>*@hotmail.com</samp>, <samp>*@*.domain.tld</samp>, etc.',
+	'EMAIL_NO_BANNED'			=> 'No banned e-mail addresses',
+	'EMAIL_UNBAN'				=> 'Un-ban or un-exclude e-mails',
+	'EMAIL_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple e-mail addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded e-mail addresses are emphasised.',
+
+	'IP_BAN'					=> 'Ban one or more IPs',
+	'IP_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered IP from all current bans.',
+	'IP_BAN_EXPLAIN'			=> 'To specify several different IPs or hostnames enter each on a new line. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use “*”.',
+	'IP_HOSTNAME'				=> 'IP addresses or hostnames',
+	'IP_NO_BANNED'				=> 'No banned IP addresses',
+	'IP_UNBAN'					=> 'Un-ban or un-exclude IPs',
+	'IP_UNBAN_EXPLAIN'			=> 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IPs are emphasised.',
+
+	'LENGTH_BAN_INVALID'		=> 'The date has to be formatted <kbd>YYYY-MM-DD</kbd>.',
+
+	'PERMANENT'		=> 'Permanent',
+
+	'UNTIL'						=> 'Until',
+	'USER_BAN'					=> 'Ban one or more usernames',
+	'USER_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered users from all current bans.',
+	'USER_BAN_EXPLAIN'			=> 'You can ban multiple users in one go by entering each name on a new line. Use the <span style="text-decoration: underline;">Find a member</span> facility to look up and add one or more users automatically.',
+	'USER_NO_BANNED'			=> 'No banned usernames',
+	'USER_UNBAN'				=> 'Un-ban or un-exclude usernames',
+	'USER_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users are emphasised.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
new file mode 100644
index 0000000000..8797a1210a
--- /dev/null
+++ b/phpBB/language/en/acp/board.php
@@ -0,0 +1,532 @@
+<?php
+/**
+*
+* acp_board [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+// Board Settings
+$lang = array_merge($lang, array(
+	'ACP_BOARD_SETTINGS_EXPLAIN'	=> 'Here you can determine the basic operation of your board, give it a fitting name and description, and among other settings adjust the default values for timezone and language.',
+	'CUSTOM_DATEFORMAT'				=> 'Custom…',
+	'DEFAULT_DATE_FORMAT'			=> 'Date format',
+	'DEFAULT_DATE_FORMAT_EXPLAIN'	=> 'The date format is the same as the PHP <code>date</code> function.',
+	'DEFAULT_LANGUAGE'				=> 'Default language',
+	'DEFAULT_STYLE'					=> 'Default style',
+	'DISABLE_BOARD'					=> 'Disable board',
+	'DISABLE_BOARD_EXPLAIN'			=> 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
+	'OVERRIDE_STYLE'				=> 'Override user style',
+	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
+	'SITE_DESC'						=> 'Site description',
+	'SITE_NAME'						=> 'Site name',
+	'SYSTEM_DST'					=> 'Enable Summer Time/<abbr title="Daylight Saving Time">DST</abbr>',
+	'SYSTEM_TIMEZONE'				=> 'System timezone',
+	'WARNINGS_EXPIRE'				=> 'Warning duration',
+	'WARNINGS_EXPIRE_EXPLAIN'		=> 'Number of days that will elapse before the warning will automatically expire from a user’s record.',
+));
+
+// Board Features
+$lang = array_merge($lang, array(
+	'ACP_BOARD_FEATURES_EXPLAIN'	=> 'Here you can enable/disable several board features.',
+
+	'ALLOW_ATTACHMENTS'			=> 'Allow attachments',
+	'ALLOW_BIRTHDAYS'			=> 'Allow birthdays',
+	'ALLOW_BIRTHDAYS_EXPLAIN'	=> 'Allow birthdays to be entered and age being displayed in profiles. Please note the birthday list within the board index is controlled by a separate load setting.',
+	'ALLOW_BOOKMARKS'			=> 'Allow bookmarking topics',
+	'ALLOW_BOOKMARKS_EXPLAIN'	=> 'User is able to store personal bookmarks.',
+	'ALLOW_BBCODE'				=> 'Allow BBCode',
+	'ALLOW_FORUM_NOTIFY'		=> 'Allow subscribing to forums',
+	'ALLOW_NAME_CHANGE'			=> 'Allow username changes',
+	'ALLOW_NO_CENSORS'			=> 'Allow disabling of word censoring',
+	'ALLOW_NO_CENSORS_EXPLAIN'	=> 'Users can choose to disable the automatic word censoring of posts and private messages.',
+	'ALLOW_PM_ATTACHMENTS'		=> 'Allow attachments in private messages',
+	'ALLOW_PM_REPORT'			=> 'Allow users to report private messages',
+	'ALLOW_PM_REPORT_EXPLAIN'	=> 'If this setting is enabled, users have the option of reporting a private message they have received or sent to the board’s moderators. These private messages will then be visible in the Moderator Control Panel.',
+	'ALLOW_QUICK_REPLY'			=> 'Allow quick reply',
+	'ALLOW_QUICK_REPLY_EXPLAIN'	=> 'This setting defines if quick reply is enabled or not. If this setting is enabled, forums need to have their quick reply option enabled too.',
+	'ALLOW_SIG'					=> 'Allow signatures',
+	'ALLOW_SIG_BBCODE'			=> 'Allow BBCode in user signatures',
+	'ALLOW_SIG_FLASH'			=> 'Allow use of <code>[FLASH]</code> BBCode tag in user signatures',
+	'ALLOW_SIG_IMG'				=> 'Allow use of <code>[IMG]</code> BBCode tag in user signatures',
+	'ALLOW_SIG_LINKS'			=> 'Allow use of links in user signatures',
+	'ALLOW_SIG_LINKS_EXPLAIN'	=> 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.',
+	'ALLOW_SIG_SMILIES'			=> 'Allow use of smilies in user signatures',
+	'ALLOW_SMILIES'				=> 'Allow smilies',
+	'ALLOW_TOPIC_NOTIFY'		=> 'Allow subscribing to topics',
+	'BOARD_PM'					=> 'Private messaging',
+	'BOARD_PM_EXPLAIN'			=> 'Enable or disable private messaging for all users.',
+));
+
+// Avatar Settings
+$lang = array_merge($lang, array(
+	'ACP_AVATAR_SETTINGS_EXPLAIN'	=> 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
+
+	'ALLOW_AVATARS'					=> 'Enable avatars',
+	'ALLOW_AVATARS_EXPLAIN'			=> 'Allow general usage of avatars;<br />If you disable avatars in general or avatars of a certain mode, the disabled avatars will no longer be shown on the board, but users will still be able to download their own avatars in the User Control Panel.',
+	'ALLOW_LOCAL'					=> 'Enable gallery avatars',
+	'ALLOW_REMOTE'					=> 'Enable remote avatars',
+	'ALLOW_REMOTE_EXPLAIN'			=> 'Avatars linked to from another website.',
+	'ALLOW_REMOTE_UPLOAD'			=> 'Enable remote avatar uploading',
+	'ALLOW_REMOTE_UPLOAD_EXPLAIN'	=> 'Allow uploading of avatars from another website.',
+	'ALLOW_UPLOAD'					=> 'Enable avatar uploading',
+	'AVATAR_GALLERY_PATH'			=> 'Avatar gallery path',
+	'AVATAR_GALLERY_PATH_EXPLAIN'	=> 'Path under your phpBB root directory for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>.',
+	'AVATAR_STORAGE_PATH'			=> 'Avatar storage path',
+	'AVATAR_STORAGE_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.',
+	'MAX_AVATAR_SIZE'				=> 'Maximum avatar dimensions',
+	'MAX_AVATAR_SIZE_EXPLAIN'		=> 'Width x Height in pixels.',
+	'MAX_FILESIZE'					=> 'Maximum avatar file size',
+	'MAX_FILESIZE_EXPLAIN'			=> 'For uploaded avatar files.',
+	'MIN_AVATAR_SIZE'				=> 'Minimum avatar dimensions',
+	'MIN_AVATAR_SIZE_EXPLAIN'		=> 'Width x Height in pixels.',
+));
+
+// Message Settings
+$lang = array_merge($lang, array(
+	'ACP_MESSAGE_SETTINGS_EXPLAIN'		=> 'Here you can set all default settings for private messaging.',
+
+	'ALLOW_BBCODE_PM'			=> 'Allow BBCode in private messages',
+	'ALLOW_FLASH_PM'			=> 'Allow use of <code>[FLASH]</code> BBCode tag',
+	'ALLOW_FLASH_PM_EXPLAIN'	=> 'Note that the ability to use flash in private messages, if enabled here, also depends on the permissions.',
+	'ALLOW_FORWARD_PM'			=> 'Allow forwarding of private messages',
+	'ALLOW_IMG_PM'				=> 'Allow use of <code>[IMG]</code> BBCode tag',
+	'ALLOW_MASS_PM'				=> 'Allow sending of private messages to multiple users and groups',
+	'ALLOW_MASS_PM_EXPLAIN'		=> 'Sending to groups can be adjusted per group within the group settings page.',
+	'ALLOW_PRINT_PM'			=> 'Allow print view in private messaging',
+	'ALLOW_QUOTE_PM'			=> 'Allow quotes in private messages',
+	'ALLOW_SIG_PM'				=> 'Allow signature in private messages',
+	'ALLOW_SMILIES_PM'			=> 'Allow smilies in private messages',
+	'BOXES_LIMIT'				=> 'Maximum private messages per box',
+	'BOXES_LIMIT_EXPLAIN'		=> 'Users may receive no more than this many messages in each of their private message boxes. Set this value to 0 to allow unlimited messages.',
+	'BOXES_MAX'					=> 'Maximum private message folders',
+	'BOXES_MAX_EXPLAIN'			=> 'By default users may create this many personal folders for private messages.',
+	'ENABLE_PM_ICONS'			=> 'Enable use of topic icons in private messages',
+	'FULL_FOLDER_ACTION'		=> 'Full folder default action',
+	'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default action to take if a user’s folder is full assuming the user’s folder action, if set at all, is not applicable. The only exception is for the “Sent messages” folder where the default action is always to delete old messages.',
+	'HOLD_NEW_MESSAGES'			=> 'Hold new messages',
+	'PM_EDIT_TIME'				=> 'Limit editing time',
+	'PM_EDIT_TIME_EXPLAIN'		=> 'Limits the time available to edit a private message not already delivered. Setting the value to 0 disables this behaviour.',
+	'PM_MAX_RECIPIENTS'			=> 'Maximum number of allowed recipients',
+	'PM_MAX_RECIPIENTS_EXPLAIN'	=> 'The maximum number of allowed recipients in a private message. If 0 is entered, an unlimited number is allowed. This setting can be adjusted for every group within the group settings page.',
+));
+
+// Post Settings
+$lang = array_merge($lang, array(
+	'ACP_POST_SETTINGS_EXPLAIN'			=> 'Here you can set all default settings for posting.',
+	'ALLOW_POST_LINKS'					=> 'Allow links in posts/private messages',
+	'ALLOW_POST_LINKS_EXPLAIN'			=> 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.',
+	'ALLOW_POST_FLASH'					=> 'Allow use of <code>[FLASH]</code> BBCode tag in posts',
+	'ALLOW_POST_FLASH_EXPLAIN'			=> 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.',
+
+	'BUMP_INTERVAL'					=> 'Bump interval',
+	'BUMP_INTERVAL_EXPLAIN'			=> 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.',
+	'CHAR_LIMIT'					=> 'Maximum characters per post/message',
+	'CHAR_LIMIT_EXPLAIN'			=> 'The number of characters allowed within a post/private message. Set to 0 for unlimited characters.',
+	'DELETE_TIME'					=> 'Limit deleting time',
+	'DELETE_TIME_EXPLAIN'			=> 'Limits the time available to delete a new post. Setting the value to 0 disables this behaviour.',
+	'DISPLAY_LAST_EDITED'			=> 'Display last edited time information',
+	'DISPLAY_LAST_EDITED_EXPLAIN'	=> 'Choose if the last edited by information to be displayed on posts.',
+	'EDIT_TIME'						=> 'Limit editing time',
+	'EDIT_TIME_EXPLAIN'				=> 'Limits the time available to edit a new post. Setting the value to 0 disables this behaviour.',
+	'FLOOD_INTERVAL'				=> 'Flood interval',
+	'FLOOD_INTERVAL_EXPLAIN'		=> 'Number of seconds a user must wait between posting new messages. To enable users to ignore this alter their permissions.',
+	'HOT_THRESHOLD'					=> 'Popular topic threshold',
+	'HOT_THRESHOLD_EXPLAIN'			=> 'Posts per topic threshold required for the popular topic annotation. Set to 0 to disable popular topics.',
+	'MAX_POLL_OPTIONS'				=> 'Maximum number of poll options',
+	'MAX_POST_FONT_SIZE'			=> 'Maximum font size per post',
+	'MAX_POST_FONT_SIZE_EXPLAIN'	=> 'Maximum font size allowed in a post. Set to 0 for unlimited font size.',
+	'MAX_POST_IMG_HEIGHT'			=> 'Maximum image height per post',
+	'MAX_POST_IMG_HEIGHT_EXPLAIN'	=> 'Maximum height of an image/flash file in postings. Set to 0 for unlimited size.',
+	'MAX_POST_IMG_WIDTH'			=> 'Maximum image width per post',
+	'MAX_POST_IMG_WIDTH_EXPLAIN'	=> 'Maximum width of an image/flash file in postings. Set to 0 for unlimited size.',
+	'MAX_POST_URLS'					=> 'Maximum links per post',
+	'MAX_POST_URLS_EXPLAIN'			=> 'Maximum number of URLs in a post. Set to 0 for unlimited links.',
+	'MIN_CHAR_LIMIT'				=> 'Minimum characters per post/message',
+	'MIN_CHAR_LIMIT_EXPLAIN'		=> 'The minimum number of characters the user need to enter within a post/private message.',
+	'POSTING'						=> 'Posting',
+	'POSTS_PER_PAGE'				=> 'Posts per page',
+	'QUOTE_DEPTH_LIMIT'				=> 'Maximum nested quotes per post',
+	'QUOTE_DEPTH_LIMIT_EXPLAIN'		=> 'Maximum number of nested quotes in a post. Set to 0 for unlimited depth.',
+	'SMILIES_LIMIT'					=> 'Maximum smilies per post',
+	'SMILIES_LIMIT_EXPLAIN'			=> 'Maximum number of smilies in a post. Set to 0 for unlimited smilies.',
+	'SMILIES_PER_PAGE'				=> 'Smilies per page',
+	'TOPICS_PER_PAGE'				=> 'Topics per page',
+));
+
+// Signature Settings
+$lang = array_merge($lang, array(
+	'ACP_SIGNATURE_SETTINGS_EXPLAIN'	=> 'Here you can set all default settings for signatures.',
+
+	'MAX_SIG_FONT_SIZE'				=> 'Maximum signature font size',
+	'MAX_SIG_FONT_SIZE_EXPLAIN'		=> 'Maximum font size allowed in user signatures. Set to 0 for unlimited size.',
+	'MAX_SIG_IMG_HEIGHT'			=> 'Maximum signature image height',
+	'MAX_SIG_IMG_HEIGHT_EXPLAIN'	=> 'Maximum height of an image/flash file in user signatures. Set to 0 for unlimited height.',
+	'MAX_SIG_IMG_WIDTH'				=> 'Maximum signature image width',
+	'MAX_SIG_IMG_WIDTH_EXPLAIN'		=> 'Maximum width of an image/flash file in user signatures. Set to 0 for unlimited width.',
+	'MAX_SIG_LENGTH'				=> 'Maximum signature length',
+	'MAX_SIG_LENGTH_EXPLAIN'		=> 'Maximum number of characters in user signatures.',
+	'MAX_SIG_SMILIES'				=> 'Maximum smilies per signature',
+	'MAX_SIG_SMILIES_EXPLAIN'		=> 'Maximum smilies allowed in user signatures. Set to 0 for unlimited smilies.',
+	'MAX_SIG_URLS'					=> 'Maximum signature links',
+	'MAX_SIG_URLS_EXPLAIN'			=> 'Maximum number of links in user signatures. Set to 0 for unlimited links.',
+));
+
+// Registration Settings
+$lang = array_merge($lang, array(
+	'ACP_REGISTER_SETTINGS_EXPLAIN'		=> 'Here you are able to define registration and profile related settings.',
+
+	'ACC_ACTIVATION'				=> 'Account activation',
+	'ACC_ACTIVATION_EXPLAIN'		=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.',
+	'NEW_MEMBER_POST_LIMIT'			=> 'New member post limit',
+	'NEW_MEMBER_POST_LIMIT_EXPLAIN'	=> 'New members are within the <em>Newly Registered Users</em> group until they reach this number of posts. You can use this group to keep them from using the PM system or to review their posts. <strong>A value of 0 disables this feature.</strong>',
+	'NEW_MEMBER_GROUP_DEFAULT'		=> 'Set Newly Registered Users group to default',
+	'NEW_MEMBER_GROUP_DEFAULT_EXPLAIN'	=> 'If set to yes and a new member post limit is specified newly registered users will be not only put into the <em>Newly Registered Users</em> group, but this group also being their default one. This may come in handy if you want to assign a group default rank and/or avatar the user then inherits.',
+
+	'ACC_ADMIN'					=> 'By Admin',
+	'ACC_DISABLE'				=> 'Disable',
+	'ACC_NONE'					=> 'None',
+	'ACC_USER'					=> 'By User',
+//	'ACC_USER_ADMIN'			=> 'User + Admin',
+	'ALLOW_EMAIL_REUSE'			=> 'Allow e-mail address re-use',
+	'ALLOW_EMAIL_REUSE_EXPLAIN'	=> 'Different users can register with the same e-mail address.',
+	'COPPA'						=> 'COPPA',
+	'COPPA_FAX'					=> 'COPPA fax number',
+	'COPPA_MAIL'				=> 'COPPA mailing address',
+	'COPPA_MAIL_EXPLAIN'		=> 'This is the mailing address where parents will send COPPA registration forms.',
+	'ENABLE_COPPA'				=> 'Enable COPPA',
+	'ENABLE_COPPA_EXPLAIN'		=> 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA. If this is disabled the COPPA specific groups will no longer be displayed.',
+	'MAX_CHARS'					=> 'Max',
+	'MIN_CHARS'					=> 'Min',
+	'NO_AUTH_PLUGIN'			=> 'No suitable auth plugin found.',
+	'PASSWORD_LENGTH'			=> 'Password length',
+	'PASSWORD_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in passwords.',
+	'REG_LIMIT'					=> 'Registration attempts',
+	'REG_LIMIT_EXPLAIN'			=> 'Number of attempts users can make at the confirmation code before being locked out that session.',
+	'USERNAME_ALPHA_ONLY'		=> 'Alphanumeric only',
+	'USERNAME_ALPHA_SPACERS'	=> 'Alphanumeric and spacers',
+	'USERNAME_ASCII'			=> 'ASCII (no international unicode)',
+	'USERNAME_LETTER_NUM'		=> 'Any letter and number',
+	'USERNAME_LETTER_NUM_SPACERS'	=> 'Any letter, number, and spacer',
+	'USERNAME_CHARS'			=> 'Limit username chars',
+	'USERNAME_CHARS_ANY'		=> 'Any character',
+	'USERNAME_CHARS_EXPLAIN'	=> 'Restrict type of characters that may be used in usernames, spacers are: space, -, +, _, [ and ].',
+	'USERNAME_LENGTH'			=> 'Username length',
+	'USERNAME_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in usernames.',
+));
+
+// Feeds
+$lang = array_merge($lang, array(
+	'ACP_FEED_MANAGEMENT'				=> 'General Syndication Feeds settings',
+	'ACP_FEED_MANAGEMENT_EXPLAIN'		=> 'This Module makes available various ATOM Feeds, parsing any BBCode in posts to make them readable in external feeds.',
+
+	'ACP_FEED_ENABLE'					=> 'Enable Feeds',
+	'ACP_FEED_ENABLE_EXPLAIN'			=> 'Turns on or off ATOM Feeds for the entire board.<br />Disabling this switches off all Feeds, no matter how the options below are set.',
+	'ACP_FEED_LIMIT'					=> 'Number of items',
+	'ACP_FEED_LIMIT_EXPLAIN'			=> 'The maximum number of feed items to display.',
+
+	'ACP_FEED_OVERALL_FORUMS'			=> 'Enable overall forums feed',
+	'ACP_FEED_OVERALL_FORUMS_EXPLAIN'	=> 'This feed displays the latest posts from all forums topics.',
+	'ACP_FEED_OVERALL_FORUMS_LIMIT'		=> 'Number of items per page to display in the forums feed',
+
+	'ACP_FEED_OVERALL_TOPIC'			=> 'Enable overall topics feed',
+	'ACP_FEED_OVERALL_TOPIC_EXPLAIN'	=> 'Enables the “All Topics” feed',
+	'ACP_FEED_OVERALL_TOPIC_LIMIT'		=> 'Number of items per page to display in the topics feed',
+	'ACP_FEED_FORUM'					=> 'Enable Per-Forum Feeds',
+	'ACP_FEED_FORUM_EXPLAIN'			=> 'Single forum new posts.',
+	'ACP_FEED_TOPIC'					=> 'Enable Per-Topic Feeds',
+	'ACP_FEED_TOPIC_EXPLAIN'			=> 'Single topics new posts.',
+	'ACP_FEED_NEWS'						=> 'News Feeds',
+	'ACP_FEED_NEWS_EXPLAIN'				=> 'Pull the first post from these forums. Select no forums to disable news feed.<br />Select multiple forums by holding <samp>CTRL</samp> and clicking.',
+
+	'ACP_FEED_GENERAL'					=> 'General Feed Settings',
+
+	'ACP_FEED_ITEM_STATISTICS'			=> 'Item statistics',
+	'ACP_FEED_ITEM_STATISTICS_EXPLAIN'	=> 'Display individual statistics underneath feed items<br />(Posted by, date and time, Replies, Views)',
+	'ACP_FEED_EXCLUDE_ID'				=> 'Exclude these forums',
+	'ACP_FEED_EXCLUDE_ID_EXPLAIN'		=> 'Content from these will be <strong>not included in feeds</strong>. Select no forum to pull data from all forums.<br />Select/Deselect multiple forums by holding <samp>CTRL</samp> and clicking.',
+));
+
+// Visual Confirmation Settings
+$lang = array_merge($lang, array(
+	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you can select and configure CAPTCHA plugins, which implement various ways to reject registration attempts from so-called spambots.',
+	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
+	'CAPTCHA_UNAVAILABLE'					=> 'The CAPTCHA cannot be selected as its requirements are not met.',
+	'CAPTCHA_GD'							=> 'GD CAPTCHA',
+	'CAPTCHA_GD_3D'							=> 'GD 3D Captcha',
+	'CAPTCHA_GD_FOREGROUND_NOISE'			=> 'GD CAPTCHA foreground noise',
+	'CAPTCHA_GD_EXPLAIN'					=> 'Use GD to make a more advanced CAPTCHA.',
+	'CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN'	=> 'Use foreground noise to make the GD based CAPTCHA harder.',
+	'CAPTCHA_GD_X_GRID'						=> 'GD CAPTCHA background noise x-axis',
+	'CAPTCHA_GD_X_GRID_EXPLAIN'				=> 'Use lower settings of this to make the GD based CAPTCHA harder. 0 will disable x-axis background noise.',
+	'CAPTCHA_GD_Y_GRID'						=> 'GD CAPTCHA background noise y-axis',
+	'CAPTCHA_GD_Y_GRID_EXPLAIN'				=> 'Use lower settings of this to make the GD based CAPTCHA harder. 0 will disable y-axis background noise.',
+	'CAPTCHA_GD_WAVE'						=> 'GD CAPTCHA wave distortion',
+	'CAPTCHA_GD_WAVE_EXPLAIN'				=> 'This applies a wave distortion to the CAPTCHA.',
+	'CAPTCHA_GD_3D_NOISE'					=> 'Add 3D-noise objects',
+	'CAPTCHA_GD_3D_NOISE_EXPLAIN'			=> 'This adds additional objects to the CAPTCHA, over the letters.',
+	'CAPTCHA_GD_FONTS'						=> 'Use different fonts',
+	'CAPTCHA_GD_FONTS_EXPLAIN'				=> 'This setting controls how many different letter shapes are used. You can just use the default shapes or introduce altered letters. Adding lowercase letters is also possible.',
+	'CAPTCHA_FONT_DEFAULT'					=> 'Default',
+	'CAPTCHA_FONT_NEW'						=> 'New Shapes',
+	'CAPTCHA_FONT_LOWER'					=> 'Also use lowercase',
+	'CAPTCHA_NO_GD'							=> 'CAPTCHA without GD',
+	'CAPTCHA_PREVIEW_MSG'					=> 'Your changes to the visual confirmation setting were not saved. This is just a preview.',
+	'CAPTCHA_PREVIEW_EXPLAIN'				=> 'The CAPTCHA as it would look like using the current selection.',
+
+	'CAPTCHA_SELECT'						=> 'Installed CAPTCHA plugins',
+	'CAPTCHA_SELECT_EXPLAIN'				=> 'The dropdown holds the CAPTCHA plugins recognized by the board. Gray entries are not available right now and might need configuration prior to use.',
+	'CAPTCHA_CONFIGURE'						=> 'Configure CAPTCHAs',
+	'CAPTCHA_CONFIGURE_EXPLAIN'				=> 'Change the settings for the selected CAPTCHA.',
+	'CONFIGURE'								=> 'Configure',
+	'CAPTCHA_NO_OPTIONS'					=> 'This CAPTCHA has no configuration options.',
+
+	'VISUAL_CONFIRM_POST'					=> 'Enable visual confirmation for guest postings',
+	'VISUAL_CONFIRM_POST_EXPLAIN'			=> 'Requires anonymous users to enter a random code matching an image to help prevent mass postings.',
+	'VISUAL_CONFIRM_REG'					=> 'Enable visual confirmation for registrations',
+	'VISUAL_CONFIRM_REG_EXPLAIN'			=> 'Requires new users to enter a random code matching an image to help prevent mass registrations.',
+	'VISUAL_CONFIRM_REFRESH'				=> 'Enable users to refresh the confirmation image',
+	'VISUAL_CONFIRM_REFRESH_EXPLAIN'		=> 'Allows users to request new confirmation codes, if they are unable to solve the VC during registration. Some plugins might not support this option.',
+));
+
+// Cookie Settings
+$lang = array_merge($lang, array(
+	'ACP_COOKIE_SETTINGS_EXPLAIN'		=> 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in.',
+
+	'COOKIE_DOMAIN'				=> 'Cookie domain',
+	'COOKIE_NAME'				=> 'Cookie name',
+	'COOKIE_PATH'				=> 'Cookie path',
+	'COOKIE_SECURE'				=> 'Cookie secure',
+	'COOKIE_SECURE_EXPLAIN'		=> 'If your server is running via SSL set this to enabled else leave as disabled. Having this enabled and not running via SSL will result in server errors during redirects.',
+	'ONLINE_LENGTH'				=> 'View online time span',
+	'ONLINE_LENGTH_EXPLAIN'		=> 'Number of minutes after which inactive users will not appear in “Who is online” listings. The higher this value the greater is the processing required to generate the listing.',
+	'SESSION_LENGTH'			=> 'Session length',
+	'SESSION_LENGTH_EXPLAIN'	=> 'Sessions will expire after this time, in seconds.',
+));
+
+// Load Settings
+$lang = array_merge($lang, array(
+	'ACP_LOAD_SETTINGS_EXPLAIN'	=> 'Here you can enable and disable certain board functions to reduce the amount of processing required. On most servers there is no need to disable any functions. However on certain systems or in shared hosting environments it may be beneficial to disable capabilities you do not really need. You can also specify limits for system load and active sessions beyond which the board will go offline.',
+
+	'CUSTOM_PROFILE_FIELDS'			=> 'Custom profile fields',
+	'LIMIT_LOAD'					=> 'Limit system load',
+	'LIMIT_LOAD_EXPLAIN'			=> 'If the system’s 1-minute load average exceeds this value the board will automatically go offline. A value of 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers and where this information is accessible. The value here resets itself to 0 if phpBB was unable to get the load limit.',
+	'LIMIT_SESSIONS'				=> 'Limit sessions',
+	'LIMIT_SESSIONS_EXPLAIN'		=> 'If the number of sessions exceeds this value within a one minute period the board will go offline. Set to 0 for unlimited sessions.',
+	'LOAD_CPF_MEMBERLIST'			=> 'Allow styles to display custom profile fields in memberlist',
+	'LOAD_CPF_VIEWPROFILE'			=> 'Display custom profile fields in user profiles',
+	'LOAD_CPF_VIEWTOPIC'			=> 'Display custom profile fields on topic pages',
+	'LOAD_USER_ACTIVITY'			=> 'Show user’s activity',
+	'LOAD_USER_ACTIVITY_EXPLAIN'	=> 'Displays active topic/forum in user profiles and user control panel. It is recommended to disable this on boards with more than one million posts.',
+	'RECOMPILE_STYLES'				=> 'Recompile stale style components',
+	'RECOMPILE_STYLES_EXPLAIN'		=> 'Check for updated style components on filesystem and recompile.',
+	'YES_ANON_READ_MARKING'			=> 'Enable topic marking for guests',
+	'YES_ANON_READ_MARKING_EXPLAIN'	=> 'Stores read/unread status information for guests. If disabled posts are always read for guests.',
+	'YES_BIRTHDAYS'					=> 'Enable birthday listing',
+	'YES_BIRTHDAYS_EXPLAIN'			=> 'If disabled the birthday listing is no longer displayed. To let this setting take effect the birthday feature needs to be enabled too.',
+	'YES_JUMPBOX'					=> 'Enable display of jumpbox',
+	'YES_MODERATORS'				=> 'Enable display of moderators',
+	'YES_ONLINE'					=> 'Enable online user listings',
+	'YES_ONLINE_EXPLAIN'			=> 'Display online user information on index, forum and topic pages.',
+	'YES_ONLINE_GUESTS'				=> 'Enable online guest listings in viewonline',
+	'YES_ONLINE_GUESTS_EXPLAIN'		=> 'Allow display of guest user information in viewonline.',
+	'YES_ONLINE_TRACK'				=> 'Enable display of user online/offline information',
+	'YES_ONLINE_TRACK_EXPLAIN'		=> 'Display online information for user in profiles and topic pages.',
+	'YES_POST_MARKING'				=> 'Enable dotted topics',
+	'YES_POST_MARKING_EXPLAIN'		=> 'Indicates whether user has posted to a topic.',
+	'YES_READ_MARKING'				=> 'Enable server-side topic marking',
+	'YES_READ_MARKING_EXPLAIN'		=> 'Stores read/unread status information in the database rather than a cookie.',
+));
+
+// Auth settings
+$lang = array_merge($lang, array(
+	'ACP_AUTH_SETTINGS_EXPLAIN'	=> 'phpBB supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default three plug-ins are provided; DB, LDAP and Apache. Not all methods require additional information so only fill out fields if they are relevant to the selected method.',
+
+	'AUTH_METHOD'				=> 'Select an authentication method',
+
+	'APACHE_SETUP_BEFORE_USE'	=> 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version) and safe_mode disabled.',
+
+	'LDAP_DN'						=> 'LDAP base <var>dn</var>',
+	'LDAP_DN_EXPLAIN'				=> 'This is the Distinguished Name, locating the user information, e.g. <samp>o=My Company,c=US</samp>.',
+	'LDAP_EMAIL'					=> 'LDAP e-mail attribute',
+	'LDAP_EMAIL_EXPLAIN'			=> 'Set this to the name of your user entry e-mail attribute (if one exists) in order to automatically set the e-mail address for new users. Leaving this empty results in empty e-mail address for users who log in for the first time.',
+	'LDAP_INCORRECT_USER_PASSWORD'	=> 'Binding to LDAP server failed with specified user/password.',
+	'LDAP_NO_EMAIL'					=> 'The specified e-mail attribute does not exist.',
+	'LDAP_NO_IDENTITY'				=> 'Could not find a login identity for %s.',
+	'LDAP_PASSWORD'					=> 'LDAP password',
+	'LDAP_PASSWORD_EXPLAIN'			=> 'Leave blank to use anonymous binding. Else fill in the password for the above user.  Required for Active Directory Servers. <strong>WARNING:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.',
+	'LDAP_PORT'						=> 'LDAP server port',
+	'LDAP_PORT_EXPLAIN'				=> 'Optionally you can specify a port which should be used to connect to the LDAP server instead of the default port 389.',
+	'LDAP_SERVER'					=> 'LDAP server name',
+	'LDAP_SERVER_EXPLAIN'			=> 'If using LDAP this is the hostname or IP address of the LDAP server. Alternatively you can specify an URL like ldap://hostname:port/',
+	'LDAP_UID'						=> 'LDAP <var>uid</var>',
+	'LDAP_UID_EXPLAIN'				=> 'This is the key under which to search for a given login identity, e.g. <var>uid</var>, <var>sn</var>, etc.',
+	'LDAP_USER'						=> 'LDAP user <var>dn</var>',
+	'LDAP_USER_EXPLAIN'				=> 'Leave blank to use anonymous binding. If filled in phpBB uses the specified distinguished name on login attempts to find the correct user, e.g. <samp>uid=Username,ou=MyUnit,o=MyCompany,c=US</samp>. Required for Active Directory Servers.',
+	'LDAP_USER_FILTER'				=> 'LDAP user filter',
+	'LDAP_USER_FILTER_EXPLAIN'		=> 'Optionally you can further limit the searched objects with additional filters. For example <samp>objectClass=posixGroup</samp> would result in the use of <samp>(&amp;(uid=$username)(objectClass=posixGroup))</samp>',
+));
+
+// Server Settings
+$lang = array_merge($lang, array(
+	'ACP_SERVER_SETTINGS_EXPLAIN'	=> 'Here you define server and domain dependant settings. Please ensure the data you enter is accurate, errors will result in e-mails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.',
+
+	'ENABLE_GZIP'				=> 'Enable GZip compression',
+	'ENABLE_GZIP_EXPLAIN'		=> 'Generated content will be compressed prior to sending it to the user. This can reduce network traffic but will also increase CPU usage on both server and client side. Requires zlib PHP extension to be loaded.',
+	'FORCE_SERVER_VARS'			=> 'Force server URL settings',
+	'FORCE_SERVER_VARS_EXPLAIN'	=> 'If set to yes the server settings defined here will be used in favour of the automatically determined values.',
+	'ICONS_PATH'				=> 'Post icons storage path',
+	'ICONS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/icons</samp>.',
+	'PATH_SETTINGS'				=> 'Path settings',
+	'RANKS_PATH'				=> 'Rank image storage path',
+	'RANKS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/ranks</samp>.',
+	'SCRIPT_PATH'				=> 'Script path',
+	'SCRIPT_PATH_EXPLAIN'		=> 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>.',
+	'SERVER_NAME'				=> 'Domain name',
+	'SERVER_NAME_EXPLAIN'		=> 'The domain name this board runs from (for example: <samp>www.example.com</samp>).',
+	'SERVER_PORT'				=> 'Server port',
+	'SERVER_PORT_EXPLAIN'		=> 'The port your server is running on, usually 80, only change if different.',
+	'SERVER_PROTOCOL'			=> 'Server protocol',
+	'SERVER_PROTOCOL_EXPLAIN'	=> 'This is used as the server protocol if these settings are forced. If empty or not forced the protocol is determined by the cookie secure settings (<samp>http://</samp> or <samp>https://</samp>).',
+	'SERVER_URL_SETTINGS'		=> 'Server URL settings',
+	'SMILIES_PATH'				=> 'Smilies storage path',
+	'SMILIES_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/smilies</samp>.',
+	'UPLOAD_ICONS_PATH'			=> 'Extension group icons storage path',
+	'UPLOAD_ICONS_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/upload_icons</samp>.',
+));
+
+// Security Settings
+$lang = array_merge($lang, array(
+	'ACP_SECURITY_SETTINGS_EXPLAIN'		=> 'Here you are able to define session and login related settings.',
+
+	'ALL'							=> 'All',
+	'ALLOW_AUTOLOGIN'				=> 'Allow persistent logins',
+	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users can autologin when they visit the board.',
+	'AUTOLOGIN_LENGTH'				=> 'Persistent login key expiration length (in days)',
+	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which persistent login keys are removed or zero to disable.',
+	'BROWSER_VALID'					=> 'Validate browser',
+	'BROWSER_VALID_EXPLAIN'			=> 'Enables browser validation for each session improving security.',
+	'CHECK_DNSBL'					=> 'Check IP against DNS Blackhole List',
+	'CHECK_DNSBL_EXPLAIN'			=> 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: <a href="http://spamcop.net">spamcop.net</a> and <a href="http://www.spamhaus.org">www.spamhaus.org</a>. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.',
+	'CLASS_B'						=> 'A.B',
+	'CLASS_C'						=> 'A.B.C',
+	'EMAIL_CHECK_MX'				=> 'Check e-mail domain for valid MX record',
+	'EMAIL_CHECK_MX_EXPLAIN'		=> 'If enabled, the e-mail domain provided on registration and profile changes is checked for a valid MX record.',
+	'FORCE_PASS_CHANGE'				=> 'Force password change',
+	'FORCE_PASS_CHANGE_EXPLAIN'		=> 'Require user to change their password after a set number of days. Setting this value to 0 disables this behaviour.',
+	'FORM_TIME_MAX'					=> 'Maximum time to submit forms',
+	'FORM_TIME_MAX_EXPLAIN'			=> 'The time a user has to submit a form. Use -1 to disable. Note that a form might become invalid if the session expires, regardless of this setting.',
+	'FORM_SID_GUESTS'				=> 'Tie forms to guest sessions',
+	'FORM_SID_GUESTS_EXPLAIN'		=> 'If enabled, the form token issued to guests will be session-exclusive. This can cause problems with some ISPs.',
+	'FORWARDED_FOR_VALID'			=> 'Validated <var>X_FORWARDED_FOR</var> header',
+	'FORWARDED_FOR_VALID_EXPLAIN'	=> 'Sessions will only be continued if the sent <var>X_FORWARDED_FOR</var> header equals the one sent with the previous request. Bans will be checked against IPs in <var>X_FORWARDED_FOR</var> too.',
+	'IP_VALID'						=> 'Session IP validation',
+	'IP_VALID_EXPLAIN'				=> 'Determines how much of the users IP is used to validate a session; <samp>All</samp> compares the complete address, <samp>A.B.C</samp> the first x.x.x, <samp>A.B</samp> the first x.x, <samp>None</samp> disables checking. On IPv6 addresses <samp>A.B.C</samp> compares the first 4 blocks and <samp>A.B</samp> the first 3 blocks.',
+	'MAX_LOGIN_ATTEMPTS'			=> 'Maximum number of login attempts',
+	'MAX_LOGIN_ATTEMPTS_EXPLAIN'	=> 'After this number of failed logins the user needs to additionally confirm his login visually (visual confirmation).',
+	'NO_IP_VALIDATION'				=> 'None',
+	'NO_REF_VALIDATION'				=> 'None',
+	'PASSWORD_TYPE'					=> 'Password complexity',
+	'PASSWORD_TYPE_EXPLAIN'			=> 'Determines how complex a password needs to be when set or altered, subsequent options include the previous ones.',
+	'PASS_TYPE_ALPHA'				=> 'Must contain letters and numbers',
+	'PASS_TYPE_ANY'					=> 'No requirements',
+	'PASS_TYPE_CASE'				=> 'Must be mixed case',
+	'PASS_TYPE_SYMBOL'				=> 'Must contain symbols',
+	'REF_HOST'						=> 'Only validate host',
+	'REF_PATH'						=> 'Also validate path',
+	'REFERER_VALID'					=> 'Validate Referer',
+	'REFERER_VALID_EXPLAIN'			=> 'If enabled, the referer of POST requests will be checked against the host/script path settings. This may cause issues with boards using several domains and or external logins.',
+	'TPL_ALLOW_PHP'					=> 'Allow php in templates',
+	'TPL_ALLOW_PHP_EXPLAIN'			=> 'If this option is enabled, <code>PHP</code> and <code>INCLUDEPHP</code> statements will be recognised and parsed in templates.',
+));
+
+// Email Settings
+$lang = array_merge($lang, array(
+	'ACP_EMAIL_SETTINGS_EXPLAIN'	=> 'This information is used when the board sends e-mails to your users. Please ensure the e-mail address you specify is valid, any bounced or undeliverable messages will likely be sent to that address. If your host does not provide a native (PHP based) e-mail service you can instead send messages directly using SMTP. This requires the address of an appropriate server (ask your provider if necessary). If the server requires authentication (and only if it does) enter the necessary username, password and authentication method.',
+
+	'ADMIN_EMAIL'					=> 'Return e-mail address',
+	'ADMIN_EMAIL_EXPLAIN'			=> 'This will be used as the return address on all e-mails, the technical contact e-mail address. It will always be used as the <samp>Return-Path</samp> and <samp>Sender</samp> address in e-mails.',
+	'BOARD_EMAIL_FORM'				=> 'Users send e-mail via board',
+	'BOARD_EMAIL_FORM_EXPLAIN'		=> 'Instead of showing the users e-mail address users are able to send e-mails via the board.',
+	'BOARD_HIDE_EMAILS'				=> 'Hide e-mail addresses',
+	'BOARD_HIDE_EMAILS_EXPLAIN'		=> 'This function keeps e-mail addresses completely private.',
+	'CONTACT_EMAIL'					=> 'Contact e-mail address',
+	'CONTACT_EMAIL_EXPLAIN'			=> 'This address will be used whenever a specific contact point is needed, e.g. spam, error output, etc. It will always be used as the <samp>From</samp> and <samp>Reply-To</samp> address in e-mails.',
+	'EMAIL_FUNCTION_NAME'			=> 'E-mail function name',
+	'EMAIL_FUNCTION_NAME_EXPLAIN'	=> 'The e-mail function used to send mails through PHP.',
+	'EMAIL_PACKAGE_SIZE'			=> 'E-mail package size',
+	'EMAIL_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of maximum e-mails sent out in one package. This setting is applied to the internal message queue; set this value to 0 if you have problems with non-delivered notification e-mails.',
+	'EMAIL_SIG'						=> 'E-mail signature',
+	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all e-mails the board sends.',
+	'ENABLE_EMAIL'					=> 'Enable board-wide e-mails',
+	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no e-mails will be sent by the board at all. <em>Note the user and admin account activation settings require this setting to be enabled. If currently using “user” or “admin” activation in the activation settings, disabling this setting will require no activation of new accounts.</em>',
+	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
+	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
+	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',
+	'SMTP_DIGEST_MD5'				=> 'DIGEST-MD5',
+	'SMTP_LOGIN'					=> 'LOGIN',
+	'SMTP_PASSWORD'					=> 'SMTP password',
+	'SMTP_PASSWORD_EXPLAIN'			=> 'Only enter a password if your SMTP server requires it.',
+	'SMTP_PLAIN'					=> 'PLAIN',
+	'SMTP_POP_BEFORE_SMTP'			=> 'POP-BEFORE-SMTP',
+	'SMTP_PORT'						=> 'SMTP server port',
+	'SMTP_PORT_EXPLAIN'				=> 'Only change this if you know your SMTP server is on a different port.',
+	'SMTP_SERVER'					=> 'SMTP server address',
+	'SMTP_SETTINGS'					=> 'SMTP settings',
+	'SMTP_USERNAME'					=> 'SMTP username',
+	'SMTP_USERNAME_EXPLAIN'			=> 'Only enter a username if your SMTP server requires it.',
+	'USE_SMTP'						=> 'Use SMTP server for e-mail',
+	'USE_SMTP_EXPLAIN'				=> 'Select “Yes” if you want or have to send e-mail via a named server instead of the local mail function.',
+));
+
+// Jabber settings
+$lang = array_merge($lang, array(
+	'ACP_JABBER_SETTINGS_EXPLAIN'	=> 'Here you can enable and control the use of Jabber for instant messaging and board notifications. Jabber is an open source protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Please be sure to enter already registered account details - phpBB will use the details you enter here as is.',
+
+	'JAB_ENABLE'				=> 'Enable Jabber',
+	'JAB_ENABLE_EXPLAIN'		=> 'Enables use of Jabber messaging and notifications.',
+	'JAB_GTALK_NOTE'			=> 'Please note that GTalk will not work because the <samp>dns_get_record</samp> function could not be found. This function is not available in PHP4, and is not implemented on Windows platforms. It currently does not work on BSD-based systems, including Mac OS.',
+	'JAB_PACKAGE_SIZE'			=> 'Jabber package size',
+	'JAB_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.',
+	'JAB_PASSWORD'				=> 'Jabber password',
+	'JAB_PORT'					=> 'Jabber port',
+	'JAB_PORT_EXPLAIN'			=> 'Leave blank unless you know it is not port 5222.',
+	'JAB_SERVER'				=> 'Jabber server',
+	'JAB_SERVER_EXPLAIN'		=> 'See %sjabber.org%s for a list of servers.',
+	'JAB_SETTINGS_CHANGED'		=> 'Jabber settings changed successfully.',
+	'JAB_USE_SSL'				=> 'Use SSL to connect',
+	'JAB_USE_SSL_EXPLAIN'		=> 'If enabled a secure connection is tried to be established. The Jabber port will be modified to 5223 if port 5222 is specified.',
+	'JAB_USERNAME'				=> 'Jabber username or JID',
+	'JAB_USERNAME_EXPLAIN'		=> 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php
new file mode 100644
index 0000000000..3b63f2ea2e
--- /dev/null
+++ b/phpBB/language/en/acp/bots.php
@@ -0,0 +1,73 @@
+<?php
+/**
+*
+* acp_bots [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+// Bot settings
+$lang = array_merge($lang, array(
+	'BOTS'				=> 'Manage bots',
+	'BOTS_EXPLAIN'		=> '“Bots”, “spiders” or “crawlers” are automated agents most commonly used by search engines to update their databases. Since they rarely make proper use of sessions they can distort visitor counts, increase load and sometimes fail to index sites correctly. Here you can define a special type of user to overcome these problems.',
+	'BOT_ACTIVATE'		=> 'Activate',
+	'BOT_ACTIVE'		=> 'Bot active',
+	'BOT_ADD'			=> 'Add bot',
+	'BOT_ADDED'			=> 'New bot successfully added.',
+	'BOT_AGENT'			=> 'Agent match',
+	'BOT_AGENT_EXPLAIN'	=> 'A string matching the bots browser agent, partial matches are allowed.',
+	'BOT_DEACTIVATE'	=> 'Deactivate',
+	'BOT_DELETED'		=> 'Bot deleted successfully.',
+	'BOT_EDIT'			=> 'Edit bots',
+	'BOT_EDIT_EXPLAIN'	=> 'Here you can add or edit an existing bot entry. You may define an agent string and/or one or more IP addresses (or range of addresses) to match. Be careful when defining matching agent strings or addresses. You may also specify a style and language that the bot will view the board using. This may allow you to reduce bandwidth use by setting a simple style for bots. Remember to set appropriate permissions for the special Bot usergroup.',
+	'BOT_LANG'			=> 'Bot language',
+	'BOT_LANG_EXPLAIN'	=> 'The language presented to the bot as it browses.',
+	'BOT_LAST_VISIT'	=> 'Last visit',
+	'BOT_IP'			=> 'Bot IP address',
+	'BOT_IP_EXPLAIN'	=> 'Partial matches are allowed, separate addresses with a comma.',
+	'BOT_NAME'			=> 'Bot name',
+	'BOT_NAME_EXPLAIN'	=> 'Used only for your own information.',
+	'BOT_NAME_TAKEN'	=> 'The name is already in use on your board and can’t be used for the Bot.',
+	'BOT_NEVER'			=> 'Never',
+	'BOT_STYLE'			=> 'Bot style',
+	'BOT_STYLE_EXPLAIN'	=> 'The style used for the board by the bot.',
+	'BOT_UPDATED'		=> 'Existing bot updated successfully.',
+
+	'ERR_BOT_AGENT_MATCHES_UA'	=> 'The bot agent you supplied is similar to the one you are currently using. Please adjust the agent for this bot.',
+	'ERR_BOT_NO_IP'				=> 'The IP addresses you supplied were invalid or the hostname could not be resolved.',
+	'ERR_BOT_NO_MATCHES'		=> 'You must supply at least one of an agent or IP for this bot match.',
+
+	'NO_BOT'		=> 'Found no bot with the specified ID.',
+	'NO_BOT_GROUP'	=> 'Unable to find special bot group.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
new file mode 100644
index 0000000000..94188f4b1b
--- /dev/null
+++ b/phpBB/language/en/acp/common.php
@@ -0,0 +1,741 @@
+<?php
+/**
+*
+* acp_common [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+// Common
+$lang = array_merge($lang, array(
+	'ACP_ADMINISTRATORS'		=> 'Administrators',
+	'ACP_ADMIN_LOGS'			=> 'Admin log',
+	'ACP_ADMIN_ROLES'			=> 'Admin roles',
+	'ACP_ATTACHMENTS'			=> 'Attachments',
+	'ACP_ATTACHMENT_SETTINGS'	=> 'Attachment settings',
+	'ACP_AUTH_SETTINGS'			=> 'Authentication',
+	'ACP_AUTOMATION'			=> 'Automation',
+	'ACP_AVATAR_SETTINGS'		=> 'Avatar settings',
+
+	'ACP_BACKUP'				=> 'Backup',
+	'ACP_BAN'					=> 'Banning',
+	'ACP_BAN_EMAILS'			=> 'Ban e-mails',
+	'ACP_BAN_IPS'				=> 'Ban IPs',
+	'ACP_BAN_USERNAMES'			=> 'Ban usernames',
+	'ACP_BBCODES'				=> 'BBCodes',
+	'ACP_BOARD_CONFIGURATION'	=> 'Board configuration',
+	'ACP_BOARD_FEATURES'		=> 'Board features',
+	'ACP_BOARD_MANAGEMENT'		=> 'Board management',
+	'ACP_BOARD_SETTINGS'		=> 'Board settings',
+	'ACP_BOTS'					=> 'Spiders/Robots',
+
+	'ACP_CAPTCHA'				=> 'CAPTCHA',
+
+	'ACP_CAT_DATABASE'			=> 'Database',
+	'ACP_CAT_DOT_MODS'			=> '.MODs',
+	'ACP_CAT_FORUMS'			=> 'Forums',
+	'ACP_CAT_GENERAL'			=> 'General',
+	'ACP_CAT_MAINTENANCE'		=> 'Maintenance',
+	'ACP_CAT_PERMISSIONS'		=> 'Permissions',
+	'ACP_CAT_POSTING'			=> 'Posting',
+	'ACP_CAT_STYLES'			=> 'Styles',
+	'ACP_CAT_SYSTEM'			=> 'System',
+	'ACP_CAT_USERGROUP'			=> 'Users and Groups',
+	'ACP_CAT_USERS'				=> 'Users',
+	'ACP_CLIENT_COMMUNICATION'	=> 'Client communication',
+	'ACP_COOKIE_SETTINGS'		=> 'Cookie settings',
+	'ACP_CRITICAL_LOGS'			=> 'Error log',
+	'ACP_CUSTOM_PROFILE_FIELDS'	=> 'Custom profile fields',
+
+	'ACP_DATABASE'				=> 'Database management',
+	'ACP_DISALLOW'				=> 'Disallow',
+	'ACP_DISALLOW_USERNAMES'	=> 'Disallow usernames',
+
+	'ACP_EMAIL_SETTINGS'		=> 'E-mail settings',
+	'ACP_EXTENSION_GROUPS'		=> 'Manage extension groups',
+
+	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
+	'ACP_FORUM_LOGS'				=> 'Forum logs',
+	'ACP_FORUM_MANAGEMENT'			=> 'Forum management',
+	'ACP_FORUM_MODERATORS'			=> 'Forum moderators',
+	'ACP_FORUM_PERMISSIONS'			=> 'Forum permissions',
+	'ACP_FORUM_PERMISSIONS_COPY'	=> 'Copy forum permissions',
+	'ACP_FORUM_ROLES'				=> 'Forum roles',
+
+	'ACP_GENERAL_CONFIGURATION'		=> 'General configuration',
+	'ACP_GENERAL_TASKS'				=> 'General tasks',
+	'ACP_GLOBAL_MODERATORS'			=> 'Global moderators',
+	'ACP_GLOBAL_PERMISSIONS'		=> 'Global permissions',
+	'ACP_GROUPS'					=> 'Groups',
+	'ACP_GROUPS_FORUM_PERMISSIONS'	=> 'Groups’ forum permissions',
+	'ACP_GROUPS_MANAGE'				=> 'Manage groups',
+	'ACP_GROUPS_MANAGEMENT'			=> 'Group management',
+	'ACP_GROUPS_PERMISSIONS'		=> 'Groups’ permissions',
+
+	'ACP_ICONS'					=> 'Topic icons',
+	'ACP_ICONS_SMILIES'			=> 'Topic icons/smilies',
+	'ACP_IMAGESETS'				=> 'Imagesets',
+	'ACP_INACTIVE_USERS'		=> 'Inactive users',
+	'ACP_INDEX'					=> 'ACP 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'					=> 'ACP index',
+	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions',
+	'ACP_MANAGE_FORUMS'			=> 'Manage forums',
+	'ACP_MANAGE_RANKS'			=> 'Manage ranks',
+	'ACP_MANAGE_REASONS'		=> 'Manage report/denial reasons',
+	'ACP_MANAGE_USERS'			=> 'Manage users',
+	'ACP_MASS_EMAIL'			=> 'Mass e-mail',
+	'ACP_MESSAGES'				=> 'Messages',
+	'ACP_MESSAGE_SETTINGS'		=> 'Private message settings',
+	'ACP_MODULE_MANAGEMENT'		=> 'Module management',
+	'ACP_MOD_LOGS'				=> 'Moderator log',
+	'ACP_MOD_ROLES'				=> 'Moderator roles',
+
+	'ACP_NO_ITEMS'				=> 'There are no items yet.',
+
+	'ACP_ORPHAN_ATTACHMENTS'	=> 'Orphaned attachments',
+
+	'ACP_PERMISSIONS'			=> 'Permissions',
+	'ACP_PERMISSION_MASKS'		=> 'Permission masks',
+	'ACP_PERMISSION_ROLES'		=> 'Permission roles',
+	'ACP_PERMISSION_TRACE'		=> 'Permission trace',
+	'ACP_PHP_INFO'				=> 'PHP information',
+	'ACP_POST_SETTINGS'			=> 'Post settings',
+	'ACP_PRUNE_FORUMS'			=> 'Prune forums',
+	'ACP_PRUNE_USERS'			=> 'Prune users',
+	'ACP_PRUNING'				=> 'Pruning',
+
+	'ACP_QUICK_ACCESS'			=> 'Quick access',
+
+	'ACP_RANKS'					=> 'Ranks',
+	'ACP_REASONS'				=> 'Report/denial reasons',
+	'ACP_REGISTER_SETTINGS'		=> 'User registration settings',
+
+	'ACP_RESTORE'				=> 'Restore',
+
+	'ACP_FEED'					=> 'Feed management',
+	'ACP_FEED_SETTINGS'			=> 'Feed settings',
+
+	'ACP_SEARCH'				=> 'Search configuration',
+	'ACP_SEARCH_INDEX'			=> 'Search index',
+	'ACP_SEARCH_SETTINGS'		=> 'Search settings',
+
+	'ACP_SECURITY_SETTINGS'		=> 'Security settings',
+	'ACP_SEND_STATISTICS'		=> 'Send statistical information',
+	'ACP_SERVER_CONFIGURATION'	=> 'Server configuration',
+	'ACP_SERVER_SETTINGS'		=> 'Server settings',
+	'ACP_SIGNATURE_SETTINGS'	=> 'Signature settings',
+	'ACP_SMILIES'				=> 'Smilies',
+	'ACP_STYLE_COMPONENTS'		=> 'Style components',
+	'ACP_STYLE_MANAGEMENT'		=> 'Style management',
+	'ACP_STYLES'				=> 'Styles',
+
+	'ACP_SUBMIT_CHANGES'		=> 'Submit changes',
+
+	'ACP_TEMPLATES'				=> 'Templates',
+	'ACP_THEMES'				=> 'Themes',
+
+	'ACP_UPDATE'					=> 'Updating',
+	'ACP_USERS_FORUM_PERMISSIONS'	=> 'Users’ forum permissions',
+	'ACP_USERS_LOGS'				=> 'User logs',
+	'ACP_USERS_PERMISSIONS'			=> 'Users’ permissions',
+	'ACP_USER_ATTACH'				=> 'Attachments',
+	'ACP_USER_AVATAR'				=> 'Avatar',
+	'ACP_USER_FEEDBACK'				=> 'Feedback',
+	'ACP_USER_GROUPS'				=> 'Groups',
+	'ACP_USER_MANAGEMENT'			=> 'User management',
+	'ACP_USER_OVERVIEW'				=> 'Overview',
+	'ACP_USER_PERM'					=> 'Permissions',
+	'ACP_USER_PREFS'				=> 'Preferences',
+	'ACP_USER_PROFILE'				=> 'Profile',
+	'ACP_USER_RANK'					=> 'Rank',
+	'ACP_USER_ROLES'				=> 'User roles',
+	'ACP_USER_SECURITY'				=> 'User security',
+	'ACP_USER_SIG'					=> 'Signature',
+	'ACP_USER_WARNINGS'				=> 'Warnings',
+
+	'ACP_VC_SETTINGS'					=> 'CAPTCHA module settings',
+	'ACP_VC_CAPTCHA_DISPLAY'			=> 'CAPTCHA image preview',
+	'ACP_VERSION_CHECK'					=> 'Check for updates',
+	'ACP_VIEW_ADMIN_PERMISSIONS'		=> 'View administrative permissions',
+	'ACP_VIEW_FORUM_MOD_PERMISSIONS'	=> 'View forum moderation permissions',
+	'ACP_VIEW_FORUM_PERMISSIONS'		=> 'View forum-based permissions',
+	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS'	=> 'View global moderation permissions',
+	'ACP_VIEW_USER_PERMISSIONS'			=> 'View user-based permissions',
+
+	'ACP_WORDS'					=> 'Word censoring',
+
+	'ACTION'				=> 'Action',
+	'ACTIONS'				=> 'Actions',
+	'ACTIVATE'				=> 'Activate',
+	'ADD'					=> 'Add',
+	'ADMIN'					=> 'Administration',
+	'ADMIN_INDEX'			=> 'Admin index',
+	'ADMIN_PANEL'			=> 'Administration Control Panel',
+
+	'ADM_LOGOUT'			=> 'ACP&nbsp;Logout',
+	'ADM_LOGGED_OUT'		=> 'Successfully logged out from Administration Control Panel',
+
+	'BACK'					=> 'Back',
+
+	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
+	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
+
+	'DEACTIVATE'				=> 'Deactivate',
+	'DIRECTORY_DOES_NOT_EXIST'	=> 'The entered path “%s” does not exist.',
+	'DIRECTORY_NOT_DIR'			=> 'The entered path “%s” is not a directory.',
+	'DIRECTORY_NOT_WRITABLE'	=> 'The entered path “%s” is not writable.',
+	'DISABLE'					=> 'Disable',
+	'DOWNLOAD'					=> 'Download',
+	'DOWNLOAD_AS'				=> 'Download as',
+	'DOWNLOAD_STORE'			=> 'Download or store file',
+	'DOWNLOAD_STORE_EXPLAIN'	=> 'You may directly download the file or save it in your <samp>store/</samp> folder.',
+
+	'EDIT'					=> 'Edit',
+	'ENABLE'				=> 'Enable',
+	'EXPORT_DOWNLOAD'		=> 'Download',
+	'EXPORT_STORE'			=> 'Store',
+
+	'GENERAL_OPTIONS'		=> 'General options',
+	'GENERAL_SETTINGS'		=> 'General settings',
+	'GLOBAL_MASK'			=> 'Global permission mask',
+
+	'INSTALL'				=> 'Install',
+	'IP'					=> 'User IP',
+	'IP_HOSTNAME'			=> 'IP addresses or hostnames',
+
+	'LOGGED_IN_AS'			=> 'You are logged in as:',
+	'LOGIN_ADMIN'			=> 'To administer the board you must be an authenticated user.',
+	'LOGIN_ADMIN_CONFIRM'	=> 'To administer the board you must re-authenticate yourself.',
+	'LOGIN_ADMIN_SUCCESS'	=> 'You have successfully authenticated and will now be redirected to the Administration Control Panel.',
+	'LOOK_UP_FORUM'			=> 'Select a forum',
+	'LOOK_UP_FORUMS_EXPLAIN'=> 'You are able to select more than one forum.',
+
+	'MANAGE'				=> 'Manage',
+	'MENU_TOGGLE'			=> 'Hide or display the side menu',
+	'MORE'					=> 'More',			// Not used at the moment
+	'MORE_INFORMATION'		=> 'More information »',
+	'MOVE_DOWN'				=> 'Move down',
+	'MOVE_UP'				=> 'Move up',
+
+	'NOTIFY'				=> 'Notification',
+	'NO_ADMIN'				=> 'You are not authorised to administrate this board.',
+	'NO_EMAILS_DEFINED'		=> 'No valid e-mail addresses found.',
+	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',
+
+	'OFF'					=> 'Off',
+	'ON'					=> 'On',
+
+	'PARSE_BBCODE'						=> 'Parse BBCode',
+	'PARSE_SMILIES'						=> 'Parse smilies',
+	'PARSE_URLS'						=> 'Parse links',
+	'PERMISSIONS_TRANSFERRED'			=> 'Permissions transferred',
+	'PERMISSIONS_TRANSFERRED_EXPLAIN'	=> 'You currently have the permissions from %1$s. You are able to browse the board with this user’s permissions, but not access the administration control panel since admin permissions were not transferred. You can <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.',
+	'PIXEL'								=> 'px',
+	'PROCEED_TO_ACP'					=> '%sProceed to the ACP%s',
+
+	'REMIND'							=> 'Remind',
+	'RESYNC'							=> 'Resynchronise',
+	'RETURN_TO'							=> 'Return to…',
+
+	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
+	'SELECT_OPTION'			=> 'Select option',
+
+	'SETTING_TOO_LOW'		=> 'The provided value for the setting “%1$s” is too low. The minimum acceptable value is %2$d.',
+	'SETTING_TOO_BIG'		=> 'The provided value for the setting “%1$s” is too high. The maximum acceptable value is %2$d.',
+	'SETTING_TOO_LONG'		=> 'The provided value for the setting “%1$s” is too long. The maximum acceptable length is %2$d.',
+	'SETTING_TOO_SHORT'		=> 'The provided value for the setting “%1$s” is too short. The minimum acceptable length is %2$d.',
+
+	'SHOW_ALL_OPERATIONS'	=> 'Show all operations',
+
+	'UCP'					=> 'User Control Panel',
+	'USERNAMES_EXPLAIN'		=> 'Place each username on a separate line.',
+	'USER_CONTROL_PANEL'	=> 'User Control Panel',
+
+	'WARNING'				=> 'Warning',
+));
+
+// PHP info
+$lang = array_merge($lang, array(
+	'ACP_PHP_INFO_EXPLAIN'	=> 'This page lists information on the version of PHP installed on this server. It includes details of loaded modules, available variables and default settings. This information may be useful when diagnosing problems. Please be aware that some hosting companies will limit what information is displayed here for security reasons. You are advised to not give out any details on this page except when asked by <a href="http://www.phpbb.com/about/team/">official team members</a> on the support forums.',
+
+	'NO_PHPINFO_AVAILABLE'	=> 'Information about your PHP configuration is unable to be determined. Phpinfo() has been disabled for security reasons.',
+));
+
+// Logs
+$lang = array_merge($lang, array(
+	'ACP_ADMIN_LOGS_EXPLAIN'	=> 'This lists all the actions carried out by board administrators. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
+	'ACP_CRITICAL_LOGS_EXPLAIN'	=> 'This lists the actions carried out by the board itself. This log provides you with information you are able to use for solving specific problems, for example non-delivery of e-mails. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
+	'ACP_MOD_LOGS_EXPLAIN'		=> 'This lists all actions done on forums, topics and posts as well as actions carried out on users by moderators, including banning. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
+	'ACP_USERS_LOGS_EXPLAIN'	=> 'This lists all actions carried out by users or on users (reports, warnings and user notes).',
+	'ALL_ENTRIES'				=> 'All entries',
+
+	'DISPLAY_LOG'	=> 'Display entries from previous',
+
+	'NO_ENTRIES'	=> 'No log entries for this period.',
+
+	'SORT_IP'		=> 'IP address',
+	'SORT_DATE'		=> 'Date',
+	'SORT_ACTION'	=> 'Log action',
+));
+
+// Index page
+$lang = array_merge($lang, array(
+	'ADMIN_INTRO'				=> 'Thank you for choosing phpBB as your board solution. This screen will give you a quick overview of all the various statistics of your board. The links on the left hand side of this screen allow you to control every aspect of your board experience. Each page will have instructions on how to use the tools.',
+	'ADMIN_LOG'					=> 'Logged administrator actions',
+	'ADMIN_LOG_INDEX_EXPLAIN'	=> 'This gives an overview of the last five actions carried out by board administrators. A full copy of the log can be viewed from the appropriate menu item or following the link below.',
+	'AVATAR_DIR_SIZE'			=> 'Avatar directory size',
+
+	'BOARD_STARTED'		=> 'Board started',
+	'BOARD_VERSION'		=> 'Board version',
+
+	'DATABASE_SERVER_INFO'	=> 'Database server',
+	'DATABASE_SIZE'			=> 'Database size',
+
+	'FILES_PER_DAY'		=> 'Attachments per day',
+	'FORUM_STATS'		=> 'Board statistics',
+
+	'GZIP_COMPRESSION'	=> 'GZip compression',
+
+	'NOT_AVAILABLE'		=> 'Not available',
+	'NUMBER_FILES'		=> 'Number of attachments',
+	'NUMBER_POSTS'		=> 'Number of posts',
+	'NUMBER_TOPICS'		=> 'Number of topics',
+	'NUMBER_USERS'		=> 'Number of users',
+	'NUMBER_ORPHAN'		=> 'Orphan attachments',
+
+	'POSTS_PER_DAY'		=> 'Posts per day',
+
+	'PURGE_CACHE'			=> 'Purge the cache',
+	'PURGE_CACHE_CONFIRM'	=> 'Are you sure you wish to purge the cache?',
+	'PURGE_CACHE_EXPLAIN'	=> 'Purge all cache related items, this includes any cached template files or queries.',
+
+	'PURGE_SESSIONS'			=> 'Purge all sessions',
+	'PURGE_SESSIONS_CONFIRM'	=> 'Are you sure you wish to purge all sessions? This will log out all users.',
+	'PURGE_SESSIONS_EXPLAIN'	=> 'Purge all sessions. This will log out all users by truncating the session table.',
+
+	'RESET_DATE'					=> 'Reset board’s start date',
+	'RESET_DATE_CONFIRM'			=> 'Are you sure you wish to reset the board’s start date?',
+	'RESET_ONLINE'					=> 'Reset most users ever online',
+	'RESET_ONLINE_CONFIRM'			=> 'Are you sure you wish to reset the most users ever online counter?',
+	'RESYNC_POSTCOUNTS'				=> 'Resynchronise post counts',
+	'RESYNC_POSTCOUNTS_EXPLAIN'		=> 'Only existing posts will be taken into consideration. Pruned posts will not be counted.',
+	'RESYNC_POSTCOUNTS_CONFIRM'		=> 'Are you sure you wish to resynchronise post counts?',
+	'RESYNC_POST_MARKING'			=> 'Resynchronise dotted topics',
+	'RESYNC_POST_MARKING_CONFIRM'	=> 'Are you sure you wish to resynchronise dotted topics?',
+	'RESYNC_POST_MARKING_EXPLAIN'	=> 'First unmarks all topics and then correctly marks topics that have seen any activity during the past six months.',
+	'RESYNC_STATS'					=> 'Resynchronise statistics',
+	'RESYNC_STATS_CONFIRM'			=> 'Are you sure you wish to resynchronise statistics?',
+	'RESYNC_STATS_EXPLAIN'			=> 'Recalculates the total number of posts, topics, users and files.',
+	'RUN'							=> 'Run now',
+
+	'STATISTIC'					=> 'Statistic',
+	'STATISTIC_RESYNC_OPTIONS'	=> 'Resynchronise or reset statistics',
+
+	'TOPICS_PER_DAY'	=> 'Topics per day',
+
+	'UPLOAD_DIR_SIZE'	=> 'Size of posted attachments',
+	'USERS_PER_DAY'		=> 'Users per day',
+
+	'VALUE'						=> 'Value',
+	'VERSIONCHECK_FAIL'			=> 'Failed to obtain latest version information.',
+	'VERSIONCHECK_FORCE_UPDATE'	=> 'Re-Check version',
+	'VIEW_ADMIN_LOG'			=> 'View administrator log',
+	'VIEW_INACTIVE_USERS'		=> 'View inactive users',
+
+	'WELCOME_PHPBB'			=> 'Welcome to phpBB',
+	'WRITABLE_CONFIG'		=> 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
+));
+
+// Inactive Users
+$lang = array_merge($lang, array(
+	'INACTIVE_DATE'					=> 'Inactive date',
+	'INACTIVE_REASON'				=> 'Reason',
+	'INACTIVE_REASON_MANUAL'		=> 'Account deactivated by administrator',
+	'INACTIVE_REASON_PROFILE'		=> 'Profile details changed',
+	'INACTIVE_REASON_REGISTER'		=> 'Newly registered account',
+	'INACTIVE_REASON_REMIND'		=> 'Forced user account reactivation',
+	'INACTIVE_REASON_UNKNOWN'		=> 'Unknown',
+	'INACTIVE_USERS'				=> 'Inactive users',
+	'INACTIVE_USERS_EXPLAIN'		=> 'This is a list of users who have registered but whose accounts are inactive. You can activate, delete or remind (by sending an e-mail) these users if you wish.',
+	'INACTIVE_USERS_EXPLAIN_INDEX'	=> 'This is a list of the last 10 registered users who have inactive accounts. A full list is available from the appropriate menu item or by following the link below from where you can activate, delete or remind (by sending an e-mail) these users if you wish.',
+
+	'NO_INACTIVE_USERS'	=> 'No inactive users',
+
+	'SORT_INACTIVE'		=> 'Inactive date',
+	'SORT_LAST_VISIT'	=> 'Last visit',
+	'SORT_REASON'		=> 'Reason',
+	'SORT_REG_DATE'		=> 'Registration date',
+	'SORT_LAST_REMINDER'=> 'Last reminded',
+	'SORT_REMINDER'		=> 'Reminder sent',
+
+	'USER_IS_INACTIVE'		=> 'User is inactive',
+));
+
+// Send statistics page
+$lang = array_merge($lang, array(
+	'EXPLAIN_SEND_STATISTICS'	=> 'Please send information about your server and board configurations to phpBB for statistical analysis. All information that could identify you or your website has been removed - the data is entirely <strong>anonymous</strong>. We base decisions about future phpBB versions on this information. The statistics are made available publically. We also share this data with the PHP project, the programming language phpBB is made with.',
+	'EXPLAIN_SHOW_STATISTICS'	=> 'Using the button below you can preview all variables that will be transmitted.',
+	'DONT_SEND_STATISTICS'		=> 'Return to the ACP if you do not wish to send statistical information to phpBB.',
+	'GO_ACP_MAIN'				=> 'Go to the ACP start page',
+	'HIDE_STATISTICS'			=> 'Hide details',
+	'SEND_STATISTICS'			=> 'Send statistical information',
+	'SHOW_STATISTICS'			=> 'Show details',
+	'THANKS_SEND_STATISTICS'	=> 'Thank you for submitting your information.',
+));
+
+// Log Entries
+$lang = array_merge($lang, array(
+	'LOG_ACL_ADD_USER_GLOBAL_U_'		=> '<strong>Added or edited users’ user permissions</strong><br />» %s',
+	'LOG_ACL_ADD_GROUP_GLOBAL_U_'		=> '<strong>Added or edited groups’ user permissions</strong><br />» %s',
+	'LOG_ACL_ADD_USER_GLOBAL_M_'		=> '<strong>Added or edited users’ global moderator permissions</strong><br />» %s',
+	'LOG_ACL_ADD_GROUP_GLOBAL_M_'		=> '<strong>Added or edited groups’ global moderator permissions</strong><br />» %s',
+	'LOG_ACL_ADD_USER_GLOBAL_A_'		=> '<strong>Added or edited users’ administrator permissions</strong><br />» %s',
+	'LOG_ACL_ADD_GROUP_GLOBAL_A_'		=> '<strong>Added or edited groups’ administrator permissions</strong><br />» %s',
+
+	'LOG_ACL_ADD_ADMIN_GLOBAL_A_'		=> '<strong>Added or edited Administrators</strong><br />» %s',
+	'LOG_ACL_ADD_MOD_GLOBAL_M_'			=> '<strong>Added or edited Global Moderators</strong><br />» %s',
+
+	'LOG_ACL_ADD_USER_LOCAL_F_'			=> '<strong>Added or edited users’ forum access</strong> from %1$s<br />» %2$s',
+	'LOG_ACL_ADD_USER_LOCAL_M_'			=> '<strong>Added or edited users’ forum moderator access</strong> from %1$s<br />» %2$s',
+	'LOG_ACL_ADD_GROUP_LOCAL_F_'		=> '<strong>Added or edited groups’ forum access</strong> from %1$s<br />» %2$s',
+	'LOG_ACL_ADD_GROUP_LOCAL_M_'		=> '<strong>Added or edited groups’ forum moderator access</strong> from %1$s<br />» %2$s',
+
+	'LOG_ACL_ADD_MOD_LOCAL_M_'			=> '<strong>Added or edited Moderators</strong> from %1$s<br />» %2$s',
+	'LOG_ACL_ADD_FORUM_LOCAL_F_'		=> '<strong>Added or edited forum permissions</strong> from %1$s<br />» %2$s',
+
+	'LOG_ACL_DEL_ADMIN_GLOBAL_A_'		=> '<strong>Removed Administrators</strong><br />» %s',
+	'LOG_ACL_DEL_MOD_GLOBAL_M_'			=> '<strong>Removed Global Moderators</strong><br />» %s',
+	'LOG_ACL_DEL_MOD_LOCAL_M_'			=> '<strong>Removed Moderators</strong> from %1$s<br />» %2$s',
+	'LOG_ACL_DEL_FORUM_LOCAL_F_'		=> '<strong>Removed User/Group forum permissions</strong> from %1$s<br />» %2$s',
+
+	'LOG_ACL_TRANSFER_PERMISSIONS'		=> '<strong>Permissions transferred from</strong><br />» %s',
+	'LOG_ACL_RESTORE_PERMISSIONS'		=> '<strong>Own permissions restored after using permissions from</strong><br />» %s',
+
+	'LOG_ADMIN_AUTH_FAIL'		=> '<strong>Failed administration login attempt</strong>',
+	'LOG_ADMIN_AUTH_SUCCESS'	=> '<strong>Successful administration login</strong>',
+
+	'LOG_ATTACHMENTS_DELETED'	=> '<strong>Removed user attachments</strong><br />» %s',
+
+	'LOG_ATTACH_EXT_ADD'		=> '<strong>Added or edited attachment extension</strong><br />» %s',
+	'LOG_ATTACH_EXT_DEL'		=> '<strong>Removed attachment extension</strong><br />» %s',
+	'LOG_ATTACH_EXT_UPDATE'		=> '<strong>Updated attachment extension</strong><br />» %s',
+	'LOG_ATTACH_EXTGROUP_ADD'	=> '<strong>Added extension group</strong><br />» %s',
+	'LOG_ATTACH_EXTGROUP_EDIT'	=> '<strong>Edited extension group</strong><br />» %s',
+	'LOG_ATTACH_EXTGROUP_DEL'	=> '<strong>Removed extension group</strong><br />» %s',
+	'LOG_ATTACH_FILEUPLOAD'		=> '<strong>Orphan File uploaded to Post</strong><br />» ID %1$d - %2$s',
+	'LOG_ATTACH_ORPHAN_DEL'		=> '<strong>Orphan Files deleted</strong><br />» %s',
+
+	'LOG_BAN_EXCLUDE_USER'	=> '<strong>Excluded user from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
+	'LOG_BAN_EXCLUDE_IP'	=> '<strong>Excluded IP from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
+	'LOG_BAN_EXCLUDE_EMAIL' => '<strong>Excluded e-mail from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
+	'LOG_BAN_USER'			=> '<strong>Banned user</strong> for reason “<em>%1$s</em>”<br />» %2$s',
+	'LOG_BAN_IP'			=> '<strong>Banned IP</strong> for reason “<em>%1$s</em>”<br />» %2$s',
+	'LOG_BAN_EMAIL'			=> '<strong>Banned e-mail</strong> for reason “<em>%1$s</em>”<br />» %2$s',
+	'LOG_UNBAN_USER'		=> '<strong>Unbanned user</strong><br />» %s',
+	'LOG_UNBAN_IP'			=> '<strong>Unbanned IP</strong><br />» %s',
+	'LOG_UNBAN_EMAIL'		=> '<strong>Unbanned e-mail</strong><br />» %s',
+
+	'LOG_BBCODE_ADD'		=> '<strong>Added new BBCode</strong><br />» %s',
+	'LOG_BBCODE_EDIT'		=> '<strong>Edited BBCode</strong><br />» %s',
+	'LOG_BBCODE_DELETE'		=> '<strong>Deleted BBCode</strong><br />» %s',
+
+	'LOG_BOT_ADDED'		=> '<strong>New bot added</strong><br />» %s',
+	'LOG_BOT_DELETE'	=> '<strong>Deleted bot</strong><br />» %s',
+	'LOG_BOT_UPDATED'	=> '<strong>Existing bot updated</strong><br />» %s',
+
+	'LOG_CLEAR_ADMIN'		=> '<strong>Cleared admin log</strong>',
+	'LOG_CLEAR_CRITICAL'	=> '<strong>Cleared error log</strong>',
+	'LOG_CLEAR_MOD'			=> '<strong>Cleared moderator log</strong>',
+	'LOG_CLEAR_USER'		=> '<strong>Cleared user log</strong><br />» %s',
+	'LOG_CLEAR_USERS'		=> '<strong>Cleared user logs</strong>',
+
+	'LOG_CONFIG_ATTACH'			=> '<strong>Altered attachment settings</strong>',
+	'LOG_CONFIG_AUTH'			=> '<strong>Altered authentication settings</strong>',
+	'LOG_CONFIG_AVATAR'			=> '<strong>Altered avatar settings</strong>',
+	'LOG_CONFIG_COOKIE'			=> '<strong>Altered cookie settings</strong>',
+	'LOG_CONFIG_EMAIL'			=> '<strong>Altered e-mail settings</strong>',
+	'LOG_CONFIG_FEATURES'		=> '<strong>Altered board features</strong>',
+	'LOG_CONFIG_LOAD'			=> '<strong>Altered load settings</strong>',
+	'LOG_CONFIG_MESSAGE'		=> '<strong>Altered private message settings</strong>',
+	'LOG_CONFIG_POST'			=> '<strong>Altered post settings</strong>',
+	'LOG_CONFIG_REGISTRATION'	=> '<strong>Altered user registration settings</strong>',
+	'LOG_CONFIG_FEED'			=> '<strong>Altered syndication feeds settings</strong>',
+	'LOG_CONFIG_SEARCH'			=> '<strong>Altered search settings</strong>',
+	'LOG_CONFIG_SECURITY'		=> '<strong>Altered security settings</strong>',
+	'LOG_CONFIG_SERVER'			=> '<strong>Altered server settings</strong>',
+	'LOG_CONFIG_SETTINGS'		=> '<strong>Altered board settings</strong>',
+	'LOG_CONFIG_SIGNATURE'		=> '<strong>Altered signature settings</strong>',
+	'LOG_CONFIG_VISUAL'			=> '<strong>Altered antibot settings</strong>',
+
+	'LOG_APPROVE_TOPIC'			=> '<strong>Approved topic</strong><br />» %s',
+	'LOG_BUMP_TOPIC'			=> '<strong>User bumped topic</strong><br />» %s',
+	'LOG_DELETE_POST'			=> '<strong>Deleted post “%1$s” written by</strong><br />» %2$s',
+	'LOG_DELETE_SHADOW_TOPIC'	=> '<strong>Deleted shadow topic</strong><br />» %s',
+	'LOG_DELETE_TOPIC'			=> '<strong>Deleted topic “%1$s” written by</strong><br />» %2$s',
+	'LOG_FORK'					=> '<strong>Copied topic</strong><br />» from %s',
+	'LOG_LOCK'					=> '<strong>Locked topic</strong><br />» %s',
+	'LOG_LOCK_POST'				=> '<strong>Locked post</strong><br />» %s',
+	'LOG_MERGE'					=> '<strong>Merged posts</strong> into topic<br />» %s',
+	'LOG_MOVE'					=> '<strong>Moved topic</strong><br />» from %1$s to %2$s',
+	'LOG_PM_REPORT_CLOSED'		=> '<strong>Closed PM report</strong><br />» %s',
+	'LOG_PM_REPORT_DELETED'		=> '<strong>Deleted PM report</strong><br />» %s',
+	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br />» %s',
+	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” with the following reason</strong><br />» %2$s',
+	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
+	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
+	'LOG_REPORT_DELETED'		=> '<strong>Deleted report</strong><br />» %s',
+	'LOG_SPLIT_DESTINATION'		=> '<strong>Moved split posts</strong><br />» to %s',
+	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br />» from %s',
+
+	'LOG_TOPIC_APPROVED'		=> '<strong>Approved topic</strong><br />» %s',
+	'LOG_TOPIC_DISAPPROVED'		=> '<strong>Disapproved topic “%1$s” with the following reason</strong><br />%2$s',
+	'LOG_TOPIC_RESYNC'			=> '<strong>Resynchronised topic counters</strong><br />» %s',
+	'LOG_TOPIC_TYPE_CHANGED'	=> '<strong>Changed topic type</strong><br />» %s',
+	'LOG_UNLOCK'				=> '<strong>Unlocked topic</strong><br />» %s',
+	'LOG_UNLOCK_POST'			=> '<strong>Unlocked post</strong><br />» %s',
+
+	'LOG_DISALLOW_ADD'		=> '<strong>Added disallowed username</strong><br />» %s',
+	'LOG_DISALLOW_DELETE'	=> '<strong>Deleted disallowed username</strong>',
+
+	'LOG_DB_BACKUP'			=> '<strong>Database backup</strong>',
+	'LOG_DB_DELETE'			=> '<strong>Deleted database backup</strong>',
+	'LOG_DB_RESTORE'		=> '<strong>Restored database backup</strong>',
+
+	'LOG_DOWNLOAD_EXCLUDE_IP'	=> '<strong>Excluded IP/hostname from download list</strong><br />» %s',
+	'LOG_DOWNLOAD_IP'			=> '<strong>Added IP/hostname to download list</strong><br />» %s',
+	'LOG_DOWNLOAD_REMOVE_IP'	=> '<strong>Removed IP/hostname from download list</strong><br />» %s',
+
+	'LOG_ERROR_JABBER'		=> '<strong>Jabber error</strong><br />» %s',
+	'LOG_ERROR_EMAIL'		=> '<strong>E-mail error</strong><br />» %s',
+
+	'LOG_FORUM_ADD'							=> '<strong>Created new forum</strong><br />» %s',
+	'LOG_FORUM_COPIED_PERMISSIONS'			=> '<strong>Copied forum permissions</strong> from %1$s<br />» %2$s',
+	'LOG_FORUM_DEL_FORUM'					=> '<strong>Deleted forum</strong><br />» %s',
+	'LOG_FORUM_DEL_FORUMS'					=> '<strong>Deleted forum and its subforums</strong><br />» %s',
+	'LOG_FORUM_DEL_MOVE_FORUMS'				=> '<strong>Deleted forum and moved subforums</strong> to %1$s<br />» %2$s',
+	'LOG_FORUM_DEL_MOVE_POSTS'				=> '<strong>Deleted forum and moved posts </strong> to %1$s<br />» %2$s',
+	'LOG_FORUM_DEL_MOVE_POSTS_FORUMS'		=> '<strong>Deleted forum and its subforums, moved posts</strong> to %1$s<br />» %2$s',
+	'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS'	=> '<strong>Deleted forum, moved posts</strong> to %1$s <strong>and subforums</strong> to %2$s<br />» %3$s',
+	'LOG_FORUM_DEL_POSTS'					=> '<strong>Deleted forum and its posts</strong><br />» %s',
+	'LOG_FORUM_DEL_POSTS_FORUMS'			=> '<strong>Deleted forum, its posts and subforums</strong><br />» %s',
+	'LOG_FORUM_DEL_POSTS_MOVE_FORUMS'		=> '<strong>Deleted forum and its posts, moved subforums</strong> to %1$s<br />» %2$s',
+	'LOG_FORUM_EDIT'						=> '<strong>Edited forum details</strong><br />» %s',
+	'LOG_FORUM_MOVE_DOWN'					=> '<strong>Moved forum</strong> %1$s <strong>below</strong> %2$s',
+	'LOG_FORUM_MOVE_UP'						=> '<strong>Moved forum</strong> %1$s <strong>above</strong> %2$s',
+	'LOG_FORUM_SYNC'						=> '<strong>Re-synchronised forum</strong><br />» %s',
+
+	'LOG_GENERAL_ERROR'	=> '<strong>A general error occured</strong>: %1$s <br />» %2$s',
+
+	'LOG_GROUP_CREATED'		=> '<strong>New usergroup created</strong><br />» %s',
+	'LOG_GROUP_DEFAULTS'	=> '<strong>Group “%1$s” made default for members</strong><br />» %2$s',
+	'LOG_GROUP_DELETE'		=> '<strong>Usergroup deleted</strong><br />» %s',
+	'LOG_GROUP_DEMOTED'		=> '<strong>Leaders demoted in usergroup</strong> %1$s<br />» %2$s',
+	'LOG_GROUP_PROMOTED'	=> '<strong>Members promoted to leader in usergroup</strong> %1$s<br />» %2$s',
+	'LOG_GROUP_REMOVE'		=> '<strong>Members removed from usergroup</strong> %1$s<br />» %2$s',
+	'LOG_GROUP_UPDATED'		=> '<strong>Usergroup details updated</strong><br />» %s',
+	'LOG_MODS_ADDED'		=> '<strong>Added new leaders to usergroup</strong> %1$s<br />» %2$s',
+	'LOG_USERS_ADDED'		=> '<strong>Added new members to usergroup</strong> %1$s<br />» %2$s',
+	'LOG_USERS_APPROVED'	=> '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s',
+	'LOG_USERS_PENDING'		=> '<strong>Users requested to join group “%1$s” and need to be approved</strong><br />» %2$s',
+
+	'LOG_IMAGE_GENERATION_ERROR'	=> '<strong>Error while creating image</strong><br />» Error in %1$s on line %2$s: %3$s',
+
+	'LOG_IMAGESET_ADD_DB'			=> '<strong>Added new imageset to database</strong><br />» %s',
+	'LOG_IMAGESET_ADD_FS'			=> '<strong>Add new imageset on filesystem</strong><br />» %s',
+	'LOG_IMAGESET_DELETE'			=> '<strong>Deleted imageset</strong><br />» %s',
+	'LOG_IMAGESET_EDIT_DETAILS'		=> '<strong>Edited imageset details</strong><br />» %s',
+	'LOG_IMAGESET_EDIT'				=> '<strong>Edited imageset</strong><br />» %s',
+	'LOG_IMAGESET_EXPORT'			=> '<strong>Exported imageset</strong><br />» %s',
+	'LOG_IMAGESET_LANG_MISSING'		=> '<strong>Imageset misses “%2$s” localisation</strong><br />» %1$s',
+	'LOG_IMAGESET_LANG_REFRESHED'	=> '<strong>Refreshed “%2$s” localisation of imageset</strong><br />» %1$s',
+	'LOG_IMAGESET_REFRESHED'		=> '<strong>Refreshed imageset</strong><br />» %s',
+
+	'LOG_INACTIVE_ACTIVATE'	=> '<strong>Activated inactive users</strong><br />» %s',
+	'LOG_INACTIVE_DELETE'	=> '<strong>Deleted inactive users</strong><br />» %s',
+	'LOG_INACTIVE_REMIND'	=> '<strong>Sent reminder e-mails to inactive users</strong><br />» %s',
+	'LOG_INSTALL_CONVERTED'	=> '<strong>Converted from %1$s to phpBB %2$s</strong>',
+	'LOG_INSTALL_INSTALLED'	=> '<strong>Installed phpBB %s</strong>',
+
+	'LOG_IP_BROWSER_FORWARDED_CHECK'	=> '<strong>Session IP/browser/X_FORWARDED_FOR check failed</strong><br />»User IP “<em>%1$s</em>” checked against session IP “<em>%2$s</em>”, user browser string “<em>%3$s</em>” checked against session browser string “<em>%4$s</em>” and user X_FORWARDED_FOR string “<em>%5$s</em>” checked against session X_FORWARDED_FOR string “<em>%6$s</em>”.',
+
+	'LOG_JAB_CHANGED'			=> '<strong>Jabber account changed</strong>',
+	'LOG_JAB_PASSCHG'			=> '<strong>Jabber password changed</strong>',
+	'LOG_JAB_REGISTER'			=> '<strong>Jabber account registered</strong>',
+	'LOG_JAB_SETTINGS_CHANGED'	=> '<strong>Jabber settings changed</strong>',
+
+	'LOG_LANGUAGE_PACK_DELETED'		=> '<strong>Deleted language pack</strong><br />» %s',
+	'LOG_LANGUAGE_PACK_INSTALLED'	=> '<strong>Installed language pack</strong><br />» %s',
+	'LOG_LANGUAGE_PACK_UPDATED'		=> '<strong>Updated language pack details</strong><br />» %s',
+	'LOG_LANGUAGE_FILE_REPLACED'	=> '<strong>Replaced language file</strong><br />» %s',
+	'LOG_LANGUAGE_FILE_SUBMITTED'	=> '<strong>Submitted language file and placed in store folder</strong><br />» %s',
+
+	'LOG_MASS_EMAIL'		=> '<strong>Sent mass e-mail</strong><br />» %s',
+
+	'LOG_MCP_CHANGE_POSTER'	=> '<strong>Changed poster in topic “%1$s”</strong><br />» from %2$s to %3$s',
+
+	'LOG_MODULE_DISABLE'	=> '<strong>Module disabled</strong><br />» %s',
+	'LOG_MODULE_ENABLE'		=> '<strong>Module enabled</strong><br />» %s',
+	'LOG_MODULE_MOVE_DOWN'	=> '<strong>Module moved down</strong><br />» %1$s below %2$s',
+	'LOG_MODULE_MOVE_UP'	=> '<strong>Module moved up</strong><br />» %1$s above %2$s',
+	'LOG_MODULE_REMOVED'	=> '<strong>Module removed</strong><br />» %s',
+	'LOG_MODULE_ADD'		=> '<strong>Module added</strong><br />» %s',
+	'LOG_MODULE_EDIT'		=> '<strong>Module edited</strong><br />» %s',
+
+	'LOG_A_ROLE_ADD'		=> '<strong>Admin role added</strong><br />» %s',
+	'LOG_A_ROLE_EDIT'		=> '<strong>Admin role edited</strong><br />» %s',
+	'LOG_A_ROLE_REMOVED'	=> '<strong>Admin role removed</strong><br />» %s',
+	'LOG_F_ROLE_ADD'		=> '<strong>Forum role added</strong><br />» %s',
+	'LOG_F_ROLE_EDIT'		=> '<strong>Forum role edited</strong><br />» %s',
+	'LOG_F_ROLE_REMOVED'	=> '<strong>Forum role removed</strong><br />» %s',
+	'LOG_M_ROLE_ADD'		=> '<strong>Moderator role added</strong><br />» %s',
+	'LOG_M_ROLE_EDIT'		=> '<strong>Moderator role edited</strong><br />» %s',
+	'LOG_M_ROLE_REMOVED'	=> '<strong>Moderator role removed</strong><br />» %s',
+	'LOG_U_ROLE_ADD'		=> '<strong>User role added</strong><br />» %s',
+	'LOG_U_ROLE_EDIT'		=> '<strong>User role edited</strong><br />» %s',
+	'LOG_U_ROLE_REMOVED'	=> '<strong>User role removed</strong><br />» %s',
+
+	'LOG_PROFILE_FIELD_ACTIVATE'	=> '<strong>Profile field activated</strong><br />» %s',
+	'LOG_PROFILE_FIELD_CREATE'		=> '<strong>Profile field added</strong><br />» %s',
+	'LOG_PROFILE_FIELD_DEACTIVATE'	=> '<strong>Profile field deactivated</strong><br />» %s',
+	'LOG_PROFILE_FIELD_EDIT'		=> '<strong>Profile field changed</strong><br />» %s',
+	'LOG_PROFILE_FIELD_REMOVED'		=> '<strong>Profile field removed</strong><br />» %s',
+
+	'LOG_PRUNE'					=> '<strong>Pruned forums</strong><br />» %s',
+	'LOG_AUTO_PRUNE'			=> '<strong>Auto-pruned forums</strong><br />» %s',
+	'LOG_PRUNE_USER_DEAC'		=> '<strong>Users deactivated</strong><br />» %s',
+	'LOG_PRUNE_USER_DEL_DEL'	=> '<strong>Users pruned and posts deleted</strong><br />» %s',
+	'LOG_PRUNE_USER_DEL_ANON'	=> '<strong>Users pruned and posts retained</strong><br />» %s',
+
+	'LOG_PURGE_CACHE'			=> '<strong>Purged cache</strong>',
+	'LOG_PURGE_SESSIONS'		=> '<strong>Purged sessions</strong>',
+
+
+	'LOG_RANK_ADDED'		=> '<strong>Added new rank</strong><br />» %s',
+	'LOG_RANK_REMOVED'		=> '<strong>Removed rank</strong><br />» %s',
+	'LOG_RANK_UPDATED'		=> '<strong>Updated rank</strong><br />» %s',
+
+	'LOG_REASON_ADDED'		=> '<strong>Added report/denial reason</strong><br />» %s',
+	'LOG_REASON_REMOVED'	=> '<strong>Removed report/denial reason</strong><br />» %s',
+	'LOG_REASON_UPDATED'	=> '<strong>Updated report/denial reason</strong><br />» %s',
+
+	'LOG_REFERER_INVALID'		=> '<strong>Referer validation failed</strong><br />»Referer was “<em>%1$s</em>”. The request was rejected and the session killed.',
+	'LOG_RESET_DATE'			=> '<strong>Board start date reset</strong>',
+	'LOG_RESET_ONLINE'			=> '<strong>Most users online reset</strong>',
+	'LOG_RESYNC_POSTCOUNTS'		=> '<strong>User post counts resynchronised</strong>',
+	'LOG_RESYNC_POST_MARKING'	=> '<strong>Dotted topics resynchronised</strong>',
+	'LOG_RESYNC_STATS'			=> '<strong>Post, topic and user statistics resynchronised</strong>',
+
+	'LOG_SEARCH_INDEX_CREATED'	=> '<strong>Created search index for</strong><br />» %s',
+	'LOG_SEARCH_INDEX_REMOVED'	=> '<strong>Removed search index for</strong><br />» %s',
+	'LOG_STYLE_ADD'				=> '<strong>Added new style</strong><br />» %s',
+	'LOG_STYLE_DELETE'			=> '<strong>Deleted style</strong><br />» %s',
+	'LOG_STYLE_EDIT_DETAILS'	=> '<strong>Edited style</strong><br />» %s',
+	'LOG_STYLE_EXPORT'			=> '<strong>Exported style</strong><br />» %s',
+
+	'LOG_TEMPLATE_ADD_DB'			=> '<strong>Added new template set to database</strong><br />» %s',
+	'LOG_TEMPLATE_ADD_FS'			=> '<strong>Add new template set on filesystem</strong><br />» %s',
+	'LOG_TEMPLATE_CACHE_CLEARED'	=> '<strong>Deleted cached versions of template files in template set <em>%1$s</em></strong><br />» %2$s',
+	'LOG_TEMPLATE_DELETE'			=> '<strong>Deleted template set</strong><br />» %s',
+	'LOG_TEMPLATE_EDIT'				=> '<strong>Edited template set <em>%1$s</em></strong><br />» %2$s',
+	'LOG_TEMPLATE_EDIT_DETAILS'		=> '<strong>Edited template details</strong><br />» %s',
+	'LOG_TEMPLATE_EXPORT'			=> '<strong>Exported template set</strong><br />» %s',
+	'LOG_TEMPLATE_REFRESHED'		=> '<strong>Refreshed template set</strong><br />» %s',
+
+	'LOG_THEME_ADD_DB'			=> '<strong>Added new theme to database</strong><br />» %s',
+	'LOG_THEME_ADD_FS'			=> '<strong>Add new theme on filesystem</strong><br />» %s',
+	'LOG_THEME_DELETE'			=> '<strong>Theme deleted</strong><br />» %s',
+	'LOG_THEME_EDIT_DETAILS'	=> '<strong>Edited theme details</strong><br />» %s',
+	'LOG_THEME_EDIT'			=> '<strong>Edited theme <em>%1$s</em></strong>',
+	'LOG_THEME_EDIT_FILE'		=> '<strong>Edited theme <em>%1$s</em></strong><br />» Modified file <em>%2$s</em>',
+	'LOG_THEME_EXPORT'			=> '<strong>Exported theme</strong><br />» %s',
+	'LOG_THEME_REFRESHED'		=> '<strong>Refreshed theme</strong><br />» %s',
+
+	'LOG_UPDATE_DATABASE'	=> '<strong>Updated Database from version %1$s to version %2$s</strong>',
+	'LOG_UPDATE_PHPBB'		=> '<strong>Updated phpBB from version %1$s to version %2$s</strong>',
+
+	'LOG_USER_ACTIVE'		=> '<strong>User activated</strong><br />» %s',
+	'LOG_USER_BAN_USER'		=> '<strong>Banned User via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
+	'LOG_USER_BAN_IP'		=> '<strong>Banned IP via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
+	'LOG_USER_BAN_EMAIL'	=> '<strong>Banned e-mail via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
+	'LOG_USER_DELETED'		=> '<strong>Deleted user</strong><br />» %s',
+	'LOG_USER_DEL_ATTACH'	=> '<strong>Removed all attachments made by the user</strong><br />» %s',
+	'LOG_USER_DEL_AVATAR'	=> '<strong>Removed user avatar</strong><br />» %s',
+	'LOG_USER_DEL_OUTBOX'	=> '<strong>Emptied user outbox</strong><br />» %s',
+	'LOG_USER_DEL_POSTS'	=> '<strong>Removed all posts made by the user</strong><br />» %s',
+	'LOG_USER_DEL_SIG'		=> '<strong>Removed user signature</strong><br />» %s',
+	'LOG_USER_INACTIVE'		=> '<strong>User deactivated</strong><br />» %s',
+	'LOG_USER_MOVE_POSTS'	=> '<strong>Moved user posts</strong><br />» posts by “%1$s” to forum “%2$s”',
+	'LOG_USER_NEW_PASSWORD'	=> '<strong>Changed user password</strong><br />» %s',
+	'LOG_USER_REACTIVATE'	=> '<strong>Forced user account reactivation</strong><br />» %s',
+	'LOG_USER_REMOVED_NR'	=> '<strong>Removed newly registered flag from user</strong><br />» %s',
+
+	'LOG_USER_UPDATE_EMAIL'	=> '<strong>User “%1$s” changed e-mail</strong><br />» from “%2$s” to “%3$s”',
+	'LOG_USER_UPDATE_NAME'	=> '<strong>Changed username</strong><br />» from “%1$s” to “%2$s”',
+	'LOG_USER_USER_UPDATE'	=> '<strong>Updated user details</strong><br />» %s',
+
+	'LOG_USER_ACTIVE_USER'		=> '<strong>User account activated</strong>',
+	'LOG_USER_DEL_AVATAR_USER'	=> '<strong>User avatar removed</strong>',
+	'LOG_USER_DEL_SIG_USER'		=> '<strong>User signature removed</strong>',
+	'LOG_USER_FEEDBACK'			=> '<strong>Added user feedback</strong><br />» %s',
+	'LOG_USER_GENERAL'			=> '<strong>Entry added:</strong><br />» %s',
+	'LOG_USER_INACTIVE_USER'	=> '<strong>User account de-activated</strong>',
+	'LOG_USER_LOCK'				=> '<strong>User locked own topic</strong><br />» %s',
+	'LOG_USER_MOVE_POSTS_USER'	=> '<strong>Moved all posts to forum</strong>» %s',
+	'LOG_USER_REACTIVATE_USER'	=> '<strong>Forced user account reactivation</strong>',
+	'LOG_USER_UNLOCK'			=> '<strong>User unlocked own topic</strong><br />» %s',
+	'LOG_USER_WARNING'			=> '<strong>Added user warning</strong><br />» %s',
+	'LOG_USER_WARNING_BODY'		=> '<strong>The following warning was issued to this user</strong><br />» %s',
+
+	'LOG_USER_GROUP_CHANGE'			=> '<strong>User changed default group</strong><br />» %s',
+	'LOG_USER_GROUP_DEMOTE'			=> '<strong>User demoted as leaders from usergroup</strong><br />» %s',
+	'LOG_USER_GROUP_JOIN'			=> '<strong>User joined group</strong><br />» %s',
+	'LOG_USER_GROUP_JOIN_PENDING'	=> '<strong>User joined group and needs to be approved</strong><br />» %s',
+	'LOG_USER_GROUP_RESIGN'			=> '<strong>User resigned membership from group</strong><br />» %s',
+
+	'LOG_WARNING_DELETED'		=> '<strong>Deleted user warning</strong><br />» %s',
+	'LOG_WARNINGS_DELETED'		=> '<strong>Deleted %2$s user warnings</strong><br />» %1$s', // Example: '<strong>Deleted 2 user warnings</strong><br />» username'
+	'LOG_WARNINGS_DELETED_ALL'	=> '<strong>Deleted all user warnings</strong><br />» %s',
+
+	'LOG_WORD_ADD'			=> '<strong>Added word censor</strong><br />» %s',
+	'LOG_WORD_DELETE'		=> '<strong>Deleted word censor</strong><br />» %s',
+	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br />» %s',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
new file mode 100644
index 0000000000..ae8f76d6b7
--- /dev/null
+++ b/phpBB/language/en/acp/database.php
@@ -0,0 +1,76 @@
+<?php
+/**
+*
+* acp_database [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+// Database Backup/Restore
+$lang = array_merge($lang, array(
+	'ACP_BACKUP_EXPLAIN'	=> 'Here you can backup all your phpBB related data. You may store the resulting archive in your <samp>store/</samp> folder or download it directly. Depending on your server configuration you may be able to compress the file in a number of formats.',
+	'ACP_RESTORE_EXPLAIN'	=> 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. <strong>WARNING</strong> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete. Backups are stored in the <samp>store/</samp> folder and are assumed to be generated by phpBB’s backup functionality. Restoring backups that were not created by the built in system may or may not work.',
+
+	'BACKUP_DELETE'		=> 'The backup file has been deleted successfully.',
+	'BACKUP_INVALID'	=> 'The selected file to backup is invalid.',
+	'BACKUP_OPTIONS'	=> 'Backup options',
+	'BACKUP_SUCCESS'	=> 'The backup file has been created successfully.',
+	'BACKUP_TYPE'		=> 'Backup type',
+
+	'DATABASE'			=> 'Database utilities',
+	'DATA_ONLY'			=> 'Data only',
+	'DELETE_BACKUP'		=> 'Delete backup',
+	'DELETE_SELECTED_BACKUP'	=> 'Are you sure you want to delete the selected backup?',
+	'DESELECT_ALL'		=> 'Deselect all',
+	'DOWNLOAD_BACKUP'	=> 'Download backup',
+
+	'FILE_TYPE'			=> 'File type',
+	'FILE_WRITE_FAIL'	=> 'Unable to write file to storage folder.',
+	'FULL_BACKUP'		=> 'Full',
+
+	'RESTORE_FAILURE'		=> 'The backup file may be corrupt.',
+	'RESTORE_OPTIONS'		=> 'Restore options',
+	'RESTORE_SUCCESS'		=> 'The database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.',
+
+	'SELECT_ALL'			=> 'Select all',
+	'SELECT_FILE'			=> 'Select a file',
+	'START_BACKUP'			=> 'Start backup',
+	'START_RESTORE'			=> 'Start restore',
+	'STORE_AND_DOWNLOAD'	=> 'Store and download',
+	'STORE_LOCAL'			=> 'Store file locally',
+	'STRUCTURE_ONLY'		=> 'Structure only',
+
+	'TABLE_SELECT'		=> 'Table select',
+	'TABLE_SELECT_ERROR'=> 'You must select at least one table.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
new file mode 100644
index 0000000000..4427bfff01
--- /dev/null
+++ b/phpBB/language/en/acp/email.php
@@ -0,0 +1,67 @@
+<?php
+/**
+*
+* acp_email [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+// Email settings
+$lang = array_merge($lang, array(
+	'ACP_MASS_EMAIL_EXPLAIN'		=> 'Here you can e-mail a message to either all of your users or all users of a specific group <strong>having the option to receive mass e-mails enabled</strong>. To achieve this an e-mail will be sent out to the administrative e-mail address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an e-mail, for more recipients more e-mails will be sent. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed.',
+	'ALL_USERS'						=> 'All users',
+
+	'COMPOSE'				=> 'Compose',
+
+	'EMAIL_SEND_ERROR'		=> 'There were one or more errors while sending the e-mail. Please check the %sError log%s for detailed error messages.',
+	'EMAIL_SENT'			=> 'This message has been sent.',
+	'EMAIL_SENT_QUEUE'		=> 'This message has been queued for sending.',
+
+	'LOG_SESSION'			=> 'Log mail session to critical log',
+
+	'SEND_IMMEDIATELY'		=> 'Send immediately',
+	'SEND_TO_GROUP'			=> 'Send to group',
+	'SEND_TO_USERS'			=> 'Send to users',
+	'SEND_TO_USERS_EXPLAIN'	=> 'Entering names here will override any group selected above. Enter each username on a new line.',
+	
+	'MAIL_HIGH_PRIORITY'	=> 'High',
+	'MAIL_LOW_PRIORITY'		=> 'Low',
+	'MAIL_NORMAL_PRIORITY'	=> 'Normal',
+	'MAIL_PRIORITY'			=> 'Mail priority',
+	'MASS_MESSAGE'			=> 'Your message',
+	'MASS_MESSAGE_EXPLAIN'	=> 'Please note that you may enter only plain text. All markup will be removed before sending.',
+	
+	'NO_EMAIL_MESSAGE'		=> 'You must enter a message.',
+	'NO_EMAIL_SUBJECT'		=> 'You must specify a subject for your message.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
new file mode 100644
index 0000000000..371a184fb7
--- /dev/null
+++ b/phpBB/language/en/acp/forums.php
@@ -0,0 +1,160 @@
+<?php
+/**
+*
+* acp_forums [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+// Forum Admin
+$lang = array_merge($lang, array(
+	'AUTO_PRUNE_DAYS'			=> 'Auto-prune post age',
+	'AUTO_PRUNE_DAYS_EXPLAIN'	=> 'Number of days since last post after which topic is removed.',
+	'AUTO_PRUNE_FREQ'			=> 'Auto-prune frequency',
+	'AUTO_PRUNE_FREQ_EXPLAIN'	=> 'Time in days between pruning events.',
+	'AUTO_PRUNE_VIEWED'			=> 'Auto-prune post viewed age',
+	'AUTO_PRUNE_VIEWED_EXPLAIN'	=> 'Number of days since topic was viewed after which topic is removed.',
+
+	'CONTINUE'						=> 'Continue',
+	'COPY_PERMISSIONS'				=> 'Copy permissions from',
+	'COPY_PERMISSIONS_EXPLAIN'		=> 'To ease up the permission setup for your new forum, you can copy the permissions of an existing forum.',
+	'COPY_PERMISSIONS_ADD_EXPLAIN'	=> 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.',
+	'COPY_PERMISSIONS_EDIT_EXPLAIN'	=> 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.',
+	'COPY_TO_ACL'					=> 'Alternatively, you are also able to %sset up new permissions%s for this forum.',
+	'CREATE_FORUM'					=> 'Create new forum',
+
+	'DECIDE_MOVE_DELETE_CONTENT'		=> 'Delete content or move to forum',
+	'DECIDE_MOVE_DELETE_SUBFORUMS'		=> 'Delete subforums or move to forum',
+	'DEFAULT_STYLE'						=> 'Default style',
+	'DELETE_ALL_POSTS'					=> 'Delete posts',
+	'DELETE_SUBFORUMS'					=> 'Delete subforums and posts',
+	'DISPLAY_ACTIVE_TOPICS'				=> 'Enable active topics',
+	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'		=> 'If set to yes active topics in selected subforums will be displayed under this category.',
+
+	'EDIT_FORUM'					=> 'Edit forum',
+	'ENABLE_INDEXING'				=> 'Enable search indexing',
+	'ENABLE_INDEXING_EXPLAIN'		=> 'If set to yes posts made to this forum will be indexed for searching.',
+	'ENABLE_POST_REVIEW'			=> 'Enable post review',
+	'ENABLE_POST_REVIEW_EXPLAIN'	=> 'If set to yes users are able to review their post if new posts were made to the topic while users wrote theirs. This should be disabled for chat forums.',
+	'ENABLE_QUICK_REPLY'			=> 'Enable quick reply',
+	'ENABLE_QUICK_REPLY_EXPLAIN'	=> 'If set to yes users get a quick reply box for this forum. If the global option for quick reply is disabled or the forum not postable to the quick reply box will not be displayed, even if set to yes here.',
+	'ENABLE_RECENT'					=> 'Display active topics',
+	'ENABLE_RECENT_EXPLAIN'			=> 'If set to yes topics made to this forum will be shown in the active topics list.',
+	'ENABLE_TOPIC_ICONS'			=> 'Enable topic icons',
+
+	'FORUM_ADMIN'						=> 'Forum administration',
+	'FORUM_ADMIN_EXPLAIN'				=> 'In phpBB3 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. <strong>You need to copy or set appropriate permissions for newly created forums to have them displayed.</strong>',
+	'FORUM_AUTO_PRUNE'					=> 'Enable auto-pruning',
+	'FORUM_AUTO_PRUNE_EXPLAIN'			=> 'Prunes the forum of topics, set the frequency/age parameters below.',
+	'FORUM_CREATED'						=> 'Forum created successfully.',
+	'FORUM_DATA_NEGATIVE'				=> 'Pruning parameters cannot be negative.',
+	'FORUM_DESC_TOO_LONG'				=> 'The forum description is too long, it must be less than 4000 characters.',
+	'FORUM_DELETE'						=> 'Delete forum',
+	'FORUM_DELETE_EXPLAIN'				=> 'The form below will allow you to delete a forum. If the forum is postable you are able to decide where you want to put all topics (or forums) it contained.',
+	'FORUM_DELETED'						=> 'Forum successfully deleted.',
+	'FORUM_DESC'						=> 'Description',
+	'FORUM_DESC_EXPLAIN'				=> 'Any HTML markup entered here will be displayed as is.',
+	'FORUM_EDIT_EXPLAIN'				=> 'The form below will allow you to customise this forum. Please note that moderation and post count controls are set via forum permissions for each user or usergroup.',
+	'FORUM_IMAGE'						=> 'Forum image',
+	'FORUM_IMAGE_EXPLAIN'				=> 'Location, relative to the phpBB root directory, of an additional image to associate with this forum.',
+	'FORUM_IMAGE_NO_EXIST'				=> 'The specified forum image does not exist',
+	'FORUM_LINK_EXPLAIN'				=> 'Full URL (including the protocol, i.e.: <samp>http://</samp>) to the destination location that clicking this forum will take the user, e.g.: <samp>http://www.phpbb.com/</samp>.',
+	'FORUM_LINK_TRACK'					=> 'Track link redirects',
+	'FORUM_LINK_TRACK_EXPLAIN'			=> 'Records the number of times a forum link was clicked.',
+	'FORUM_NAME'						=> 'Forum name',
+	'FORUM_NAME_EMPTY'					=> 'You must enter a name for this forum.',
+	'FORUM_PARENT'						=> 'Parent forum',
+	'FORUM_PASSWORD'					=> 'Forum password',
+	'FORUM_PASSWORD_CONFIRM'			=> 'Confirm forum password',
+	'FORUM_PASSWORD_CONFIRM_EXPLAIN'	=> 'Only needs to be set if a forum password is entered.',
+	'FORUM_PASSWORD_EXPLAIN'			=> 'Defines a password for this forum, use the permission system in preference.',
+	'FORUM_PASSWORD_UNSET'				=> 'Remove forum password',
+	'FORUM_PASSWORD_UNSET_EXPLAIN'		=> 'Check here if you want to remove the forum password.',
+	'FORUM_PASSWORD_OLD'				=> 'The forum password is using an old encryption and should be changed.',
+	'FORUM_PASSWORD_MISMATCH'			=> 'The passwords you entered did not match.',
+	'FORUM_PRUNE_SETTINGS'				=> 'Forum prune settings',
+	'FORUM_RESYNCED'					=> 'Forum “%s” successfully resynced',
+	'FORUM_RULES_EXPLAIN'				=> 'Forum rules are displayed at any page within the given forum.',
+	'FORUM_RULES_LINK'					=> 'Link to forum rules',
+	'FORUM_RULES_LINK_EXPLAIN'			=> 'You are able to enter the URL of the page/post containing your forum rules here. This setting will override the forum rules text you specified.',
+	'FORUM_RULES_PREVIEW'				=> 'Forum rules preview',
+	'FORUM_RULES_TOO_LONG'				=> 'The forum rules must be less than 4000 characters.',
+	'FORUM_SETTINGS'					=> 'Forum settings',
+	'FORUM_STATUS'						=> 'Forum status',
+	'FORUM_STYLE'						=> 'Forum style',
+	'FORUM_TOPICS_PAGE'					=> 'Topics per page',
+	'FORUM_TOPICS_PAGE_EXPLAIN'			=> 'If non-zero this value will override the default topics per page setting.',
+	'FORUM_TYPE'						=> 'Forum type',
+	'FORUM_UPDATED'						=> 'Forum information updated successfully.',
+
+	'FORUM_WITH_SUBFORUMS_NOT_TO_LINK'		=> 'You want to change a postable forum having subforums to a link. Please move all subforums out of this forum before you proceed, because after changing to a link you are no longer able to see the subforums currently connected to this forum.',
+
+	'GENERAL_FORUM_SETTINGS'	=> 'General forum settings',
+
+	'LINK'						=> 'Link',
+	'LIST_INDEX'				=> 'List subforum in parent-forum’s legend',
+	'LIST_INDEX_EXPLAIN'		=> 'Displays this forum on the index and elsewhere as a link within the legend of its parent-forum if the parent-forum’s “List subforums in legend” option is enabled.',
+	'LIST_SUBFORUMS'			=> 'List subforums in legend',
+	'LIST_SUBFORUMS_EXPLAIN'	=> 'Displays this forum’s subforums on the index and elsewhere as a link within the legend if their “List subforum in parent-forum’s legend” option is enabled.',
+	'LOCKED'					=> 'Locked',
+
+	'MOVE_POSTS_NO_POSTABLE_FORUM'	=> 'The forum you selected for moving the posts to is not postable. Please select a postable forum.',
+	'MOVE_POSTS_TO'					=> 'Move posts to',
+	'MOVE_SUBFORUMS_TO'				=> 'Move subforums to',
+
+	'NO_DESTINATION_FORUM'			=> 'You have not specified a forum to move content to.',
+	'NO_FORUM_ACTION'				=> 'No action defined for what happens with the forum content.',
+	'NO_PARENT'						=> 'No parent',
+	'NO_PERMISSIONS'				=> 'Do not copy permissions',
+	'NO_PERMISSION_FORUM_ADD'		=> 'You do not have the necessary permissions to add forums.',
+	'NO_PERMISSION_FORUM_DELETE'	=> 'You do not have the necessary permissions to delete forums.',
+
+	'PARENT_IS_LINK_FORUM'		=> 'The parent you specified is a forum link. Link forums are not able to hold other forums, please specify a category or forum as the parent forum.',
+	'PARENT_NOT_EXIST'			=> 'Parent does not exist.',
+	'PRUNE_ANNOUNCEMENTS'		=> 'Prune announcements',
+	'PRUNE_STICKY'				=> 'Prune stickies',
+	'PRUNE_OLD_POLLS'			=> 'Prune old polls',
+	'PRUNE_OLD_POLLS_EXPLAIN'	=> 'Removes topics with polls not voted in for post age days.',
+
+	'REDIRECT_ACL'	=> 'Now you are able to %sset permissions%s for this forum.',
+
+	'SYNC_IN_PROGRESS'			=> 'Synchronizing forum',
+	'SYNC_IN_PROGRESS_EXPLAIN'	=> 'Currently resyncing topic range %1$d/%2$d.',
+
+	'TYPE_CAT'			=> 'Category',
+	'TYPE_FORUM'		=> 'Forum',
+	'TYPE_LINK'			=> 'Link',
+
+	'UNLOCKED'			=> 'Unlocked',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
new file mode 100644
index 0000000000..e8c1a3c494
--- /dev/null
+++ b/phpBB/language/en/acp/groups.php
@@ -0,0 +1,132 @@
+<?php
+/**
+*
+* acp_groups [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ACP_GROUPS_MANAGE_EXPLAIN'		=> 'From this panel you can administrate all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.',
+	'ADD_USERS'						=> 'Add users',
+	'ADD_USERS_EXPLAIN'				=> 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.',
+
+	'COPY_PERMISSIONS'				=> 'Copy permissions from',
+	'COPY_PERMISSIONS_EXPLAIN'		=> 'Once created, the group will have the same permissions as the one you select here.',
+	'CREATE_GROUP'					=> 'Create new group',
+
+	'GROUPS_NO_MEMBERS'				=> 'This group has no members',
+	'GROUPS_NO_MODS'				=> 'No group leaders defined',
+
+	'GROUP_APPROVE'					=> 'Approve member',
+	'GROUP_APPROVED'				=> 'Approved members',
+	'GROUP_AVATAR'					=> 'Group avatar',
+	'GROUP_AVATAR_EXPLAIN'			=> 'This image will be displayed in the Group Control Panel.',
+	'GROUP_CLOSED'					=> 'Closed',
+	'GROUP_COLOR'					=> 'Group colour',
+	'GROUP_COLOR_EXPLAIN'			=> 'Defines the colour members’ usernames will appear in, leave blank for user default.',
+	'GROUP_CONFIRM_ADD_USER'		=> 'Are you sure that you want to add the user %1$s to the group?',
+	'GROUP_CONFIRM_ADD_USERS'		=> 'Are you sure that you want to add the users %1$s to the group?',
+	'GROUP_CREATED'					=> 'Group has been created successfully.',
+	'GROUP_DEFAULT'					=> 'Make group default for member',
+	'GROUP_DEFS_UPDATED'			=> 'Default group set for all selected members.',
+	'GROUP_DELETE'					=> 'Remove member from group',
+	'GROUP_DELETED'					=> 'Group deleted and user default groups set successfully.',
+	'GROUP_DEMOTE'					=> 'Demote group leader',
+	'GROUP_DESC'					=> 'Group description',
+	'GROUP_DETAILS'					=> 'Group details',
+	'GROUP_EDIT_EXPLAIN'			=> 'Here you can edit an existing group. You can change its name, description and type (open, closed, etc.). You can also set certain group wide options such as colouration, rank, etc. Changes made here override users’ current settings. Please note that group members can override group-avatar settings, unless you set appropriate user permissions.',
+	'GROUP_ERR_USERS_EXIST'			=> 'The specified users are already members of this group.',
+	'GROUP_FOUNDER_MANAGE'			=> 'Founder manage only',
+	'GROUP_FOUNDER_MANAGE_EXPLAIN'	=> 'Restrict management of this group to founders only. Users having group permissions are still able to see this group as well as this group’s members.',
+	'GROUP_HIDDEN'					=> 'Hidden',
+	'GROUP_LANG'					=> 'Group language',
+	'GROUP_LEAD'					=> 'Group leaders',
+	'GROUP_LEADERS_ADDED'			=> 'New leaders added to group successfully.',
+	'GROUP_LEGEND'					=> 'Display group in legend',
+	'GROUP_LIST'					=> 'Current members',
+	'GROUP_LIST_EXPLAIN'			=> 'This is a complete list of all the current users with membership of this group. You can delete members (except in certain special groups) or add new ones as you see fit.',
+	'GROUP_MEMBERS'					=> 'Group members',
+	'GROUP_MEMBERS_EXPLAIN'			=> 'This is a complete listing of all the members of this usergroup. It includes separate sections for leaders, pending and existing members. From here you can manage all aspects of who has membership of this group and what their role is. To remove a leader but keep them in the group use Demote rather than delete. Similarly use Promote to make an existing member a leader.',
+	'GROUP_MESSAGE_LIMIT'			=> 'Group private message limit per folder',
+	'GROUP_MESSAGE_LIMIT_EXPLAIN'	=> 'This setting overrides the per-user folder message limit. A value of 0 means the user default limit will be used.',
+	'GROUP_MODS_ADDED'				=> 'New group leaders added successfully.',
+	'GROUP_MODS_DEMOTED'			=> 'Group leaders demoted successfully.',
+	'GROUP_MODS_PROMOTED'			=> 'Group members promoted successfully.',
+	'GROUP_NAME'					=> 'Group name',
+	'GROUP_NAME_TAKEN'				=> 'The group name you entered is already in use, please select an alternative.',
+	'GROUP_OPEN'					=> 'Open',
+	'GROUP_PENDING'					=> 'Pending members',
+	'GROUP_MAX_RECIPIENTS'			=> 'Maximum number of allowed recipients per private message',
+	'GROUP_MAX_RECIPIENTS_EXPLAIN'	=> 'The maximum number of allowed recipients in a private message. If 0 is entered, the board-wide setting is used.',
+	'GROUP_OPTIONS_SAVE'			=> 'Group wide options',
+	'GROUP_PROMOTE'					=> 'Promote to group leader',
+	'GROUP_RANK'					=> 'Group rank',
+	'GROUP_RECEIVE_PM'				=> 'Group able to receive private messages',
+	'GROUP_RECEIVE_PM_EXPLAIN'		=> 'Please note that hidden groups are not able to be messaged, regardless of this setting.',
+	'GROUP_REQUEST'					=> 'Request',
+	'GROUP_SETTINGS_SAVE'			=> 'Group wide settings',
+	'GROUP_SKIP_AUTH'				=> 'Exempt group leader from permissions',
+	'GROUP_SKIP_AUTH_EXPLAIN'		=> 'If enabled group leader no longer inherit permissions from the group.',
+	'GROUP_TYPE'					=> 'Group type',
+	'GROUP_TYPE_EXPLAIN'			=> 'This determines which users can join or view this group.',
+	'GROUP_UPDATED'					=> 'Group preferences updated successfully.',
+
+	'GROUP_USERS_ADDED'				=> 'New users added to group successfully.',
+	'GROUP_USERS_EXIST'				=> 'The selected users are already members.',
+	'GROUP_USERS_REMOVE'			=> 'Users removed from group and new defaults set successfully.',
+
+	'MAKE_DEFAULT_FOR_ALL'	=> 'Make default group for every member',
+	'MEMBERS'				=> 'Members',
+
+	'NO_GROUP'					=> 'No group specified.',
+	'NO_GROUPS_CREATED'			=> 'No groups created yet.',
+	'NO_PERMISSIONS'			=> 'Do not copy permissions',
+	'NO_USERS'					=> 'You haven’t entered any users.',
+	'NO_USERS_ADDED'			=> 'No users were added to the group.',
+	'NO_VALID_USERS'			=> 'You haven’t entered any users eligible for that action.',
+
+	'SPECIAL_GROUPS'			=> 'Pre-defined groups',
+	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
+
+	'TOTAL_MEMBERS'				=> 'Members',
+
+	'USERS_APPROVED'				=> 'Users approved successfully.',
+	'USER_DEFAULT'					=> 'User default',
+	'USER_DEF_GROUPS'				=> 'User defined groups',
+	'USER_DEF_GROUPS_EXPLAIN'		=> 'These are groups created by you or another admin on this board. You can manage memberships as well as edit group properties or even delete the group.',
+	'USER_GROUP_DEFAULT'			=> 'Set as default group',
+	'USER_GROUP_DEFAULT_EXPLAIN'	=> 'Saying yes here will set this group as the default group for the added users.',
+	'USER_GROUP_LEADER'				=> 'Set as group leader',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/index.htm b/phpBB/language/en/acp/index.htm
new file mode 100644
index 0000000000..ee1f723a7d
--- /dev/null
+++ b/phpBB/language/en/acp/index.htm
@@ -0,0 +1,10 @@
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+
+</body>
+</html>
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
new file mode 100644
index 0000000000..4d11309ebb
--- /dev/null
+++ b/phpBB/language/en/acp/language.php
@@ -0,0 +1,102 @@
+<?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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ACP_FILES'						=> 'Admin language files',
+	'ACP_LANGUAGE_PACKS_EXPLAIN'	=> 'Here you are able to install/remove language packs. The default language pack is marked with an asterisk (*).',
+
+	'EMAIL_FILES'			=> 'E-mail 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.',
+	'INVALID_UPLOAD_METHOD'		=> 'The selected upload method is not valid, please choose a different method.',
+
+	'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 /><strong>Note:</strong> Once you changed a language file, the changes will be stored within a separate 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 <strong>%s</strong> has been removed successfully. All users using this language have been reset to the boards default language.',
+	'LANGUAGE_PACK_DETAILS'				=> 'Language pack details',
+	'LANGUAGE_PACK_INSTALLED'			=> 'The language pack <strong>%s</strong> 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 (including robots)',
+	'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: <strong style="color:red">%s</strong>',
+	'MISSING_LANG_VARIABLES'	=> 'Missing language variables',
+	'MODS_FILES'				=> 'MODs language files',
+
+	'NO_FILE_SELECTED'				=> 'You haven’t specified a language file.',
+	'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',
+	'SUBMIT_AND_UPLOAD'			=> 'Submit and upload 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 <strong>%s</strong> language pack',
+
+	'UNINSTALLED_LANGUAGE_PACKS'	=> 'Uninstalled language packs',
+
+	'UNABLE_TO_WRITE_FILE'		=> 'The file could not be written to %s.',
+	'UPLOAD_COMPLETED'			=> 'The upload was completed successfully.',
+	'UPLOAD_FAILED'				=> 'The upload failed for unknown reasons. You may need to replace the relevant file manually.',
+	'UPLOAD_METHOD'				=> 'Upload method',
+	'UPLOAD_SETTINGS'			=> 'Upload settings',
+
+	'WRONG_LANGUAGE_FILE'		=> 'Selected language file is invalid.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php
new file mode 100644
index 0000000000..875b24a94b
--- /dev/null
+++ b/phpBB/language/en/acp/modules.php
@@ -0,0 +1,84 @@
+<?php
+/**
+*
+* acp_modules [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ACP_MODULE_MANAGEMENT_EXPLAIN'	=> 'Here you are able to manage all kind of modules. Please note that the ACP has a three-level menu structure (Category -> Category -> Module) whereby the others having a two-level menu structure (Category -> Module) which must be kept. Please also be aware that you may lock out yourself if you disable or delete the modules responsible for the module management itself.',
+	'ADD_MODULE'					=> 'Add module',
+	'ADD_MODULE_CONFIRM'			=> 'Are you sure you want to add the selected module with the selected mode?',
+	'ADD_MODULE_TITLE'				=> 'Add module',
+
+	'CANNOT_REMOVE_MODULE'	=> 'Unable to remove module, it has assigned children. Please remove or move all children before performing this action.',
+	'CATEGORY'				=> 'Category',
+	'CHOOSE_MODE'			=> 'Choose module mode',
+	'CHOOSE_MODE_EXPLAIN'	=> 'Choose the modules mode being used.',
+	'CHOOSE_MODULE'			=> 'Choose module',
+	'CHOOSE_MODULE_EXPLAIN'	=> 'Choose the file being called by this module.',
+	'CREATE_MODULE'			=> 'Create new module',
+
+	'DEACTIVATED_MODULE'	=> 'Deactivated module',
+	'DELETE_MODULE'			=> 'Delete module',
+	'DELETE_MODULE_CONFIRM'	=> 'Are you sure you want to remove this module?',
+
+	'EDIT_MODULE'			=> 'Edit module',
+	'EDIT_MODULE_EXPLAIN'	=> 'Here you are able to enter module specific settings.',
+
+	'HIDDEN_MODULE'			=> 'Hidden module',
+
+	'MODULE'					=> 'Module',
+	'MODULE_ADDED'				=> 'Module successfully added.',
+	'MODULE_DELETED'			=> 'Module successfully removed.',
+	'MODULE_DISPLAYED'			=> 'Module displayed',
+	'MODULE_DISPLAYED_EXPLAIN'	=> 'If you do not wish to display this module, but want to use it, set this to no.',
+	'MODULE_EDITED'				=> 'Module successfully edited.',
+	'MODULE_ENABLED'			=> 'Module enabled',
+	'MODULE_LANGNAME'			=> 'Module language name',
+	'MODULE_LANGNAME_EXPLAIN'	=> 'Enter the displayed module name. Use language constant if name is served from language file.',
+	'MODULE_TYPE'				=> 'Module type',
+
+	'NO_CATEGORY_TO_MODULE'	=> 'Unable to turn category into module. Please remove/move all children before performing this action.',
+	'NO_MODULE'				=> 'No module found.',
+	'NO_MODULE_ID'			=> 'No module id specified.',
+	'NO_MODULE_LANGNAME'	=> 'No module language name specified.',
+	'NO_PARENT'				=> 'No Parent',
+
+	'PARENT'				=> 'Parent',
+	'PARENT_NO_EXIST'		=> 'Parent does not exist.',
+
+	'SELECT_MODULE'			=> 'Select a module',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
new file mode 100644
index 0000000000..cf248cffdb
--- /dev/null
+++ b/phpBB/language/en/acp/permissions.php
@@ -0,0 +1,289 @@
+<?php
+/**
+*
+* acp_permissions [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ACP_PERMISSIONS_EXPLAIN'	=> '
+		<p>Permissions are highly granular and grouped into four major sections, which are:</p>
+
+		<h2>Global Permissions</h2>
+		<p>These are used to control access on a global level and apply to the entire bulletin board. They are further divided into Users’ Permissions, Groups’ Permissions, Administrators and Global Moderators.</p>
+
+		<h2>Forum Based Permissions</h2>
+		<p>These are used to control access on a per forum basis. They are further divided into Forum Permissions, Forum Moderators, Users’ Forum Permissions and Groups’ Forum Permissions.</p>
+
+		<h2>Permission Roles</h2>
+		<p>These are used to create different sets of permissions for the different permission types later being able to be assigned on a role-based basis. The default roles should cover the administration of bulletin boards large and small, though within each of the four divisions, you can add/edit/delete roles as you see fit.</p>
+
+		<h2>Permission Masks</h2>
+		<p>These are used to view the effective permissions assigned to Users, Moderators (Local and Global), Administrators or Forums.</p>
+
+		<br />
+
+		<p>For further information on setting up and managing permissions on your phpBB3 board, please see <a href="http://www.phpbb.com/support/documentation/3.0/quickstart/quick_permissions.html">Chapter 1.5 of our Quick Start Guide</a>.</p>
+	',
+
+	'ACL_NEVER'				=> 'Never',
+	'ACL_SET'				=> 'Setting permissions',
+	'ACL_SET_EXPLAIN'		=> 'Permissions are based on a simple <samp>YES</samp>/<samp>NO</samp> system. Setting an option to <samp>NEVER</samp> for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select <samp>NO</samp>. If values are assigned for this option elsewhere they will be used in preference, else <samp>NEVER</samp> is assumed. All objects marked (with the checkbox in front of them) will copy the permission set you defined.',
+	'ACL_SETTING'			=> 'Setting',
+
+	'ACL_TYPE_A_'			=> 'Administrative permissions',
+	'ACL_TYPE_F_'			=> 'Forum permissions',
+	'ACL_TYPE_M_'			=> 'Moderative permissions',
+	'ACL_TYPE_U_'			=> 'User permissions',
+
+	'ACL_TYPE_GLOBAL_A_'	=> 'Administrative permissions',
+	'ACL_TYPE_GLOBAL_U_'	=> 'User permissions',
+	'ACL_TYPE_GLOBAL_M_'	=> 'Global Moderator permissions',
+	'ACL_TYPE_LOCAL_M_'		=> 'Forum Moderator permissions',
+	'ACL_TYPE_LOCAL_F_'		=> 'Forum permissions',
+
+	'ACL_NO'				=> 'No',
+	'ACL_VIEW'				=> 'Viewing permissions',
+	'ACL_VIEW_EXPLAIN'		=> 'Here you can see the effective permissions the user/group is having. A red square indicates that the user/group does not have the permission, a green square indicates that the user/group does have the permission.',
+	'ACL_YES'				=> 'Yes',
+
+	'ACP_ADMINISTRATORS_EXPLAIN'				=> 'Here you can assign administrator permissions to users or groups. All users with administrator permissions can view the administration control panel.',
+	'ACP_FORUM_MODERATORS_EXPLAIN'				=> 'Here you can assign users and groups as forum moderators. To assign users access to forums, to define global moderative permissions or administrators please use the appropriate page.',
+	'ACP_FORUM_PERMISSIONS_EXPLAIN'				=> 'Here you can alter which users and groups can access which forums. To assign moderators or define administrators please use the appropriate page.',
+	'ACP_FORUM_PERMISSIONS_COPY_EXPLAIN'		=> 'Here you can copy forum permissions from one forum to one or more other forums.',
+	'ACP_GLOBAL_MODERATORS_EXPLAIN'				=> 'Here you can assign global moderator permissions to users or groups. These moderators are like ordinary moderators except they have access to every forum on your board.',
+	'ACP_GROUPS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to groups.',
+	'ACP_GROUPS_PERMISSIONS_EXPLAIN'			=> 'Here you can assign global permissions to groups - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. Individual users permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
+	'ACP_ADMIN_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
+	'ACP_FORUM_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
+	'ACP_MOD_ROLES_EXPLAIN'						=> 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
+	'ACP_USER_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
+	'ACP_USERS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to users.',
+	'ACP_USERS_PERMISSIONS_EXPLAIN'				=> 'Here you can assign global permissions to users - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. To alter these settings for large numbers of users the Group permissions system is the preferred method. User’s permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
+	'ACP_VIEW_ADMIN_PERMISSIONS_EXPLAIN'		=> 'Here you can view the effective administrative permissions assigned to the selected users/groups.',
+	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS_EXPLAIN'	=> 'Here you can view the global moderative permissions assigned to the selected users/groups.',
+	'ACP_VIEW_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can view the forum permissions assigned to the selected users/groups and forums.',
+	'ACP_VIEW_FORUM_MOD_PERMISSIONS_EXPLAIN'	=> 'Here you can view the forum moderator permissions assigned to the selected users/groups and forums.',
+	'ACP_VIEW_USER_PERMISSIONS_EXPLAIN'			=> 'Here you can view the effective user permissions assigned to the selected users/groups.',
+
+	'ADD_GROUPS'				=> 'Add groups',
+	'ADD_PERMISSIONS'			=> 'Add permissions',
+	'ADD_USERS'					=> 'Add users',
+	'ADVANCED_PERMISSIONS'		=> 'Advanced Permissions',
+	'ALL_GROUPS'				=> 'Select all groups',
+	'ALL_NEVER'					=> 'All <samp>NEVER</samp>',
+	'ALL_NO'					=> 'All <samp>NO</samp>',
+	'ALL_USERS'					=> 'Select all users',
+	'ALL_YES'					=> 'All <samp>YES</samp>',
+	'APPLY_ALL_PERMISSIONS'		=> 'Apply all permissions',
+	'APPLY_PERMISSIONS'			=> 'Apply permissions',
+	'APPLY_PERMISSIONS_EXPLAIN'	=> 'The permissions and role defined for this item will only be applied to this item and all checked items.',
+	'AUTH_UPDATED'				=> 'Permissions have been updated.',
+
+	'COPY_PERMISSIONS_CONFIRM'				=> 'Are you sure you wish to carry out this operation? Please be aware that this will overwrite any existing permissions on the selected targets.',
+	'COPY_PERMISSIONS_FORUM_FROM_EXPLAIN'	=> 'The source forum you want to copy permissions from.',
+	'COPY_PERMISSIONS_FORUM_TO_EXPLAIN'		=> 'The destination forums you want the copied permissions applied to.',
+	'COPY_PERMISSIONS_FROM'					=> 'Copy permissions from',
+	'COPY_PERMISSIONS_TO'					=> 'Apply permissions to',
+
+	'CREATE_ROLE'				=> 'Create role',
+	'CREATE_ROLE_FROM'			=> 'Use settings from…',
+	'CUSTOM'					=> 'Custom…',
+
+	'DEFAULT'					=> 'Default',
+	'DELETE_ROLE'				=> 'Delete role',
+	'DELETE_ROLE_CONFIRM'		=> 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> lose their permission settings.',
+	'DISPLAY_ROLE_ITEMS'		=> 'View items using this role',
+
+	'EDIT_PERMISSIONS'			=> 'Edit permissions',
+	'EDIT_ROLE'					=> 'Edit role',
+
+	'GROUPS_NOT_ASSIGNED'		=> 'No group assigned to this role',
+
+	'LOOK_UP_GROUP'				=> 'Look up usergroup',
+	'LOOK_UP_USER'				=> 'Look up user',
+
+	'MANAGE_GROUPS'		=> 'Manage groups',
+	'MANAGE_USERS'		=> 'Manage users',
+
+	'NO_AUTH_SETTING_FOUND'		=> 'Permission settings not defined.',
+	'NO_ROLE_ASSIGNED'			=> 'No role assigned…',
+	'NO_ROLE_ASSIGNED_EXPLAIN'	=> 'Setting to this role does not change permissions on the right. If you want to unset/remove all permissions you should use the “All <samp>NO</samp>” link.',
+	'NO_ROLE_AVAILABLE'			=> 'No role available',
+	'NO_ROLE_NAME_SPECIFIED'	=> 'Please give the role a name.',
+	'NO_ROLE_SELECTED'			=> 'Role could not be found.',
+	'NO_USER_GROUP_SELECTED'	=> 'You haven’t selected any user or group.',
+
+	'ONLY_FORUM_DEFINED'	=> 'You only defined forums in your selection. Please also select at least one user or one group.',
+
+	'PERMISSION_APPLIED_TO_ALL'		=> 'Permissions and role will also be applied to all checked objects',
+	'PLUS_SUBFORUMS'				=> '+Subforums',
+
+	'REMOVE_PERMISSIONS'			=> 'Remove permissions',
+	'REMOVE_ROLE'					=> 'Remove role',
+	'RESULTING_PERMISSION'			=> 'Resulting permission',
+	'ROLE'							=> 'Role',
+	'ROLE_ADD_SUCCESS'				=> 'Role successfully added.',
+	'ROLE_ASSIGNED_TO'				=> 'Users/Groups assigned to %s',
+	'ROLE_DELETED'					=> 'Role successfully removed.',
+	'ROLE_DESCRIPTION'				=> 'Role description',
+
+	'ROLE_ADMIN_FORUM'			=> 'Forum Admin',
+	'ROLE_ADMIN_FULL'			=> 'Full Admin',
+	'ROLE_ADMIN_STANDARD'		=> 'Standard Admin',
+	'ROLE_ADMIN_USERGROUP'		=> 'User and Groups Admin',
+	'ROLE_FORUM_BOT'			=> 'Bot Access',
+	'ROLE_FORUM_FULL'			=> 'Full Access',
+	'ROLE_FORUM_LIMITED'		=> 'Limited Access',
+	'ROLE_FORUM_LIMITED_POLLS'	=> 'Limited Access + Polls',
+	'ROLE_FORUM_NOACCESS'		=> 'No Access',
+	'ROLE_FORUM_ONQUEUE'		=> 'On Moderation Queue',
+	'ROLE_FORUM_POLLS'			=> 'Standard Access + Polls',
+	'ROLE_FORUM_READONLY'		=> 'Read Only Access',
+	'ROLE_FORUM_STANDARD'		=> 'Standard Access',
+	'ROLE_FORUM_NEW_MEMBER'		=> 'Newly registered User',
+	'ROLE_MOD_FULL'				=> 'Full Moderator',
+	'ROLE_MOD_QUEUE'			=> 'Queue Moderator',
+	'ROLE_MOD_SIMPLE'			=> 'Simple Moderator',
+	'ROLE_MOD_STANDARD'			=> 'Standard Moderator',
+	'ROLE_USER_FULL'			=> 'All Features',
+	'ROLE_USER_LIMITED'			=> 'Limited Features',
+	'ROLE_USER_NOAVATAR'		=> 'No Avatar',
+	'ROLE_USER_NOPM'			=> 'No Private Messages',
+	'ROLE_USER_STANDARD'		=> 'Standard Features',
+	'ROLE_USER_NEW_MEMBER'		=> 'Newly registered User',
+
+
+	'ROLE_DESCRIPTION_ADMIN_FORUM'			=> 'Can access the forum management and forum permission settings.',
+	'ROLE_DESCRIPTION_ADMIN_FULL'			=> 'Has access to all administrative functions of this board.<br />Not recommended.',
+	'ROLE_DESCRIPTION_ADMIN_STANDARD'		=> 'Has access to most administrative features but is not allowed to use server or system related tools.',
+	'ROLE_DESCRIPTION_ADMIN_USERGROUP'		=> 'Can manage groups and users: Able to change permissions, settings, manage bans, and manage ranks.',
+	'ROLE_DESCRIPTION_FORUM_BOT'			=> 'This role is recommended for bots and search spiders.',
+	'ROLE_DESCRIPTION_FORUM_FULL'			=> 'Can use all forum features, including posting of announcements and stickies. Can also ignore the flood limit.<br />Not recommended for normal users.',
+	'ROLE_DESCRIPTION_FORUM_LIMITED'		=> 'Can use some forum features, but cannot attach files or use post icons.',
+	'ROLE_DESCRIPTION_FORUM_LIMITED_POLLS'	=> 'As per Limited Access but can also create polls.',
+	'ROLE_DESCRIPTION_FORUM_NOACCESS'		=> 'Can neither see nor access the forum.',
+	'ROLE_DESCRIPTION_FORUM_ONQUEUE'		=> 'Can use most forum features including attachments, but posts and topics need to be approved by a moderator.',
+	'ROLE_DESCRIPTION_FORUM_POLLS'			=> 'Like Standard Access but can also create polls.',
+	'ROLE_DESCRIPTION_FORUM_READONLY'		=> 'Can read the forum, but cannot create new topics or reply to posts.',
+	'ROLE_DESCRIPTION_FORUM_STANDARD'		=> 'Can use most forum features including attachments and deleting own topics, but cannot lock own topics, and cannot create polls.',
+	'ROLE_DESCRIPTION_FORUM_NEW_MEMBER'		=> 'A role for members of the special newly registered users group; contains <samp>NEVER</samp> permissions to lock features for new users.',
+	'ROLE_DESCRIPTION_MOD_FULL'				=> 'Can use all moderating features, including banning.',
+	'ROLE_DESCRIPTION_MOD_QUEUE'			=> 'Can use the Moderation Queue to validate and edit posts, but nothing else.',
+	'ROLE_DESCRIPTION_MOD_SIMPLE'			=> 'Can only use basic topic actions. Cannot send warnings or use moderation queue.',
+	'ROLE_DESCRIPTION_MOD_STANDARD'			=> 'Can use most moderating tools, but cannot ban users or change the post author.',
+	'ROLE_DESCRIPTION_USER_FULL'			=> 'Can use all available forum features for users, including changing the user name or ignoring the flood limit.<br />Not recommended.',
+	'ROLE_DESCRIPTION_USER_LIMITED'			=> 'Can access some of the user features. Attachments, e-mails, or instant messages are not allowed.',
+	'ROLE_DESCRIPTION_USER_NOAVATAR'		=> 'Has a limited feature set and is not allowed to use the Avatar feature.',
+	'ROLE_DESCRIPTION_USER_NOPM'			=> 'Has a limited feature set, and is not allowed to use Private Messages.',
+	'ROLE_DESCRIPTION_USER_STANDARD'		=> 'Can access most but not all user features. Cannot change user name or ignore the flood limit, for instance.',
+	'ROLE_DESCRIPTION_USER_NEW_MEMBER'		=> 'A role for members of the special newly registered users group; contains <samp>NEVER</samp> permissions to lock features for new users.',
+
+	'ROLE_DESCRIPTION_EXPLAIN'		=> 'You are able to enter a short explanation of what the role is doing or for what it is meant for. The text you enter here will be displayed within the permissions screens too.',
+	'ROLE_DESCRIPTION_LONG'			=> 'The role description is too long, please limit it to 4000 characters.',
+	'ROLE_DETAILS'					=> 'Role details',
+	'ROLE_EDIT_SUCCESS'				=> 'Role successfully edited.',
+	'ROLE_NAME'						=> 'Role name',
+	'ROLE_NAME_ALREADY_EXIST'		=> 'A role named <strong>%s</strong> already exist for the specified permission type.',
+	'ROLE_NOT_ASSIGNED'				=> 'Role has not been assigned yet.',
+
+	'SELECTED_FORUM_NOT_EXIST'		=> 'The selected forum(s) do not exist.',
+	'SELECTED_GROUP_NOT_EXIST'		=> 'The selected group(s) do not exist.',
+	'SELECTED_USER_NOT_EXIST'		=> 'The selected user(s) do not exist.',
+	'SELECT_FORUM_SUBFORUM_EXPLAIN'	=> 'The forum you select here will include all subforums into the selection.',
+	'SELECT_ROLE'					=> 'Select role…',
+	'SELECT_TYPE'					=> 'Select type',
+	'SET_PERMISSIONS'				=> 'Set permissions',
+	'SET_ROLE_PERMISSIONS'			=> 'Set role permissions',
+	'SET_USERS_PERMISSIONS'			=> 'Set users permissions',
+	'SET_USERS_FORUM_PERMISSIONS'	=> 'Set users forum permissions',
+
+	'TRACE_DEFAULT'					=> 'By default every permission is <samp>NO</samp> (unset). So the permission can be overwritten by other settings.',
+	'TRACE_FOR'						=> 'Trace for',
+	'TRACE_GLOBAL_SETTING'			=> '%s (global)',
+	'TRACE_GROUP_NEVER_TOTAL_NEVER'	=> 'This group’s permission is set to <samp>NEVER</samp> like the total result so the old result is kept.',
+	'TRACE_GROUP_NEVER_TOTAL_NEVER_LOCAL'	=> 'This group’s permission for this forum is set to <samp>NEVER</samp> like the total result so the old result is kept.',
+	'TRACE_GROUP_NEVER_TOTAL_NO'	=> 'This group’s permission is set to <samp>NEVER</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
+	'TRACE_GROUP_NEVER_TOTAL_NO_LOCAL'	=> 'This group’s permission for this forum is set to <samp>NEVER</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
+	'TRACE_GROUP_NEVER_TOTAL_YES'	=> 'This group’s permission is set to <samp>NEVER</samp> which overwrites the total <samp>YES</samp> to a <samp>NEVER</samp> for this user.',
+	'TRACE_GROUP_NEVER_TOTAL_YES_LOCAL'	=> 'This group’s permission for this forum is set to <samp>NEVER</samp> which overwrites the total <samp>YES</samp> to a <samp>NEVER</samp> for this user.',
+	'TRACE_GROUP_NO'				=> 'The permission is <samp>NO</samp> for this group so the old total value is kept.',
+	'TRACE_GROUP_NO_LOCAL'			=> 'The permission is <samp>NO</samp> for this group within this forum so the old total value is kept.',
+	'TRACE_GROUP_YES_TOTAL_NEVER'	=> 'This group’s permission is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
+	'TRACE_GROUP_YES_TOTAL_NEVER_LOCAL'	=> 'This group’s permission for this forum is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
+	'TRACE_GROUP_YES_TOTAL_NO'		=> 'This group’s permission is set to <samp>YES</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
+	'TRACE_GROUP_YES_TOTAL_NO_LOCAL'	=> 'This group’s permission for this forum is set to <samp>YES</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
+	'TRACE_GROUP_YES_TOTAL_YES'		=> 'This group’s permission is set to <samp>YES</samp> and the total permission is already set to <samp>YES</samp>, so the total result is kept.',
+	'TRACE_GROUP_YES_TOTAL_YES_LOCAL'	=> 'This group’s permission for this forum is set to <samp>YES</samp> and the total permission is already set to <samp>YES</samp>, so the total result is kept.',
+	'TRACE_PERMISSION'				=> 'Trace permission - %s',
+	'TRACE_RESULT'					=> 'Trace result',
+	'TRACE_SETTING'					=> 'Trace setting',
+
+	'TRACE_USER_GLOBAL_YES_TOTAL_YES'		=> 'The forum independent user permission evaluates to <samp>YES</samp> but the total permission is already set to <samp>YES</samp>, so the total result is kept. %sTrace global permission%s',
+	'TRACE_USER_GLOBAL_YES_TOTAL_NEVER'		=> 'The forum independent user permission evaluates to <samp>YES</samp> which overwrites the current local result <samp>NEVER</samp>. %sTrace global permission%s',
+	'TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT'	=> 'The forum independent user permission evaluates to <samp>NEVER</samp> which doesn’t influence the local permission. %sTrace global permission%s',
+
+	'TRACE_USER_FOUNDER'					=> 'The user is a founder, therefore admin permissions are always set to <samp>YES</samp>.',
+	'TRACE_USER_KEPT'						=> 'The user’s permission is <samp>NO</samp> so the old total value is kept.',
+	'TRACE_USER_KEPT_LOCAL'					=> 'The user’s permission for this forum is <samp>NO</samp> so the old total value is kept.',
+	'TRACE_USER_NEVER_TOTAL_NEVER'			=> 'The user’s permission is set to <samp>NEVER</samp> and the total value is set to <samp>NEVER</samp>, so nothing is changed.',
+	'TRACE_USER_NEVER_TOTAL_NEVER_LOCAL'	=> 'The user’s permission for this forum is set to <samp>NEVER</samp> and the total value is set to <samp>NEVER</samp>, so nothing is changed.',
+	'TRACE_USER_NEVER_TOTAL_NO'				=> 'The user’s permission is set to <samp>NEVER</samp> which becomes the total value because it was set to NO.',
+	'TRACE_USER_NEVER_TOTAL_NO_LOCAL'		=> 'The user’s permission for this forum is set to <samp>NEVER</samp> which becomes the total value because it was set to NO.',
+	'TRACE_USER_NEVER_TOTAL_YES'			=> 'The user’s permission is set to <samp>NEVER</samp> and overwrites the previous <samp>YES</samp>.',
+	'TRACE_USER_NEVER_TOTAL_YES_LOCAL'		=> 'The user’s permission for this forum is set to <samp>NEVER</samp> and overwrites the previous <samp>YES</samp>.',
+	'TRACE_USER_NO_TOTAL_NO'				=> 'The user’s permission is <samp>NO</samp> and the total value was set to NO so it defaults to <samp>NEVER</samp>.',
+	'TRACE_USER_NO_TOTAL_NO_LOCAL'			=> 'The user’s permission for this forum is <samp>NO</samp> and the total value was set to NO so it defaults to <samp>NEVER</samp>.',
+	'TRACE_USER_YES_TOTAL_NEVER'			=> 'The user’s permission is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
+	'TRACE_USER_YES_TOTAL_NEVER_LOCAL'		=> 'The user’s permission for this forum is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
+	'TRACE_USER_YES_TOTAL_NO'				=> 'The user’s permission is set to <samp>YES</samp> which becomes the total value because it was set to <samp>NO</samp>.',
+	'TRACE_USER_YES_TOTAL_NO_LOCAL'			=> 'The user’s permission for this forum is set to <samp>YES</samp> which becomes the total value because it was set to <samp>NO</samp>.',
+	'TRACE_USER_YES_TOTAL_YES'				=> 'The user’s permission is set to <samp>YES</samp> and the total value is set to <samp>YES</samp>, so nothing is changed.',
+	'TRACE_USER_YES_TOTAL_YES_LOCAL'		=> 'The user’s permission for this forum is set to <samp>YES</samp> and the total value is set to <samp>YES</samp>, so nothing is changed.',
+	'TRACE_WHO'								=> 'Who',
+	'TRACE_TOTAL'							=> 'Total',
+
+	'USERS_NOT_ASSIGNED'			=> 'No user assigned to this role',
+	'USER_IS_MEMBER_OF_DEFAULT'		=> 'is a member of the following pre-defined groups',
+	'USER_IS_MEMBER_OF_CUSTOM'		=> 'is a member of the following user defined groups',
+
+	'VIEW_ASSIGNED_ITEMS'	=> 'View assigned items',
+	'VIEW_LOCAL_PERMS'		=> 'Local permissions',
+	'VIEW_GLOBAL_PERMS'		=> 'Global permissions',
+	'VIEW_PERMISSIONS'		=> 'View permissions',
+
+	'WRONG_PERMISSION_TYPE'				=> 'Wrong permission type selected.',
+	'WRONG_PERMISSION_SETTING_FORMAT'	=> 'The permission settings are in a wrong format, phpBB is not able to process them correctly.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
new file mode 100644
index 0000000000..945a675861
--- /dev/null
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -0,0 +1,241 @@
+<?php
+/**
+* acp_permissions_phpbb (phpBB Permission Set) [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+/**
+*	MODDERS PLEASE NOTE
+*
+*	You are able to put your permission sets into a separate file too by
+*	prefixing the new file with permissions_ and putting it into the acp
+*	language folder.
+*
+*	An example of how the file could look like:
+*
+*	<code>
+*
+*	if (empty($lang) || !is_array($lang))
+*	{
+*		$lang = array();
+*	}
+*
+*	// Adding new category
+*	$lang['permission_cat']['bugs'] = 'Bugs';
+*
+*	// Adding new permission set
+*	$lang['permission_type']['bug_'] = 'Bug Permissions';
+*
+*	// Adding the permissions
+*	$lang = array_merge($lang, array(
+*		'acl_bug_view'		=> array('lang' => 'Can view bug reports', 'cat' => 'bugs'),
+*		'acl_bug_post'		=> array('lang' => 'Can post bugs', 'cat' => 'post'), // Using a phpBB category here
+*	));
+*
+*	</code>
+*/
+
+// Define categories and permission types
+$lang = array_merge($lang, array(
+	'permission_cat'	=> array(
+		'actions'		=> 'Actions',
+		'content'		=> 'Content',
+		'forums'		=> 'Forums',
+		'misc'			=> 'Misc',
+		'permissions'	=> 'Permissions',
+		'pm'			=> 'Private messages',
+		'polls'			=> 'Polls',
+		'post'			=> 'Post',
+		'post_actions'	=> 'Post actions',
+		'posting'		=> 'Posting',
+		'profile'		=> 'Profile',
+		'settings'		=> 'Settings',
+		'topic_actions'	=> 'Topic actions',
+		'user_group'	=> 'Users &amp; Groups',
+	),
+
+	// With defining 'global' here we are able to specify what is printed out if the permission is within the global scope.
+	'permission_type'	=> array(
+		'u_'			=> 'User permissions',
+		'a_'			=> 'Admin permissions',
+		'm_'			=> 'Moderator permissions',
+		'f_'			=> 'Forum permissions',
+		'global'		=> array(
+			'm_'			=> 'Global moderator permissions',
+		),
+	),
+));
+
+// User Permissions
+$lang = array_merge($lang, array(
+	'acl_u_viewprofile'	=> array('lang' => 'Can view profiles, memberlist and online list', 'cat' => 'profile'),
+	'acl_u_chgname'		=> array('lang' => 'Can change username', 'cat' => 'profile'),
+	'acl_u_chgpasswd'	=> array('lang' => 'Can change password', 'cat' => 'profile'),
+	'acl_u_chgemail'	=> array('lang' => 'Can change e-mail address', 'cat' => 'profile'),
+	'acl_u_chgavatar'	=> array('lang' => 'Can change avatar', 'cat' => 'profile'),
+	'acl_u_chggrp'		=> array('lang' => 'Can change default usergroup', 'cat' => 'profile'),
+
+	'acl_u_attach'		=> array('lang' => 'Can attach files', 'cat' => 'post'),
+	'acl_u_download'	=> array('lang' => 'Can download files', 'cat' => 'post'),
+	'acl_u_savedrafts'	=> array('lang' => 'Can save drafts', 'cat' => 'post'),
+	'acl_u_chgcensors'	=> array('lang' => 'Can disable word censors', 'cat' => 'post'),
+	'acl_u_sig'			=> array('lang' => 'Can use signature', 'cat' => 'post'),
+
+	'acl_u_sendpm'		=> array('lang' => 'Can send private messages', 'cat' => 'pm'),
+	'acl_u_masspm'		=> array('lang' => 'Can send messages to multiple users', 'cat' => 'pm'),
+	'acl_u_masspm_group'=> array('lang' => 'Can send messages to groups', 'cat' => 'pm'),
+	'acl_u_readpm'		=> array('lang' => 'Can read private messages', 'cat' => 'pm'),
+	'acl_u_pm_edit'		=> array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
+	'acl_u_pm_delete'	=> array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),
+	'acl_u_pm_forward'	=> array('lang' => 'Can forward private messages', 'cat' => 'pm'),
+	'acl_u_pm_emailpm'	=> array('lang' => 'Can e-mail private messages', 'cat' => 'pm'),
+	'acl_u_pm_printpm'	=> array('lang' => 'Can print private messages', 'cat' => 'pm'),
+	'acl_u_pm_attach'	=> array('lang' => 'Can attach files in private messages', 'cat' => 'pm'),
+	'acl_u_pm_download'	=> array('lang' => 'Can download files in private messages', 'cat' => 'pm'),
+	'acl_u_pm_bbcode'	=> array('lang' => 'Can use BBCode in private messages', 'cat' => 'pm'),
+	'acl_u_pm_smilies'	=> array('lang' => 'Can use smilies in private messages', 'cat' => 'pm'),
+	'acl_u_pm_img'		=> array('lang' => 'Can use [img] BBCode tag in private messages', 'cat' => 'pm'),
+	'acl_u_pm_flash'	=> array('lang' => 'Can use [flash] BBCode tag in private messages', 'cat' => 'pm'),
+
+	'acl_u_sendemail'	=> array('lang' => 'Can send e-mails', 'cat' => 'misc'),
+	'acl_u_sendim'		=> array('lang' => 'Can send instant messages', 'cat' => 'misc'),
+	'acl_u_ignoreflood'	=> array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
+	'acl_u_hideonline'	=> array('lang' => 'Can hide online status', 'cat' => 'misc'),
+	'acl_u_viewonline'	=> array('lang' => 'Can view hidden online users', 'cat' => 'misc'),
+	'acl_u_search'		=> array('lang' => 'Can search board', 'cat' => 'misc'),
+));
+
+// Forum Permissions
+$lang = array_merge($lang, array(
+	'acl_f_list'		=> array('lang' => 'Can see forum', 'cat' => 'post'),
+	'acl_f_read'		=> array('lang' => 'Can read forum', 'cat' => 'post'),
+	'acl_f_post'		=> array('lang' => 'Can start new topics', 'cat' => 'post'),
+	'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
+	'acl_f_icons'		=> array('lang' => 'Can use topic/post icons', 'cat' => 'post'),
+	'acl_f_announce'	=> array('lang' => 'Can post announcements', 'cat' => 'post'),
+	'acl_f_sticky'		=> array('lang' => 'Can post stickies', 'cat' => 'post'),
+
+	'acl_f_poll'		=> array('lang' => 'Can create polls', 'cat' => 'polls'),
+	'acl_f_vote'		=> array('lang' => 'Can vote in polls', 'cat' => 'polls'),
+	'acl_f_votechg'		=> array('lang' => 'Can change existing vote', 'cat' => 'polls'),
+
+	'acl_f_attach'		=> array('lang' => 'Can attach files', 'cat' => 'content'),
+	'acl_f_download'	=> array('lang' => 'Can download files', 'cat' => 'content'),
+	'acl_f_sigs'		=> array('lang' => 'Can use signatures', 'cat' => 'content'),
+	'acl_f_bbcode'		=> array('lang' => 'Can use BBCode', 'cat' => 'content'),
+	'acl_f_smilies'		=> array('lang' => 'Can use smilies', 'cat' => 'content'),
+	'acl_f_img'			=> array('lang' => 'Can use [img] BBCode tag', 'cat' => 'content'),
+	'acl_f_flash'		=> array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'),
+
+	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'actions'),
+	'acl_f_delete'		=> array('lang' => 'Can delete own posts', 'cat' => 'actions'),
+	'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
+	'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
+	'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
+	'acl_f_subscribe'	=> array('lang' => 'Can subscribe forum', 'cat' => 'actions'),
+	'acl_f_print'		=> array('lang' => 'Can print topics', 'cat' => 'actions'),
+	'acl_f_email'		=> array('lang' => 'Can e-mail topics', 'cat' => 'actions'),
+
+	'acl_f_search'		=> array('lang' => 'Can search the forum', 'cat' => 'misc'),
+	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
+	'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'misc'),
+	'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'misc'),
+));
+
+// Moderator Permissions
+$lang = array_merge($lang, array(
+	'acl_m_edit'		=> array('lang' => 'Can edit posts', 'cat' => 'post_actions'),
+	'acl_m_delete'		=> array('lang' => 'Can delete posts', 'cat' => 'post_actions'),
+	'acl_m_approve'		=> array('lang' => 'Can approve posts', 'cat' => 'post_actions'),
+	'acl_m_report'		=> array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
+	'acl_m_chgposter'	=> array('lang' => 'Can change post author', 'cat' => 'post_actions'),
+
+	'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
+	'acl_m_lock'	=> array('lang' => 'Can lock topics', 'cat' => 'topic_actions'),
+	'acl_m_split'	=> array('lang' => 'Can split topics', 'cat' => 'topic_actions'),
+	'acl_m_merge'	=> array('lang' => 'Can merge topics', 'cat' => 'topic_actions'),
+
+	'acl_m_info'	=> array('lang' => 'Can view post details', 'cat' => 'misc'),
+	'acl_m_warn'	=> array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
+	'acl_m_ban'		=> array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
+));
+
+// Admin Permissions
+$lang = array_merge($lang, array(
+	'acl_a_board'		=> array('lang' => 'Can alter board settings/check for updates', 'cat' => 'settings'),
+	'acl_a_server'		=> array('lang' => 'Can alter server/communication settings', 'cat' => 'settings'),
+	'acl_a_jabber'		=> array('lang' => 'Can alter Jabber settings', 'cat' => 'settings'),
+	'acl_a_phpinfo'		=> array('lang' => 'Can view php settings', 'cat' => 'settings'),
+
+	'acl_a_forum'		=> array('lang' => 'Can manage forums', 'cat' => 'forums'),
+	'acl_a_forumadd'	=> array('lang' => 'Can add new forums', 'cat' => 'forums'),
+	'acl_a_forumdel'	=> array('lang' => 'Can delete forums', 'cat' => 'forums'),
+	'acl_a_prune'		=> array('lang' => 'Can prune forums', 'cat' => 'forums'),
+
+	'acl_a_icons'		=> array('lang' => 'Can alter topic/post icons and smilies', 'cat' => 'posting'),
+	'acl_a_words'		=> array('lang' => 'Can alter word censors', 'cat' => 'posting'),
+	'acl_a_bbcode'		=> array('lang' => 'Can define BBCode tags', 'cat' => 'posting'),
+	'acl_a_attach'		=> array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'),
+
+	'acl_a_user'		=> array('lang' => 'Can manage users<br /><em>This also includes seeing the users browser agent within the viewonline list.</em>', 'cat' => 'user_group'),
+	'acl_a_userdel'		=> array('lang' => 'Can delete/prune users', 'cat' => 'user_group'),
+	'acl_a_group'		=> array('lang' => 'Can manage groups', 'cat' => 'user_group'),
+	'acl_a_groupadd'	=> array('lang' => 'Can add new groups', 'cat' => 'user_group'),
+	'acl_a_groupdel'	=> array('lang' => 'Can delete groups', 'cat' => 'user_group'),
+	'acl_a_ranks'		=> array('lang' => 'Can manage ranks', 'cat' => 'user_group'),
+	'acl_a_profile'		=> array('lang' => 'Can manage custom profile fields', 'cat' => 'user_group'),
+	'acl_a_names'		=> array('lang' => 'Can manage disallowed names', 'cat' => 'user_group'),
+	'acl_a_ban'			=> array('lang' => 'Can manage bans', 'cat' => 'user_group'),
+
+	'acl_a_viewauth'	=> array('lang' => 'Can view permission masks', 'cat' => 'permissions'),
+	'acl_a_authgroups'	=> array('lang' => 'Can alter permissions for individual groups', 'cat' => 'permissions'),
+	'acl_a_authusers'	=> array('lang' => 'Can alter permissions for individual users', 'cat' => 'permissions'),
+	'acl_a_fauth'		=> array('lang' => 'Can alter forum permission class', 'cat' => 'permissions'),
+	'acl_a_mauth'		=> array('lang' => 'Can alter moderator permission class', 'cat' => 'permissions'),
+	'acl_a_aauth'		=> array('lang' => 'Can alter admin permission class', 'cat' => 'permissions'),
+	'acl_a_uauth'		=> array('lang' => 'Can alter user permission class', 'cat' => 'permissions'),
+	'acl_a_roles'		=> array('lang' => 'Can manage roles', 'cat' => 'permissions'),
+	'acl_a_switchperm'	=> array('lang' => 'Can use others permissions', 'cat' => 'permissions'),
+
+	'acl_a_styles'		=> array('lang' => 'Can manage styles', 'cat' => 'misc'),
+	'acl_a_viewlogs'	=> array('lang' => 'Can view logs', 'cat' => 'misc'),
+	'acl_a_clearlogs'	=> array('lang' => 'Can clear logs', 'cat' => 'misc'),
+	'acl_a_modules'		=> array('lang' => 'Can manage modules', 'cat' => 'misc'),
+	'acl_a_language'	=> array('lang' => 'Can manage language packs', 'cat' => 'misc'),
+	'acl_a_email'		=> array('lang' => 'Can send mass e-mail', 'cat' => 'misc'),
+	'acl_a_bots'		=> array('lang' => 'Can manage bots', 'cat' => 'misc'),
+	'acl_a_reasons'		=> array('lang' => 'Can manage report/denial reasons', 'cat' => 'misc'),
+	'acl_a_backup'		=> array('lang' => 'Can backup/restore database', 'cat' => 'misc'),
+	'acl_a_search'		=> array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'),
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
new file mode 100644
index 0000000000..531e07f7ef
--- /dev/null
+++ b/phpBB/language/en/acp/posting.php
@@ -0,0 +1,276 @@
+<?php
+/**
+*
+* acp_posting [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+// BBCodes
+// Note to translators: you can translate everything but what's between { and }
+$lang = array_merge($lang, array(
+	'ACP_BBCODES_EXPLAIN'		=> 'BBCode is a special implementation of HTML offering greater control over what and how something is displayed. From this page you can add, remove and edit custom BBCodes.',
+	'ADD_BBCODE'				=> 'Add a new BBCode',
+
+	'BBCODE_ADDED'				=> 'BBCode added successfully.',
+	'BBCODE_EDITED'				=> 'BBCode edited successfully.',
+	'BBCODE_NOT_EXIST'			=> 'The BBCode you selected does not exist.',
+	'BBCODE_HELPLINE'			=> 'Help line',
+	'BBCODE_HELPLINE_EXPLAIN'	=> 'This field contains the mouse over text of the BBCode.',
+	'BBCODE_HELPLINE_TEXT'		=> 'Help line text',
+	'BBCODE_HELPLINE_TOO_LONG'	=> 'The help line you entered is too long.',
+
+	'BBCODE_INVALID_TAG_NAME'	=> 'The BBCode tag name that you selected already exists.',
+	'BBCODE_INVALID'			=> 'Your BBCode is constructed in an invalid form.',
+	'BBCODE_OPEN_ENDED_TAG'		=> 'Your custom BBCode must contain both an opening and a closing tag.',
+	'BBCODE_TAG'				=> 'Tag',
+	'BBCODE_TAG_TOO_LONG'		=> 'The tag name you selected is too long.',
+	'BBCODE_TAG_DEF_TOO_LONG'	=> 'The tag definition that you have entered is too long, please shorten your tag definition.',
+	'BBCODE_USAGE'				=> 'BBCode usage',
+	'BBCODE_USAGE_EXAMPLE'		=> '[highlight={COLOR}]{TEXT}[/highlight]<br /><br />[font={SIMPLETEXT1}]{SIMPLETEXT2}[/font]',
+	'BBCODE_USAGE_EXPLAIN'		=> 'Here you define how to use the BBCode. Replace any variable input by the corresponding token (%ssee below%s).',
+
+	'EXAMPLE'						=> 'Example:',
+	'EXAMPLES'						=> 'Examples:',
+
+	'HTML_REPLACEMENT'				=> 'HTML replacement',
+	'HTML_REPLACEMENT_EXAMPLE'		=> '&lt;span style="background-color: {COLOR};"&gt;{TEXT}&lt;/span&gt;<br /><br />&lt;span style="font-family: {SIMPLETEXT1};"&gt;{SIMPLETEXT2}&lt;/span&gt;',
+	'HTML_REPLACEMENT_EXPLAIN'		=> 'Here you define the default HTML replacement. Do not forget to put back tokens you used above!',
+
+	'TOKEN'					=> 'Token',
+	'TOKENS'				=> 'Tokens',
+	'TOKENS_EXPLAIN'		=> 'Tokens are placeholders for user input. The input will be validated only if it matches the corresponding definition. If needed, you can number them by adding a number as the last character between the braces, e.g. {TEXT1}, {TEXT2}.<br /><br />Within the HTML replacement you can also use any language string present in your language/ directory like this: {L_<em>&lt;STRINGNAME&gt;</em>} where <em>&lt;STRINGNAME&gt;</em> is the name of the translated string you want to add. For example, {L_WROTE} will be displayed as “wrote” or its translation according to user’s locale.<br /><br /><strong>Please note that only tokens listed below are able to be used within custom BBCodes.</strong>',
+	'TOKEN_DEFINITION'		=> 'What can it be?',
+	'TOO_MANY_BBCODES'		=> 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.',
+
+	'tokens'	=>	array(
+		'TEXT'			=> 'Any text, including foreign characters, numbers, etc… You should not use this token in HTML tags. Instead try to use IDENTIFIER or SIMPLETEXT.',
+		'SIMPLETEXT'	=> 'Characters from the latin alphabet (A-Z), numbers, spaces, commas, dots, minus, plus, hyphen and underscore',
+		'IDENTIFIER'	=> 'Characters from the latin alphabet (A-Z), numbers, hyphen and underscore',
+		'NUMBER'		=> 'Any series of digits',
+		'EMAIL'			=> 'A valid e-mail address',
+		'URL'			=> 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, “http://” is prefixed to the string.',
+		'LOCAL_URL'		=> 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol.',
+		'COLOR'			=> 'A HTML colour, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>'
+	)
+));
+
+// Smilies and topic icons
+$lang = array_merge($lang, array(
+	'ACP_ICONS_EXPLAIN'		=> 'From this page you can add, remove and edit the icons users may add to their topics or posts. These icons are generally displayed next to topic titles on the forum listing, or the post subjects in topic listings. You can also install and create new packages of icons.',
+	'ACP_SMILIES_EXPLAIN'	=> 'Smilies or emoticons are typically small, sometimes animated images used to convey an emotion or feeling. From this page you can add, remove and edit the emoticons users can use in their posts and private messages. You can also install and create new packages of smilies.',
+	'ADD_SMILIES'			=> 'Add multiple smilies',
+	'ADD_SMILEY_CODE'		=> 'Add additional smiley code',
+	'ADD_ICONS'				=> 'Add multiple icons',
+	'AFTER_ICONS'			=> 'After %s',
+	'AFTER_SMILIES'			=> 'After %s',
+
+	'CODE'						=> 'Code',
+	'CURRENT_ICONS'				=> 'Current icons',
+	'CURRENT_ICONS_EXPLAIN'		=> 'Choose what to do with the currently installed icons.',
+	'CURRENT_SMILIES'			=> 'Current smilies',
+	'CURRENT_SMILIES_EXPLAIN'	=> 'Choose what to do with the currently installed smilies.',
+
+	'DISPLAY_ON_POSTING'		=> 'Display on posting page',
+	'DISPLAY_POSTING'			=> 'On posting page',
+	'DISPLAY_POSTING_NO'		=> 'Not on posting page',
+
+
+
+	'EDIT_ICONS'				=> 'Edit icons',
+	'EDIT_SMILIES'				=> 'Edit smilies',
+	'EMOTION'					=> 'Emotion',
+	'EXPORT_ICONS'				=> 'Export and download icons.pak',
+	'EXPORT_ICONS_EXPLAIN'		=> '%sOn clicking this link, the configuration for your installed icons will be packaged into <samp>icons.pak</samp> which once downloaded can be used to create a <samp>.zip</samp> or <samp>.tgz</samp> file containing all of your icons plus this <samp>icons.pak</samp> configuration file%s.',
+	'EXPORT_SMILIES'			=> 'Export and download smilies.pak',
+	'EXPORT_SMILIES_EXPLAIN'	=> '%sOn clicking this link, the configuration for your installed smilies will be packaged into <samp>smilies.pak</samp> which once downloaded can be used to create a <samp>.zip</samp> or <samp>.tgz</samp> file containing all of your smilies plus this <samp>smilies.pak</samp> configuration file%s.',
+
+	'FIRST'			=> 'First',
+
+	'ICONS_ADD'				=> 'Add a new icon',
+	'ICONS_NONE_ADDED'		=> 'No icons were added.',
+	'ICONS_ONE_ADDED'		=> 'The icon has been added successfully.',
+	'ICONS_ADDED'			=> 'The icons have been added successfully.',
+	'ICONS_CONFIG'			=> 'Icon configuration',
+	'ICONS_DELETED'			=> 'The icon has been removed successfully.',
+	'ICONS_EDIT'			=> 'Edit icon',
+	'ICONS_ONE_EDITED'		=> 'The icon has been updated successfully.',
+	'ICONS_NONE_EDITED'		=> 'No icons were updated.',
+	'ICONS_EDITED'			=> 'The icons have been updated successfully.',
+	'ICONS_HEIGHT'			=> 'Icon height',
+	'ICONS_IMAGE'			=> 'Icon image',
+	'ICONS_IMPORTED'		=> 'The icons pack has been installed successfully.',
+	'ICONS_IMPORT_SUCCESS'	=> 'The icons pack was imported successfully.',
+	'ICONS_LOCATION'		=> 'Icon location',
+	'ICONS_NOT_DISPLAYED'	=> 'The following icons are not displayed on the posting page',
+	'ICONS_ORDER'			=> 'Icon order',
+	'ICONS_URL'				=> 'Icon image file',
+	'ICONS_WIDTH'			=> 'Icon width',
+	'IMPORT_ICONS'			=> 'Install icons package',
+	'IMPORT_SMILIES'		=> 'Install smilies package',
+
+	'KEEP_ALL'			=> 'Keep all',
+
+	'MASS_ADD_SMILIES'	=> 'Add multiple smilies',
+
+	'NO_ICONS_ADD'		=> 'There are no icons available for adding.',
+	'NO_ICONS_EDIT'		=> 'There are no icons available for modifying.',
+	'NO_ICONS_EXPORT'	=> 'You have no icons with which to create a package.',
+	'NO_ICONS_PAK'		=> 'No icon packages found.',
+	'NO_SMILIES_ADD'	=> 'There are no smilies available for adding.',
+	'NO_SMILIES_EDIT'	=> 'There are no smilies available for modifying.',
+	'NO_SMILIES_EXPORT'	=> 'You have no smilies with which to create a package.',
+	'NO_SMILIES_PAK'	=> 'No smiley packages found.',
+
+	'PAK_FILE_NOT_READABLE'		=> 'Could not read <samp>.pak</samp> file.',
+
+	'REPLACE_MATCHES'	=> 'Replace matches',
+
+	'SELECT_PACKAGE'			=> 'Select a package file',
+	'SMILIES_ADD'				=> 'Add a new smiley',
+	'SMILIES_NONE_ADDED'		=> 'No smilies were added.',
+	'SMILIES_ONE_ADDED'			=> 'The smiley has been added successfully.',
+	'SMILIES_ADDED'				=> 'The smilies have been added successfully.',
+	'SMILIES_CODE'				=> 'Smiley code',
+	'SMILIES_CONFIG'			=> 'Smiley configuration',
+	'SMILIES_DELETED'			=> 'The smiley has been removed successfully.',
+	'SMILIES_EDIT'				=> 'Edit smiley',
+	'SMILIE_NO_CODE'			=> 'The smilie “%s”  was ignored, as there was no code entered.',
+	'SMILIE_NO_EMOTION'			=> 'The smilie “%s” was ignored, as there was no emotion entered.',
+	'SMILIES_NONE_EDITED'		=> 'No smilies were updated.',
+	'SMILIES_ONE_EDITED'		=> 'The smiley has been updated successfully.',
+	'SMILIES_EDITED'			=> 'The smilies have been updated successfully.',
+	'SMILIES_EMOTION'			=> 'Emotion',
+	'SMILIES_HEIGHT'			=> 'Smiley height',
+	'SMILIES_IMAGE'				=> 'Smiley image',
+	'SMILIES_IMPORTED'			=> 'The smilies pack has been installed successfully.',
+	'SMILIES_IMPORT_SUCCESS'	=> 'The smilies pack was imported successfully.',
+	'SMILIES_LOCATION'			=> 'Smiley location',
+	'SMILIES_NOT_DISPLAYED'		=> 'The following smilies are not displayed on the posting page',
+	'SMILIES_ORDER'				=> 'Smiley order',
+	'SMILIES_URL'				=> 'Smiley image file',
+	'SMILIES_WIDTH'				=> 'Smiley width',
+
+	'TOO_MANY_SMILIES'			=> 'Limit of %d smilies reached.',
+
+	'WRONG_PAK_TYPE'	=> 'The specified package does not contain the appropriate data.',
+));
+
+// Word censors
+$lang = array_merge($lang, array(
+	'ACP_WORDS_EXPLAIN'		=> 'From this control panel you can add, edit, and remove words that will be automatically censored on your forums. People are still allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, e.g. *test* will match detestable, test* would match testing, *test would match detest.',
+	'ADD_WORD'				=> 'Add new word',
+
+	'EDIT_WORD'		=> 'Edit word censor',
+	'ENTER_WORD'	=> 'You must enter a word and its replacement.',
+
+	'NO_WORD'	=> 'No word selected for editing.',
+
+	'REPLACEMENT'	=> 'Replacement',
+
+	'UPDATE_WORD'	=> 'Update word censor',
+
+	'WORD'				=> 'Word',
+	'WORD_ADDED'		=> 'The word censor has been successfully added.',
+	'WORD_REMOVED'		=> 'The selected word censor has been successfully removed.',
+	'WORD_UPDATED'		=> 'The selected word censor has been successfully updated.',
+));
+
+// Ranks
+$lang = array_merge($lang, array(
+	'ACP_RANKS_EXPLAIN'		=> 'Using this form you can add, edit, view and delete ranks. You can also create special ranks which can be applied to a user via the user management facility.',
+	'ADD_RANK'				=> 'Add new rank',
+
+	'MUST_SELECT_RANK'		=> 'You must select a rank.',
+
+	'NO_ASSIGNED_RANK'		=> 'No special rank assigned.',
+	'NO_RANK_TITLE'			=> 'You haven’t specified a title for the rank.',
+	'NO_UPDATE_RANKS'		=> 'The rank was successfully deleted. However user accounts using this rank were not updated. You will need to manually reset the rank on these accounts.',
+
+	'RANK_ADDED'			=> 'The rank was successfully added.',
+	'RANK_IMAGE'			=> 'Rank image',
+	'RANK_IMAGE_EXPLAIN'	=> 'Use this to define a small image associated with the rank. The path is relative to the root phpBB directory.',
+	'RANK_IMAGE_IN_USE'		=> '(In use)',
+	'RANK_MINIMUM'			=> 'Minimum posts',
+	'RANK_REMOVED'			=> 'The rank was successfully deleted.',
+	'RANK_SPECIAL'			=> 'Set as special rank',
+	'RANK_TITLE'			=> 'Rank title',
+	'RANK_UPDATED'			=> 'The rank was successfully updated.',
+));
+
+// Disallow Usernames
+$lang = array_merge($lang, array(
+	'ACP_DISALLOW_EXPLAIN'	=> 'Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of *. Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it.',
+	'ADD_DISALLOW_EXPLAIN'	=> 'You can disallow a username using the wildcard character * to match any character.',
+	'ADD_DISALLOW_TITLE'	=> 'Add a disallowed username',
+
+	'DELETE_DISALLOW_EXPLAIN'	=> 'You can remove a disallowed username by selecting the username from this list and clicking submit.',
+	'DELETE_DISALLOW_TITLE'		=> 'Remove a disallowed username',
+	'DISALLOWED_ALREADY'		=> 'The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present.',
+	'DISALLOWED_DELETED'		=> 'The disallowed username has been successfully removed.',
+	'DISALLOW_SUCCESSFUL'		=> 'The disallowed username has been successfully added.',
+
+	'NO_DISALLOWED'				=> 'No disallowed usernames',
+	'NO_USERNAME_SPECIFIED'		=> 'You haven’t selected or entered a username to operate with.',
+));
+
+// Reasons
+$lang = array_merge($lang, array(
+	'ACP_REASONS_EXPLAIN'	=> 'Here you can manage the reasons used in reports and denial messages when disapproving posts. There is one default reason (marked with a *) you are not able to remove, this reason is normally used for custom messages if no reason fits.',
+	'ADD_NEW_REASON'		=> 'Add new reason',
+	'AVAILABLE_TITLES'		=> 'Available localised reason titles',
+
+	'IS_NOT_TRANSLATED'			=> 'Reason has <strong>not</strong> been localised.',
+	'IS_NOT_TRANSLATED_EXPLAIN'	=> 'Reason has <strong>not</strong> been localised. If you want to provide the localised form, specify the correct key from the language files report reasons section.',
+	'IS_TRANSLATED'				=> 'Reason has been localised.',
+	'IS_TRANSLATED_EXPLAIN'		=> 'Reason has been localised. If the title you enter here is specified within the language files report reasons section, the localised form of the title and description will be used.',
+
+	'NO_REASON'					=> 'Reason could not be found.',
+	'NO_REASON_INFO'			=> 'You have to specify a title and a description for this reason.',
+	'NO_REMOVE_DEFAULT_REASON'	=> 'You are not able to remove the default reason “Other”.',
+
+	'REASON_ADD'				=> 'Add report/denial reason',
+	'REASON_ADDED'				=> 'Report/denial reason successfully added.',
+	'REASON_ALREADY_EXIST'		=> 'A reason with this title already exist, please enter another title for this reason.',
+	'REASON_DESCRIPTION'		=> 'Reason description',
+	'REASON_DESC_TRANSLATED'	=> 'Displayed reason description',
+	'REASON_EDIT'				=> 'Edit report/denial reason',
+	'REASON_EDIT_EXPLAIN'		=> 'Here you are able to add or edit a reason. If the reason is translated the localised version is used instead of the description entered here.',
+	'REASON_REMOVED'			=> 'Report/denial reason successfully removed.',
+	'REASON_TITLE'				=> 'Reason title',
+	'REASON_TITLE_TRANSLATED'	=> 'Displayed reason title',
+	'REASON_UPDATED'			=> 'Report/denial reason successfully updated.',
+
+	'USED_IN_REPORTS'		=> 'Used in reports',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
new file mode 100644
index 0000000000..a25dcd174b
--- /dev/null
+++ b/phpBB/language/en/acp/profile.php
@@ -0,0 +1,156 @@
+<?php
+/**
+*
+* acp_profile [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+// Custom profile fields
+$lang = array_merge($lang, array(
+	'ADDED_PROFILE_FIELD'	=> 'Successfully added custom profile field.',
+	'ALPHA_ONLY'			=> 'Alphanumeric only',
+	'ALPHA_SPACERS'			=> 'Alphanumeric and spacers',
+	'ALWAYS_TODAY'			=> 'Always the current date',
+
+	'BOOL_ENTRIES_EXPLAIN'	=> 'Enter your options now',
+	'BOOL_TYPE_EXPLAIN'		=> 'Define the type, either a checkbox or radio buttons. A checkbox will only be displayed if it is checked for a given user. In that case the <strong>second</strong> language option will be used. Radio buttons will display regardless of their value.',
+
+	'CHANGED_PROFILE_FIELD'		=> 'Successfully changed profile field.',
+	'CHARS_ANY'					=> 'Any character',
+	'CHECKBOX'					=> 'Checkbox',
+	'COLUMNS'					=> 'Columns',
+	'CP_LANG_DEFAULT_VALUE'		=> 'Default value',
+	'CP_LANG_EXPLAIN'			=> 'Field description',
+	'CP_LANG_EXPLAIN_EXPLAIN'	=> 'The explanation for this field presented to the user.',
+	'CP_LANG_NAME'				=> 'Field name/title presented to the user',
+	'CP_LANG_OPTIONS'			=> 'Options',
+	'CREATE_NEW_FIELD'			=> 'Create new field',
+	'CUSTOM_FIELDS_NOT_TRANSLATED'	=> 'At least one custom profile field has not yet been translated. Please enter the required information by clicking on the “Translate” link.',
+
+	'DEFAULT_ISO_LANGUAGE'			=> 'Default language [%s]',
+	'DEFAULT_LANGUAGE_NOT_FILLED'	=> 'The language entries for the default language are not filled for this profile field.',
+	'DEFAULT_VALUE'					=> 'Default value',
+	'DELETE_PROFILE_FIELD'			=> 'Remove profile field',
+	'DELETE_PROFILE_FIELD_CONFIRM'	=> 'Are you sure you want to delete this profile field?',
+	'DISPLAY_AT_PROFILE'			=> 'Display in user control panel',
+	'DISPLAY_AT_PROFILE_EXPLAIN'	=> 'The user is able to change this profile field within the user control panel.',
+	'DISPLAY_AT_REGISTER'			=> 'Display on registration screen',
+	'DISPLAY_AT_REGISTER_EXPLAIN'	=> 'If this option is enabled, the field will be displayed on registration.',
+	'DISPLAY_ON_VT'					=> 'Display on viewtopic screen',
+	'DISPLAY_ON_VT_EXPLAIN'			=> 'If this option is enabled, the field will be displayed in the mini-profile on the topic screen.',
+	'DISPLAY_PROFILE_FIELD'			=> 'Publicly display profile field',
+	'DISPLAY_PROFILE_FIELD_EXPLAIN'	=> 'The profile field will be shown in all locations allowed within the load settings. Setting this to “no” will hide the field from topic pages, profiles and the memberlist.',
+	'DROPDOWN_ENTRIES_EXPLAIN'		=> 'Enter your options now, every option in one line.',
+
+	'EDIT_DROPDOWN_LANG_EXPLAIN'	=> 'Please note that you are able to change your options text and also able to add new options to the end. It is not advised to add new options between existing options - this could result in wrong options assigned to your users. This can also happen if you remove options in-between. Removing options from the end result in users having assigned this item now reverting back to the default one.',
+	'EMPTY_FIELD_IDENT'				=> 'Empty field identification',
+	'EMPTY_USER_FIELD_NAME'			=> 'Please enter a field name/title',
+	'ENTRIES'						=> 'Entries',
+	'EVERYTHING_OK'					=> 'Everything OK',
+
+	'FIELD_BOOL'				=> 'Boolean (Yes/No)',
+	'FIELD_DATE'				=> 'Date',
+	'FIELD_DESCRIPTION'			=> 'Field description',
+	'FIELD_DESCRIPTION_EXPLAIN'	=> 'The explanation for this field presented to the user.',
+	'FIELD_DROPDOWN'			=> 'Dropdown box',
+	'FIELD_IDENT'				=> 'Field identification',
+	'FIELD_IDENT_ALREADY_EXIST'	=> 'The chosen field identification already exist. Please choose another name.',
+	'FIELD_IDENT_EXPLAIN'		=> 'The field identification is a name to identify the profile field within the database and the templates.',
+	'FIELD_INT'					=> 'Numbers',
+	'FIELD_LENGTH'				=> 'Length of input box',
+	'FIELD_NOT_FOUND'			=> 'Profile field not found.',
+	'FIELD_STRING'				=> 'Single text field',
+	'FIELD_TEXT'				=> 'Textarea',
+	'FIELD_TYPE'				=> 'Field type',
+	'FIELD_TYPE_EXPLAIN'		=> 'You are not able to change the field type later.',
+	'FIELD_VALIDATION'			=> 'Field validation',
+	'FIRST_OPTION'				=> 'First option',
+
+	'HIDE_PROFILE_FIELD'			=> 'Hide profile field',
+	'HIDE_PROFILE_FIELD_EXPLAIN'	=> 'Hide the profile field from all other users except the user, administrators and moderators who are still able to see this field. If the Display in user control panel option is disabled, the user will not be able to see or change this field and the field can only be changed by administrators.',
+
+	'INVALID_CHARS_FIELD_IDENT'	=> 'Field identification can only contain lowercase a-z and _',
+	'INVALID_FIELD_IDENT_LEN'	=> 'Field identification can only be 17 characters long',
+	'ISO_LANGUAGE'				=> 'Language [%s]',
+
+	'LANG_SPECIFIC_OPTIONS'		=> 'Language specific options [<strong>%s</strong>]',
+
+	'MAX_FIELD_CHARS'		=> 'Maximum number of characters',
+	'MAX_FIELD_NUMBER'		=> 'Highest allowed number',
+	'MIN_FIELD_CHARS'		=> 'Minimum number of characters',
+	'MIN_FIELD_NUMBER'		=> 'Lowest allowed number',
+
+	'NO_FIELD_ENTRIES'			=> 'No entries defined',
+	'NO_FIELD_ID'				=> 'No field id specified.',
+	'NO_FIELD_TYPE'				=> 'No Field type specified.',
+	'NO_VALUE_OPTION'			=> 'Option equal to non entered value',
+	'NO_VALUE_OPTION_EXPLAIN'	=> 'Value for a non-entry. If the field is required, the user gets an error if he choose the option selected here.',
+	'NUMBERS_ONLY'				=> 'Only numbers (0-9)',
+
+	'PROFILE_BASIC_OPTIONS'		=> 'Basic options',
+	'PROFILE_FIELD_ACTIVATED'	=> 'Profile field successfully activated.',
+	'PROFILE_FIELD_DEACTIVATED'	=> 'Profile field successfully deactivated.',
+	'PROFILE_LANG_OPTIONS'		=> 'Language specific options',
+	'PROFILE_TYPE_OPTIONS'		=> 'Profile type specific options',
+
+	'RADIO_BUTTONS'				=> 'Radio buttons',
+	'REMOVED_PROFILE_FIELD'		=> 'Successfully removed profile field.',
+	'REQUIRED_FIELD'			=> 'Required field',
+	'REQUIRED_FIELD_EXPLAIN'	=> 'Force profile field to be filled out or specified by user or administrator. If display at registration screen option is disabled, the field will only be required when the user edits their profile.',
+	'ROWS'						=> 'Rows',
+
+	'SAVE'							=> 'Save',
+	'SECOND_OPTION'					=> 'Second option',
+	'STEP_1_EXPLAIN_CREATE'			=> 'Here you can enter the first basic parameters of your new profile field. This information is needed for the second step where you’ll be able to set remaining options and tweak your profile field further.',
+	'STEP_1_EXPLAIN_EDIT'			=> 'Here you can change the basic parameters of your profile field. The relevant options are re-calculated within the second step.',
+	'STEP_1_TITLE_CREATE'			=> 'Add profile field',
+	'STEP_1_TITLE_EDIT'				=> 'Edit profile field',
+	'STEP_2_EXPLAIN_CREATE'			=> 'Here you are able to define some common options you may want to adjust.',
+	'STEP_2_EXPLAIN_EDIT'			=> 'Here you are able to change some common options.<br /><strong>Please note that changes to profile fields will not affect existing profile fields entered by your users.</strong>',
+	'STEP_2_TITLE_CREATE'			=> 'Profile type specific options',
+	'STEP_2_TITLE_EDIT'				=> 'Profile type specific options',
+	'STEP_3_EXPLAIN_CREATE'			=> 'Since you have more than one board language installed, you have to fill out the remaining language items too. The profile field will work with the default language enabled, you are able to fill out the remaining language items later too.',
+	'STEP_3_EXPLAIN_EDIT'			=> 'Since you have more than one board language installed, you now can change or add the remaining language items too. The profile field will work with the default language enabled.',
+	'STEP_3_TITLE_CREATE'			=> 'Remaining language definitions',
+	'STEP_3_TITLE_EDIT'				=> 'Language definitions',
+	'STRING_DEFAULT_VALUE_EXPLAIN'	=> 'Enter a default phrase to be displayed, a default value. Leave empty if you want to show it empty at the first place.',
+
+	'TEXT_DEFAULT_VALUE_EXPLAIN'	=> 'Enter a default text to be displayed, a default value. Leave empty if you want to show it empty at the first place.',
+	'TRANSLATE'						=> 'Translate',
+
+	'USER_FIELD_NAME'	=> 'Field name/title presented to the user',
+
+	'VISIBILITY_OPTION'				=> 'Visibility options',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
new file mode 100644
index 0000000000..8a06225102
--- /dev/null
+++ b/phpBB/language/en/acp/prune.php
@@ -0,0 +1,91 @@
+<?php
+/**
+*
+* acp_prune [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+// User pruning
+$lang = array_merge($lang, array(
+	'ACP_PRUNE_USERS_EXPLAIN'	=> 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.',
+
+	'DEACTIVATE_DELETE'			=> 'Deactivate or delete',
+	'DEACTIVATE_DELETE_EXPLAIN'	=> 'Choose whether to deactivate users or delete them entirely. Please note that deleted users cannot be restored!',
+	'DELETE_USERS'				=> 'Delete',
+	'DELETE_USER_POSTS'			=> 'Delete pruned user posts',
+	'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.',
+
+	'JOINED_EXPLAIN'			=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
+
+	'LAST_ACTIVE_EXPLAIN'		=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format. Enter <kbd>0000-00-00</kbd> to prune users who never logged in, <em>Before</em> and <em>After</em> conditions will be ignored.',
+
+	'PRUNE_USERS_LIST'				=> 'Users to be pruned',
+	'PRUNE_USERS_LIST_DELETE'		=> 'With the selected critera for pruning users the following accounts will be removed.',
+	'PRUNE_USERS_LIST_DEACTIVATE'	=> 'With the selected critera for pruning users the following accounts will be deactivated.',
+
+	'SELECT_USERS_EXPLAIN'		=> 'Enter specific usernames here, they will be used in preference to the criteria above. Founders cannot be pruned.',
+
+	'USER_DEACTIVATE_SUCCESS'	=> 'The selected users have been deactivated successfully.',
+	'USER_DELETE_SUCCESS'		=> 'The selected users have been deleted successfully.',
+	'USER_PRUNE_FAILURE'		=> 'No users fit the selected criteria.',
+
+	'WRONG_ACTIVE_JOINED_DATE'	=> 'The date entered is wrong, it is expected in <kbd>YYYY-MM-DD</kbd> format.',
+));
+
+// Forum Pruning
+$lang = array_merge($lang, array(
+	'ACP_PRUNE_FORUMS_EXPLAIN'	=> 'This will delete any topic which has not been posted to or viewed within the number of days you select. If you do not enter a number then all topics will be deleted. By default, it will not remove topics in which polls are still running nor will it remove stickies and announcements.',
+
+	'FORUM_PRUNE'		=> 'Forum prune',
+
+	'NO_PRUNE'			=> 'No forums pruned.',
+
+	'SELECTED_FORUM'	=> 'Selected forum',
+	'SELECTED_FORUMS'	=> 'Selected forums',
+
+	'POSTS_PRUNED'					=> 'Posts pruned',
+	'PRUNE_ANNOUNCEMENTS'			=> 'Prune announcements',
+	'PRUNE_FINISHED_POLLS'			=> 'Prune closed polls',
+	'PRUNE_FINISHED_POLLS_EXPLAIN'	=> 'Removes topics with polls which have ended.',
+	'PRUNE_FORUM_CONFIRM'			=> 'Are you sure you want to prune the selected forums with the settings specified? Once removed, there is no way to recover the pruned posts and topics.',
+	'PRUNE_NOT_POSTED'				=> 'Days since last posted',
+	'PRUNE_NOT_VIEWED'				=> 'Days since last viewed',
+	'PRUNE_OLD_POLLS'				=> 'Prune old polls',
+	'PRUNE_OLD_POLLS_EXPLAIN'		=> 'Removes topics with polls not voted in for post age days.',
+	'PRUNE_STICKY'					=> 'Prune stickies',
+	'PRUNE_SUCCESS'					=> 'Pruning of forums was successful.',
+
+	'TOPICS_PRUNED'		=> 'Topics pruned',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
new file mode 100644
index 0000000000..88eed9d948
--- /dev/null
+++ b/phpBB/language/en/acp/search.php
@@ -0,0 +1,107 @@
+<?php
+/**
+*
+* acp_search [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ACP_SEARCH_INDEX_EXPLAIN'				=> 'Here you can manage the search backend’s indexes. Since you normally use only one backend you should delete all indexes that you do not make use of. After altering some of the search settings (e.g. the number of minimum/maximum chars) it might be worth recreating the index so it reflects those changes.',
+	'ACP_SEARCH_SETTINGS_EXPLAIN'			=> 'Here you can define what search backend will be used for indexing posts and performing searches. You can set various options that can influence how much processing these actions require. Some of these settings are the same for all search engine backends.',
+
+	'COMMON_WORD_THRESHOLD'					=> 'Common word threshold',
+	'COMMON_WORD_THRESHOLD_EXPLAIN'			=> 'Words which are contained in a greater percentage of all posts will be regarded as common. Common words are ignored in search queries. Set to zero to disable. Only takes effect if there are more than 100 posts. If you want words that are currently regarded as common to be reconsidered you have to recreate the index.',
+	'CONFIRM_SEARCH_BACKEND'				=> 'Are you sure you wish to switch to a different search backend? After changing the search backend you will have to create an index for the new search backend. If you don’t plan on switching back to the old search backend you can also delete the old backend’s index in order to free system resources.',
+	'CONTINUE_DELETING_INDEX'				=> 'Continue previous index removal process',
+	'CONTINUE_DELETING_INDEX_EXPLAIN'		=> 'An index removal process has been started. In order to access the search index page you will have to complete it or cancel it.',
+	'CONTINUE_INDEXING'						=> 'Continue previous indexing process',
+	'CONTINUE_INDEXING_EXPLAIN'				=> 'An indexing process has been started. In order to access the search index page you will have to complete it or cancel it.',
+	'CREATE_INDEX'							=> 'Create index',
+
+	'DELETE_INDEX'							=> 'Delete index',
+	'DELETING_INDEX_IN_PROGRESS'			=> 'Deleting the index in progress',
+	'DELETING_INDEX_IN_PROGRESS_EXPLAIN'	=> 'The search backend is currently cleaning its index. This can take a few minutes.',
+
+	'FULLTEXT_MYSQL_INCOMPATIBLE_VERSION'	=> 'The MySQL fulltext backend can only be used with MySQL4 and above.',
+	'FULLTEXT_MYSQL_NOT_MYISAM'				=> 'MySQL fulltext indexes can only be used with MyISAM tables.',
+	'FULLTEXT_MYSQL_TOTAL_POSTS'			=> 'Total number of indexed posts',
+	'FULLTEXT_MYSQL_MBSTRING'				=> 'Support for non-latin UTF-8 characters using mbstring:',
+	'FULLTEXT_MYSQL_PCRE'					=> 'Support for non-latin UTF-8 characters using PCRE:',
+	'FULLTEXT_MYSQL_MBSTRING_EXPLAIN'		=> 'If PCRE does not have unicode character properties, the search backend will try to use mbstring’s regular expression engine.',
+	'FULLTEXT_MYSQL_PCRE_EXPLAIN'			=> 'This search backend requires PCRE unicode character properties, only available in PHP 4.4, 5.1 and above, if you want to search for non-latin characters.',
+
+	'GENERAL_SEARCH_SETTINGS'				=> 'General search settings',
+	'GO_TO_SEARCH_INDEX'					=> 'Go to search index page',
+
+	'INDEX_STATS'							=> 'Index statistics',
+	'INDEXING_IN_PROGRESS'					=> 'Indexing in progress',
+	'INDEXING_IN_PROGRESS_EXPLAIN'			=> 'The search backend is currently indexing all posts on the board. This can take from a few minutes to a few hours depending on your board’s size.',
+
+	'LIMIT_SEARCH_LOAD'						=> 'Search page system load limit',
+	'LIMIT_SEARCH_LOAD_EXPLAIN'				=> 'If the 1 minute system load exceeds this value the search page will go offline, 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.',
+
+	'MAX_SEARCH_CHARS'						=> 'Max characters indexed by search',
+	'MAX_SEARCH_CHARS_EXPLAIN'				=> 'Words with no more than this many characters will be indexed for searching.',
+	'MAX_NUM_SEARCH_KEYWORDS'				=> 'Maximum number of allowed keywords',
+	'MAX_NUM_SEARCH_KEYWORDS_EXPLAIN'		=> 'Maximum number of words the user is able to search for. A value of 0 allows an unlimited number of words.',
+	'MIN_SEARCH_CHARS'						=> 'Min characters indexed by search',
+	'MIN_SEARCH_CHARS_EXPLAIN'				=> 'Words with at least this many characters will be indexed for searching.',
+	'MIN_SEARCH_AUTHOR_CHARS'				=> 'Min author name characters',
+	'MIN_SEARCH_AUTHOR_CHARS_EXPLAIN'		=> 'Users have to enter at least this many characters of the name when performing a wildcard author search. If the author’s username is shorter than this number you can still search for the author’s posts by entering the complete username.',
+
+	'PROGRESS_BAR'							=> 'Progress bar',
+
+	'SEARCH_GUEST_INTERVAL'					=> 'Guest search flood interval',
+	'SEARCH_GUEST_INTERVAL_EXPLAIN'			=> 'Number of seconds guests must wait between searches. If one guest searches all others have to wait until the time interval passed.',
+	'SEARCH_INDEX_CREATE_REDIRECT'			=> 'All posts up to post id %1$d have now been indexed, of which %2$d posts were within this step.<br />The current rate of indexing is approximately %3$.1f posts per second.<br />Indexing in progress…',
+	'SEARCH_INDEX_DELETE_REDIRECT'			=> 'All posts up to post id %1$d have been removed from the search index.<br />Deleting in progress…',
+	'SEARCH_INDEX_CREATED'					=> 'Successfully indexed all posts in the board database.',
+	'SEARCH_INDEX_REMOVED'					=> 'Successfully deleted the search index for this backend.',
+	'SEARCH_INTERVAL'						=> 'User search flood interval',
+	'SEARCH_INTERVAL_EXPLAIN'				=> 'Number of seconds users must wait between searches. This interval is checked independently for each user.',
+	'SEARCH_STORE_RESULTS'					=> 'Search result cache length',
+	'SEARCH_STORE_RESULTS_EXPLAIN'			=> 'Cached search results will expire after this time, in seconds. Set to 0 if you want to disable search cache.',
+	'SEARCH_TYPE'							=> 'Search backend',
+	'SEARCH_TYPE_EXPLAIN'					=> 'phpBB allows you to choose the backend that is used for searching text in post contents. By default the search will use phpBB’s own fulltext search.',
+	'SWITCHED_SEARCH_BACKEND'				=> 'You switched the search backend. In order to use the new search backend you should make sure that there is an index for the backend you chose.',
+
+	'TOTAL_WORDS'							=> 'Total number of indexed words',
+	'TOTAL_MATCHES'							=> 'Total number of word to post relations indexed',
+
+	'YES_SEARCH'							=> 'Enable search facilities',
+	'YES_SEARCH_EXPLAIN'					=> 'Enables user facing search functionality including member search.',
+	'YES_SEARCH_UPDATE'						=> 'Enable fulltext updating',
+	'YES_SEARCH_UPDATE_EXPLAIN'				=> 'Updating of fulltext indexes when posting, overridden if search is disabled.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
new file mode 100644
index 0000000000..247d8a4140
--- /dev/null
+++ b/phpBB/language/en/acp/styles.php
@@ -0,0 +1,434 @@
+<?php
+/**
+*
+* acp_styles [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ACP_IMAGESETS_EXPLAIN'	=> 'Imagesets comprise all the button, forum, folder, etc. and other non-style specific images used by the board. Here you can edit, export or delete existing imagesets and import or activate new sets.',
+	'ACP_STYLES_EXPLAIN'	=> 'Here you can manage the available styles on your board. A style consists of a template, theme and imageset. You may alter existing styles, delete, deactivate, reactivate, create or import new ones. You can also see what a style will look like using the preview function. The current default style is noted by the presence of an asterisk (*). Also listed is the total user count for each style, note that overriding user styles will not be reflected here.',
+	'ACP_TEMPLATES_EXPLAIN'	=> 'A template set comprises all the markup used to generate the layout of your board. Here you can edit existing template sets, delete, export, import and preview sets. You can also modify the templating code used to generate BBCode.',
+	'ACP_THEMES_EXPLAIN'	=> 'From here you can create, install, edit, delete and export themes. A theme is the combination of colours and images that are applied to your templates to define the basic look of your board. The range of options open to you depends on the configuration of your server and phpBB installation, see the manual for further details. Please note that when creating new themes the use of an existing theme as a basis is optional.',
+	'ADD_IMAGESET'			=> 'Create imageset',
+	'ADD_IMAGESET_EXPLAIN'	=> 'Here you can create a new imageset. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this imageset on an existing one. You may also be able to upload or import (from the store directory) a imageset archive. If you upload or import an archive the imageset name can be optionally taken from the archive name (to do this leave the imageset name blank).',
+	'ADD_STYLE'				=> 'Create style',
+	'ADD_STYLE_EXPLAIN'		=> 'Here you can create a new style. Depending on your server configuration and file permissions you may have additional options. For example you may be able to base this style on an existing one. You may also be able to upload or import (from the store directory) a style archive. If you upload or import an archive the style name will be determined automatically.',
+	'ADD_TEMPLATE'			=> 'Create template',
+	'ADD_TEMPLATE_EXPLAIN'	=> 'Here you can add a new template. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this template set on an existing one. You may also be able to upload or import (from the store directory) a template archive. If you upload or import an archive the template name can be optionally taken from the archive name (to do this leave the template name blank).',
+	'ADD_THEME'				=> 'Create theme',
+	'ADD_THEME_EXPLAIN'		=> 'Here you can add a new theme. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this theme on an existing one. You may also be able to upload or import (from the store directory) a theme archive. If you upload or import an archive the theme name can be optionally taken from the archive name (to do this leave the theme name blank).',
+	'ARCHIVE_FORMAT'		=> 'Archive file type',
+	'AUTOMATIC_EXPLAIN'		=> 'Leave blank to attempt automatic detection.',
+
+	'BACKGROUND'			=> 'Background',
+	'BACKGROUND_COLOUR'		=> 'Background colour',
+	'BACKGROUND_IMAGE'		=> 'Background image',
+	'BACKGROUND_REPEAT'		=> 'Background repeat',
+	'BOLD'					=> 'Bold',
+
+	'CACHE'							=> 'Cache',
+	'CACHE_CACHED'					=> 'Cached',
+	'CACHE_FILENAME'				=> 'Template file',
+	'CACHE_FILESIZE'				=> 'File size',
+	'CACHE_MODIFIED'				=> 'Modified',
+	'CONFIRM_IMAGESET_REFRESH'		=> 'Are you sure you wish to refresh all imageset data? The settings from the imageset configuration file will overwrite all modifications to the imageset which have been carried out with the imageset editor.',
+	'CONFIRM_TEMPLATE_CLEAR_CACHE'	=> 'Are you sure you wish to clear all cached versions of your template files?',
+	'CONFIRM_TEMPLATE_REFRESH'		=> 'Are you sure you wish to refresh all template data in the database with the contents of the template files on the filesystem? This will overwrite all modifications which have been carried out with the template editor while the template was stored in the database.',
+	'CONFIRM_THEME_REFRESH'			=> 'Are you sure you wish to refresh the theme data stored in the database with the contents of the theme on the filesystem? This will overwrite all modifications which have been carried out with the theme editor while the theme was stored in the database.',
+	'COPYRIGHT'						=> 'Copyright',
+	'CREATE_IMAGESET'				=> 'Create new imageset',
+	'CREATE_STYLE'					=> 'Create new style',
+	'CREATE_TEMPLATE'				=> 'Create new template set',
+	'CREATE_THEME'					=> 'Create new theme',
+	'CURRENT_IMAGE'					=> 'Current image',
+
+	'DEACTIVATE_DEFAULT'		=> 'You cannot deactivate the default style.',
+	'DELETE_FROM_FS'			=> 'Delete from filesystem',
+	'DELETE_IMAGESET'			=> 'Delete imageset',
+	'DELETE_IMAGESET_EXPLAIN'	=> 'Here you can remove the selected imageset from the database. Additionally, if you have permission you can elect to remove the set from the filesystem. Please note that there is no undo capability. When the imageset is deleted it is gone for good. It is recommended that you first export your set for possible future use.',
+	'DELETE_STYLE'				=> 'Delete style',
+	'DELETE_STYLE_EXPLAIN'		=> 'Here you can remove the selected style. You cannot remove all the style elements from here. These must be deleted individually via their respective forms. Take care in deleting styles there is no undo facility.',
+	'DELETE_TEMPLATE'			=> 'Delete template',
+	'DELETE_TEMPLATE_EXPLAIN'	=> 'Here you can remove the selected template set from the database. Additionally, if you have permission you can elect to remove the set from the filesystem. Please note that there is no undo capability. When the templates are deleted they are gone for good. It is recommended that you first export your set for possible future use.',
+	'DELETE_THEME'				=> 'Delete theme',
+	'DELETE_THEME_EXPLAIN'		=> 'Here you can remove the selected theme from the database. Additionally, if you have permission you can elect to remove the theme from the filesystem. Please note that there is no undo capability. When the theme is deleted it is gone for good. It is recommended that you first export your theme for possible future use.',
+	'DETAILS'					=> 'Details',
+	'DIMENSIONS_EXPLAIN'		=> 'Selecting yes here will include width/height parameters.',
+
+
+	'EDIT_DETAILS_IMAGESET'				=> 'Edit imageset details',
+	'EDIT_DETAILS_IMAGESET_EXPLAIN'		=> 'Here you can edit certain imageset details such as its name.',
+	'EDIT_DETAILS_STYLE'				=> 'Edit style',
+	'EDIT_DETAILS_STYLE_EXPLAIN'		=> 'Using the form below you can modify this existing style. You may alter the combination of template, theme and imageset which define the style itself. You may also make the style the default one.',
+	'EDIT_DETAILS_TEMPLATE'				=> 'Edit template details',
+	'EDIT_DETAILS_TEMPLATE_EXPLAIN'		=> 'Here you can edit certain template details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your template set can be written to by the web server.',
+	'EDIT_DETAILS_THEME'				=> 'Edit theme details',
+	'EDIT_DETAILS_THEME_EXPLAIN'		=> 'Here you can edit certain theme details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your stylesheet can be written to by the web server.',
+	'EDIT_IMAGESET'						=> 'Edit imageset',
+	'EDIT_IMAGESET_EXPLAIN'				=> 'Here you can edit the individual images which define the imageset. You can also specify dimensions for the image. Dimensions are optional, specifying them can overcome certain rendering issues with some browsers. By not specifying them you reduce the size of the database record a little.',
+	'EDIT_TEMPLATE'						=> 'Edit template',
+	'EDIT_TEMPLATE_EXPLAIN'				=> 'Here you can edit your template set directly. Please remember that these edits are permanent and cannot be undone once submitted. If PHP can write to the template files in your styles directory any changes here will be written directly to those files. If PHP cannot write to those files they will be copied into the database and all changes will only be reflected there. Please take care when editing your template set, remember to close all replacement variable terms {XXXX} and conditional statements.',
+	'EDIT_TEMPLATE_STORED_DB'			=> 'The template file was unwritable so the template set is now stored in the database containing the modified file.',
+	'EDIT_THEME'						=> 'Edit theme',
+	'EDIT_THEME_EXPLAIN'				=> 'Here you can edit the selected theme, changing colours, images, etc.',
+	'EDIT_THEME_STORED_DB'				=> 'The stylesheet file was unwritable so the stylesheet is now stored in the database containing your modification.',
+	'EDIT_THEME_STORE_PARSED'			=> 'The theme requires that its stylesheet is parsed. This is only possible if it’s stored in the database.',
+	'EDITOR_DISABLED'					=> 'The template editor is disabled.',
+	'EXPORT'							=> 'Export',
+
+	'FOREGROUND'			=> 'Foreground',
+	'FONT_COLOUR'			=> 'Font colour',
+	'FONT_FACE'				=> 'Font face',
+	'FONT_FACE_EXPLAIN'		=> 'You can specify multiple fonts separated by commas. If a user doesn’t have the first font installed the first other working font will be chosen.',
+	'FONT_SIZE'				=> 'Font size',
+
+	'GLOBAL_IMAGES'			=> 'Global',
+
+	'HIDE_CSS'				=> 'Hide raw CSS',
+
+	'IMAGE_WIDTH'				=> 'Image width',
+	'IMAGE_HEIGHT'				=> 'Image height',
+	'IMAGE'						=> 'Image',
+	'IMAGE_NAME'				=> 'Image name',
+	'IMAGE_PARAMETER'			=> 'Parameter',
+	'IMAGE_VALUE'				=> 'Value',
+	'IMAGESET_ADDED'			=> 'New imageset added on filesystem.',
+	'IMAGESET_ADDED_DB'			=> 'New imageset added to database.',
+	'IMAGESET_DELETED'			=> 'Imageset deleted successfully.',
+	'IMAGESET_DELETED_FS'		=> 'Imageset removed from database but some files may remain on the filesystem.',
+	'IMAGESET_DETAILS_UPDATED'	=> 'Imageset details successfully updated.',
+	'IMAGESET_ERR_ARCHIVE'		=> 'Please select an archive method.',
+	'IMAGESET_ERR_COPY_LONG'	=> 'The copyright can be no longer than 60 characters.',
+	'IMAGESET_ERR_NAME_CHARS'	=> 'The imageset name can only contain alphanumeric characters, -, +, _ and space.',
+	'IMAGESET_ERR_NAME_EXIST'	=> 'A imageset with that name already exists.',
+	'IMAGESET_ERR_NAME_LONG'	=> 'The imageset name can be no longer than 30 characters.',
+	'IMAGESET_ERR_NOT_IMAGESET'	=> 'The archive you specified does not contain a valid imageset.',
+	'IMAGESET_ERR_STYLE_NAME'	=> 'You must supply a name for this imageset.',
+	'IMAGESET_EXPORT'			=> 'Export imageset',
+	'IMAGESET_EXPORT_EXPLAIN'	=> 'Here you can export an imageset in the form of an archive. This archive will contain all the data necessary to install the set of images on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
+	'IMAGESET_EXPORTED'			=> 'Imageset exported successfully and stored in %s.',
+	'IMAGESET_NAME'				=> 'Imageset name',
+	'IMAGESET_REFRESHED'		=> 'Imageset refreshed successfully.',
+	'IMAGESET_UPDATED'			=> 'Imageset updated successfully.',
+	'ITALIC'					=> 'Italic',
+
+	'IMG_CAT_BUTTONS'		=> 'Localised buttons',
+	'IMG_CAT_CUSTOM'		=> 'Custom images',
+	'IMG_CAT_FOLDERS'		=> 'Topic icons',
+	'IMG_CAT_FORUMS'		=> 'Forum icons',
+	'IMG_CAT_ICONS'			=> 'General icons',
+	'IMG_CAT_LOGOS'			=> 'Logos',
+	'IMG_CAT_POLLS'			=> 'Polling images',
+	'IMG_CAT_UI'			=> 'General user interface elements',
+	'IMG_CAT_USER'			=> 'Additional images',
+
+	'IMG_SITE_LOGO'			=> 'Main logo',
+	'IMG_UPLOAD_BAR'		=> 'Upload progress bar',
+	'IMG_POLL_LEFT'			=> 'Poll left end',
+	'IMG_POLL_CENTER'		=> 'Poll centre',
+	'IMG_POLL_RIGHT'		=> 'Poll right end',
+	'IMG_ICON_FRIEND'		=> 'Add as friend',
+	'IMG_ICON_FOE'			=> 'Add as foe',
+
+	'IMG_FORUM_LINK'			=> 'Forum link',
+	'IMG_FORUM_READ'			=> 'Forum',
+	'IMG_FORUM_READ_LOCKED'		=> 'Forum locked',
+	'IMG_FORUM_READ_SUBFORUM'	=> 'Subforum',
+	'IMG_FORUM_UNREAD'			=> 'Forum new posts',
+	'IMG_FORUM_UNREAD_LOCKED'	=> 'Forum new posts locked',
+	'IMG_FORUM_UNREAD_SUBFORUM'	=> 'Subforum new posts',
+	'IMG_SUBFORUM_READ'			=> 'Legend subforum',
+	'IMG_SUBFORUM_UNREAD'		=> 'Legend subforum new posts',
+
+	'IMG_TOPIC_MOVED'			=> 'Topic moved',
+
+	'IMG_TOPIC_READ'				=> 'Topic',
+	'IMG_TOPIC_READ_MINE'			=> 'Topic posted to',
+	'IMG_TOPIC_READ_HOT'			=> 'Topic popular',
+	'IMG_TOPIC_READ_HOT_MINE'		=> 'Topic popular posted to',
+	'IMG_TOPIC_READ_LOCKED'			=> 'Topic locked',
+	'IMG_TOPIC_READ_LOCKED_MINE'	=> 'Topic locked posted to',
+
+	'IMG_TOPIC_UNREAD'				=> 'Topic new posts',
+	'IMG_TOPIC_UNREAD_MINE'			=> 'Topic posted to new',
+	'IMG_TOPIC_UNREAD_HOT'			=> 'Topic popular new posts',
+	'IMG_TOPIC_UNREAD_HOT_MINE'		=> 'Topic popular posted to new',
+	'IMG_TOPIC_UNREAD_LOCKED'		=> 'Topic locked new',
+	'IMG_TOPIC_UNREAD_LOCKED_MINE'	=> 'Topic locked posted to new',
+
+	'IMG_STICKY_READ'				=> 'Sticky topic',
+	'IMG_STICKY_READ_MINE'			=> 'Sticky topic posted to',
+	'IMG_STICKY_READ_LOCKED'		=> 'Sticky topic locked',
+	'IMG_STICKY_READ_LOCKED_MINE'	=> 'Sticky topic locked posted to',
+	'IMG_STICKY_UNREAD'				=> 'Sticky topic new posts',
+	'IMG_STICKY_UNREAD_MINE'		=> 'Sticky topic posted to new',
+	'IMG_STICKY_UNREAD_LOCKED'		=> 'Sticky topic locked new posts',
+	'IMG_STICKY_UNREAD_LOCKED_MINE'	=> 'Sticky topic locked posted to new',
+
+	'IMG_ANNOUNCE_READ'					=> 'Announcement',
+	'IMG_ANNOUNCE_READ_MINE'			=> 'Announcement posted to',
+	'IMG_ANNOUNCE_READ_LOCKED'			=> 'Announcement locked',
+	'IMG_ANNOUNCE_READ_LOCKED_MINE'		=> 'Announcement locked posted to',
+	'IMG_ANNOUNCE_UNREAD'				=> 'Announcement new posts',
+	'IMG_ANNOUNCE_UNREAD_MINE'			=> 'Announcement posted to new',
+	'IMG_ANNOUNCE_UNREAD_LOCKED'		=> 'Announcement locked new posts',
+	'IMG_ANNOUNCE_UNREAD_LOCKED_MINE'	=> 'Announcement locked posted to new',
+
+	'IMG_GLOBAL_READ'					=> 'Global',
+	'IMG_GLOBAL_READ_MINE'				=> 'Global posted to',
+	'IMG_GLOBAL_READ_LOCKED'			=> 'Global locked',
+	'IMG_GLOBAL_READ_LOCKED_MINE'		=> 'Global locked posted to',
+	'IMG_GLOBAL_UNREAD'					=> 'Global new posts',
+	'IMG_GLOBAL_UNREAD_MINE'			=> 'Global posted to new',
+	'IMG_GLOBAL_UNREAD_LOCKED'			=> 'Global locked new posts',
+	'IMG_GLOBAL_UNREAD_LOCKED_MINE'		=> 'Global locked posted to new',
+
+	'IMG_PM_READ'		=> 'Read private message',
+	'IMG_PM_UNREAD'		=> 'Unread private message',
+
+	'IMG_ICON_BACK_TOP'		=> 'Top',
+
+	'IMG_ICON_CONTACT_AIM'		=> 'AIM',
+	'IMG_ICON_CONTACT_EMAIL'	=> 'Send e-mail',
+	'IMG_ICON_CONTACT_ICQ'		=> 'ICQ',
+	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
+	'IMG_ICON_CONTACT_MSNM'		=> 'MSNM',
+	'IMG_ICON_CONTACT_PM'		=> 'Send message',
+	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',
+	'IMG_ICON_CONTACT_WWW'		=> 'Website',
+
+	'IMG_ICON_POST_DELETE'			=> 'Delete post',
+	'IMG_ICON_POST_EDIT'			=> 'Edit post',
+	'IMG_ICON_POST_INFO'			=> 'Show post details',
+	'IMG_ICON_POST_QUOTE'			=> 'Quote post',
+	'IMG_ICON_POST_REPORT'			=> 'Report post',
+	'IMG_ICON_POST_TARGET'			=> 'Minipost',
+	'IMG_ICON_POST_TARGET_UNREAD'	=> 'New minipost',
+
+
+	'IMG_ICON_TOPIC_ATTACH'			=> 'Attachment',
+	'IMG_ICON_TOPIC_LATEST'			=> 'Last post',
+	'IMG_ICON_TOPIC_NEWEST'			=> 'Last unread post',
+	'IMG_ICON_TOPIC_REPORTED'		=> 'Post reported',
+	'IMG_ICON_TOPIC_UNAPPROVED'		=> 'Post unapproved',
+
+	'IMG_ICON_USER_ONLINE'		=> 'User online',
+	'IMG_ICON_USER_OFFLINE'		=> 'User offline',
+	'IMG_ICON_USER_PROFILE'		=> 'Show profile',
+	'IMG_ICON_USER_SEARCH'		=> 'Search posts',
+	'IMG_ICON_USER_WARN'		=> 'Warn user',
+
+	'IMG_BUTTON_PM_FORWARD'		=> 'Forward private message',
+	'IMG_BUTTON_PM_NEW'			=> 'New private message',
+	'IMG_BUTTON_PM_REPLY'		=> 'Reply private message',
+	'IMG_BUTTON_TOPIC_LOCKED'	=> 'Topic locked',
+	'IMG_BUTTON_TOPIC_NEW'		=> 'New topic',
+	'IMG_BUTTON_TOPIC_REPLY'	=> 'Reply topic',
+
+	'IMG_USER_ICON1'		=> 'User defined image 1',
+	'IMG_USER_ICON2'		=> 'User defined image 2',
+	'IMG_USER_ICON3'		=> 'User defined image 3',
+	'IMG_USER_ICON4'		=> 'User defined image 4',
+	'IMG_USER_ICON5'		=> 'User defined image 5',
+	'IMG_USER_ICON6'		=> 'User defined image 6',
+	'IMG_USER_ICON7'		=> 'User defined image 7',
+	'IMG_USER_ICON8'		=> 'User defined image 8',
+	'IMG_USER_ICON9'		=> 'User defined image 9',
+	'IMG_USER_ICON10'		=> 'User defined image 10',
+
+	'INCLUDE_DIMENSIONS'		=> 'Include dimensions',
+	'INCLUDE_IMAGESET'			=> 'Include imageset',
+	'INCLUDE_TEMPLATE'			=> 'Include template',
+	'INCLUDE_THEME'				=> 'Include theme',
+	'INHERITING_FROM'			=> 'Inherits from',
+	'INSTALL_IMAGESET'			=> 'Install imageset',
+	'INSTALL_IMAGESET_EXPLAIN'	=> 'Here you can install your selected imageset. You can edit certain details if you wish or use the installation defaults.',
+	'INSTALL_STYLE'				=> 'Install style',
+	'INSTALL_STYLE_EXPLAIN'		=> 'Here you can install a new style and if appropriate the corresponding style elements. If you already have the relevant style elements installed they will not be overwritten. Some styles require existing style elements to already be installed. If you try installing such a style and do not have the required elements you will be notified.',
+	'INSTALL_TEMPLATE'			=> 'Install Template',
+	'INSTALL_TEMPLATE_EXPLAIN'	=> 'Here you can install a new template set. Depending on your server configuration you may have a number of options here.',
+	'INSTALL_THEME'				=> 'Install theme',
+	'INSTALL_THEME_EXPLAIN'		=> 'Here you can install your selected theme. You can edit certain details if you wish or use the installation defaults.',
+	'INSTALLED_IMAGESET'		=> 'Installed imagesets',
+	'INSTALLED_STYLE'			=> 'Installed styles',
+	'INSTALLED_TEMPLATE'		=> 'Installed templates',
+	'INSTALLED_THEME'			=> 'Installed themes',
+
+	'LINE_SPACING'				=> 'Line spacing',
+	'LOCALISED_IMAGES'			=> 'Localised',
+	'LOCATION_DISABLED_EXPLAIN'	=> 'This setting is inherited and cannot be changed.',
+
+
+	'NO_CLASS'					=> 'Cannot find class in stylesheet.',
+	'NO_IMAGESET'				=> 'Cannot find imageset on filesystem.',
+	'NO_IMAGE'					=> 'No image',
+	'NO_IMAGE_ERROR'			=> 'Cannot find image on filesystem.',
+	'NO_STYLE'					=> 'Cannot find style on filesystem.',
+	'NO_TEMPLATE'				=> 'Cannot find template on filesystem.',
+	'NO_THEME'					=> 'Cannot find theme on filesystem.',
+	'NO_UNINSTALLED_IMAGESET'	=> 'No uninstalled imagesets detected.',
+	'NO_UNINSTALLED_STYLE'		=> 'No uninstalled styles detected.',
+	'NO_UNINSTALLED_TEMPLATE'	=> 'No uninstalled templates detected.',
+	'NO_UNINSTALLED_THEME'		=> 'No uninstalled themes detected.',
+	'NO_UNIT'					=> 'None',
+
+	'ONLY_IMAGESET'			=> 'This is the only remaining imageset, you cannot delete it.',
+	'ONLY_STYLE'			=> 'This is the only remaining style, you cannot delete it.',
+	'ONLY_TEMPLATE'			=> 'This is the only remaining template set, you cannot delete it.',
+	'ONLY_THEME'			=> 'This is the only remaining theme, you cannot delete it.',
+	'OPTIONAL_BASIS'		=> 'Optional basis',
+
+	'REFRESH'					=> 'Refresh',
+	'REPEAT_NO'					=> 'None',
+	'REPEAT_X'					=> 'Only horizontally',
+	'REPEAT_Y'					=> 'Only vertically',
+	'REPEAT_ALL'				=> 'Both directions',
+	'REPLACE_IMAGESET'			=> 'Replace imageset with',
+	'REPLACE_IMAGESET_EXPLAIN'	=> 'This imageset will replace the one you are deleting in any styles that use it.',
+	'REPLACE_STYLE'				=> 'Replace style with',
+	'REPLACE_STYLE_EXPLAIN'		=> 'This style will replace the one being deleted for members that use it.',
+	'REPLACE_TEMPLATE'			=> 'Replace template with',
+	'REPLACE_TEMPLATE_EXPLAIN'	=> 'This template set will replace the one you are deleting in any styles that use it.',
+	'REPLACE_THEME'				=> 'Replace theme with',
+	'REPLACE_THEME_EXPLAIN'		=> 'This theme will replace the one you are deleting in any styles that use it.',
+	'REQUIRES_IMAGESET'			=> 'This style requires the %s imageset to be installed.',
+	'REQUIRES_TEMPLATE'			=> 'This style requires the %s template set to be installed.',
+	'REQUIRES_THEME'			=> 'This style requires the %s theme to be installed.',
+
+	'SELECT_IMAGE'				=> 'Select image',
+	'SELECT_TEMPLATE'			=> 'Select template file',
+	'SELECT_THEME'				=> 'Select theme file',
+	'SELECTED_IMAGE'			=> 'Selected image',
+	'SELECTED_IMAGESET'			=> 'Selected imageset',
+	'SELECTED_TEMPLATE'			=> 'Selected template',
+	'SELECTED_TEMPLATE_FILE'	=> 'Selected template file',
+	'SELECTED_THEME'			=> 'Selected theme',
+	'SELECTED_THEME_FILE'		=> 'Selected theme file',
+	'STORE_DATABASE'			=> 'Database',
+	'STORE_FILESYSTEM'			=> 'Filesystem',
+	'STYLE_ACTIVATE'			=> 'Activate',
+	'STYLE_ACTIVE'				=> 'Active',
+	'STYLE_ADDED'				=> 'Style added successfully.',
+	'STYLE_DEACTIVATE'			=> 'Deactivate',
+	'STYLE_DEFAULT'				=> 'Make default style',
+	'STYLE_DELETED'				=> 'Style deleted successfully.',
+	'STYLE_DETAILS_UPDATED'		=> 'Style edited successfully.',
+	'STYLE_ERR_ARCHIVE'			=> 'Please select an archive method.',
+	'STYLE_ERR_COPY_LONG'		=> 'The copyright can be no longer than 60 characters.',
+	'STYLE_ERR_MORE_ELEMENTS'	=> 'You must select at least one style element.',
+	'STYLE_ERR_NAME_CHARS'		=> 'The style name can only contain alphanumeric characters, -, +, _ and space.',
+	'STYLE_ERR_NAME_EXIST'		=> 'A style with that name already exists.',
+	'STYLE_ERR_NAME_LONG'		=> 'The style name can be no longer than 30 characters.',
+	'STYLE_ERR_NO_IDS'			=> 'You must select a template, theme and imageset for this style.',
+	'STYLE_ERR_NOT_STYLE'		=> 'The imported or uploaded file did not contain a valid style archive.',
+	'STYLE_ERR_STYLE_NAME'		=> 'You must supply a name for this style.',
+	'STYLE_EXPORT'				=> 'Export style',
+	'STYLE_EXPORT_EXPLAIN'		=> 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme and imageset for a commonly used template you could simply export the theme and imageset and omit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
+	'STYLE_EXPORTED'			=> 'Style exported successfully and stored in %s.',
+	'STYLE_IMAGESET'			=> 'Imageset',
+	'STYLE_NAME'				=> 'Style name',
+	'STYLE_TEMPLATE'			=> 'Template',
+	'STYLE_THEME'				=> 'Theme',
+	'STYLE_USED_BY'				=> 'Used by (including robots)',
+
+	'TEMPLATE_ADDED'			=> 'Template set added and stored on filesystem.',
+	'TEMPLATE_ADDED_DB'			=> 'Template set added and stored in database.',
+	'TEMPLATE_CACHE'			=> 'Template cache',
+	'TEMPLATE_CACHE_EXPLAIN'	=> 'By default phpBB caches the compiled version of its templates. This decreases the load on the server each time a page is viewed and thus may reduce the page generation time. Here you can view the cache status of each file and delete individual files or the entire cache.',
+	'TEMPLATE_CACHE_CLEARED'	=> 'Template cache cleared successfully.',
+	'TEMPLATE_CACHE_EMPTY'		=> 'There are no cached templates.',
+	'TEMPLATE_DELETED'			=> 'Template set deleted successfully.',
+	'TEMPLATE_DELETE_DEPENDENT'	=> 'The template set cannot be deleted as there are one or more other template sets inheriting from it:',
+	'TEMPLATE_DELETED_FS'		=> 'Template set removed from database but some files may remain on the filesystem.',
+	'TEMPLATE_DETAILS_UPDATED'	=> 'Template details successfully updated.',
+	'TEMPLATE_EDITOR'			=> 'Raw HTML template editor',
+	'TEMPLATE_EDITOR_HEIGHT'	=> 'Template editor height',
+	'TEMPLATE_ERR_ARCHIVE'		=> 'Please select an archive method.',
+	'TEMPLATE_ERR_CACHE_READ'	=> 'The cache directory used to store cached versions of template files could not be opened.',
+	'TEMPLATE_ERR_COPY_LONG'	=> 'The copyright can be no longer than 60 characters.',
+	'TEMPLATE_ERR_NAME_CHARS'	=> 'The template name can only contain alphanumeric characters, -, +, _ and space.',
+	'TEMPLATE_ERR_NAME_EXIST'	=> 'A template set with that name already exists.',
+	'TEMPLATE_ERR_NAME_LONG'	=> 'The template name can be no longer than 30 characters.',
+	'TEMPLATE_ERR_NOT_TEMPLATE'	=> 'The archive you specified does not contain a valid template set.',
+	'TEMPLATE_ERR_REQUIRED_OR_INCOMPLETE' => 'The new template set requires the template %s to be installed and not inheriting itself.',
+	'TEMPLATE_ERR_STYLE_NAME'	=> 'You must supply a name for this template.',
+	'TEMPLATE_EXPORT'			=> 'Export templates',
+	'TEMPLATE_EXPORT_EXPLAIN'	=> 'Here you can export a template set in the form of an archive. This archive will contain all the files necessary to install the templates on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
+	'TEMPLATE_EXPORTED'			=> 'Templates exported successfully and stored in %s.',
+	'TEMPLATE_FILE'				=> 'Template file',
+	'TEMPLATE_FILE_UPDATED'		=> 'Template file updated successfully.',
+	'TEMPLATE_INHERITS'			=> 'This template sets inherits from %s and thus cannot have a different storage setting than its super template.',
+	'TEMPLATE_LOCATION'			=> 'Store templates in',
+	'TEMPLATE_LOCATION_EXPLAIN'	=> 'Images are always stored on the filesystem.',
+	'TEMPLATE_NAME'				=> 'Template name',
+	'TEMPLATE_FILE_NOT_WRITABLE'=> 'Unable to write to template file %s. Please check the permissions for the directory and the files.',
+	'TEMPLATE_REFRESHED'		=> 'Template refreshed successfully.',
+
+	'THEME_ADDED'				=> 'New theme added on filesystem.',
+	'THEME_ADDED_DB'			=> 'New theme added to database.',
+	'THEME_CLASS_ADDED'			=> 'Custom class added successfully.',
+	'THEME_DELETED'				=> 'Theme deleted successfully.',
+	'THEME_DELETED_FS'			=> 'Theme removed from database but files remain on the filesystem.',
+	'THEME_DETAILS_UPDATED'		=> 'Theme details successfully updated.',
+	'THEME_EDITOR'				=> 'Theme editor',
+	'THEME_EDITOR_HEIGHT'		=> 'Theme editor height',
+	'THEME_ERR_ARCHIVE'			=> 'Please select an archive method.',
+	'THEME_ERR_CLASS_CHARS'		=> 'Only alphanumeric characters plus ., :, -, _ and # are valid in class names.',
+	'THEME_ERR_COPY_LONG'		=> 'The copyright can be no longer than 60 characters.',
+	'THEME_ERR_NAME_CHARS'		=> 'The theme name can only contain alphanumeric characters, -, +, _ and space.',
+	'THEME_ERR_NAME_EXIST'		=> 'A theme with that name already exists.',
+	'THEME_ERR_NAME_LONG'		=> 'The theme name can be no longer than 30 characters.',
+	'THEME_ERR_NOT_THEME'		=> 'The archive you specified does not contain a valid theme.',
+	'THEME_ERR_REFRESH_FS'		=> 'This theme is stored on the filesystem so there is no need to refresh it.',
+	'THEME_ERR_STYLE_NAME'		=> 'You must supply a name for this theme.',
+	'THEME_FILE'				=> 'Theme file',
+	'THEME_EXPORT'				=> 'Export Theme',
+	'THEME_EXPORT_EXPLAIN'		=> 'Here you can export a theme in the form of an archive. This archive will contain all the data necessary to install the theme on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
+	'THEME_EXPORTED'			=> 'Theme exported successfully and stored in %s.',
+	'THEME_LOCATION'			=> 'Store stylesheet in',
+	'THEME_LOCATION_EXPLAIN'	=> 'Images are always stored on the filesystem.',
+	'THEME_NAME'				=> 'Theme name',
+	'THEME_REFRESHED'			=> 'Theme refreshed successfully.',
+	'THEME_UPDATED'				=> 'Theme updated successfully.',
+
+	'UNDERLINE'				=> 'Underline',
+	'UNINSTALLED_IMAGESET'	=> 'Uninstalled imagesets',
+	'UNINSTALLED_STYLE'		=> 'Uninstalled styles',
+	'UNINSTALLED_TEMPLATE'	=> 'Uninstalled templates',
+	'UNINSTALLED_THEME'		=> 'Uninstalled themes',
+	'UNSET'					=> 'Undefined',
+
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
new file mode 100644
index 0000000000..8d9bf0d486
--- /dev/null
+++ b/phpBB/language/en/acp/users.php
@@ -0,0 +1,141 @@
+<?php
+/**
+*
+* acp_users [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ADMIN_SIG_PREVIEW'		=> 'Signature preview',
+	'AT_LEAST_ONE_FOUNDER'	=> 'You are not able to change this founder to a normal user. There needs to be at least one founder enabled for this board. If you want to change this users founder status, promote another user to be a founder first.',
+
+	'BAN_ALREADY_ENTERED'	=> 'The ban had been previously entered successfully. The ban list has not been updated.',
+	'BAN_SUCCESSFUL'		=> 'Ban entered successfully.',
+
+	'CANNOT_BAN_FOUNDER'			=> 'You are not allowed to ban founder accounts.',
+	'CANNOT_BAN_YOURSELF'			=> 'You are not allowed to ban yourself.',
+	'CANNOT_DEACTIVATE_BOT'			=> 'You are not allowed to deactivate bot accounts. Please deactivate the bot within the bots page instead.',
+	'CANNOT_DEACTIVATE_FOUNDER'		=> 'You are not allowed to deactivate founder accounts.',
+	'CANNOT_DEACTIVATE_YOURSELF'	=> 'You are not allowed to deactivate your own account.',
+	'CANNOT_FORCE_REACT_BOT'		=> 'You are not allowed to force reactivation on bot accounts. Please reactivate the bot within the bots page instead.',
+	'CANNOT_FORCE_REACT_FOUNDER'	=> 'You are not allowed to force reactivation on founder accounts.',
+	'CANNOT_FORCE_REACT_YOURSELF'	=> 'You are not allowed to force reactivation of your own account.',
+	'CANNOT_REMOVE_ANONYMOUS'		=> 'You are not able to remove the guest user account.',
+	'CANNOT_REMOVE_YOURSELF'		=> 'You are not allowed to remove your own user account.',
+	'CANNOT_SET_FOUNDER_IGNORED'	=> 'You are not able to promote ignored users to be founders.',
+	'CANNOT_SET_FOUNDER_INACTIVE'	=> 'You need to activate users before you promote them to founders, only activated users are able to be promoted.',
+	'CONFIRM_EMAIL_EXPLAIN'			=> 'You only need to specify this if you are changing the users e-mail address.',
+
+	'DELETE_POSTS'			=> 'Delete posts',
+	'DELETE_USER'			=> 'Delete user',
+	'DELETE_USER_EXPLAIN'	=> 'Please note that deleting a user is final, they cannot be recovered.',
+
+	'FORCE_REACTIVATION_SUCCESS'	=> 'Successfully forced reactivation.',
+	'FOUNDER'						=> 'Founder',
+	'FOUNDER_EXPLAIN'				=> 'Founders have all administrative permissions and can never be banned, deleted or altered by non-founder members.',
+
+	'GROUP_APPROVE'					=> 'Approve member',
+	'GROUP_DEFAULT'					=> 'Make group default for member',
+	'GROUP_DELETE'					=> 'Remove member from group',
+	'GROUP_DEMOTE'					=> 'Demote group leader',
+	'GROUP_PROMOTE'					=> 'Promote to group leader',
+
+	'IP_WHOIS_FOR'			=> 'IP whois for %s',
+
+	'LAST_ACTIVE'			=> 'Last active',
+
+	'MOVE_POSTS_EXPLAIN'	=> 'Please select the forum to which you wish to move all the posts this user has made.',
+
+	'NO_SPECIAL_RANK'		=> 'No special rank assigned',
+	'NO_WARNINGS'			=> 'No warnings.',
+	'NOT_MANAGE_FOUNDER'	=> 'You tried to manage a user with founder status. Only founders are allowed to manage other founders.',
+
+	'QUICK_TOOLS'			=> 'Quick tools',
+
+	'REGISTERED'			=> 'Registered',
+	'REGISTERED_IP'			=> 'Registered from IP',
+	'RETAIN_POSTS'			=> 'Retain posts',
+
+	'SELECT_FORM'			=> 'Select form',
+	'SELECT_USER'			=> 'Select user',
+
+	'USER_ADMIN'					=> 'User administration',
+	'USER_ADMIN_ACTIVATE'			=> 'Activate account',
+	'USER_ADMIN_ACTIVATED'			=> 'User activated successfully.',
+	'USER_ADMIN_AVATAR_REMOVED'		=> 'Successfully removed avatar from user account.',
+	'USER_ADMIN_BAN_EMAIL'			=> 'Ban by e-mail',
+	'USER_ADMIN_BAN_EMAIL_REASON'	=> 'E-mail address banned via user management',
+	'USER_ADMIN_BAN_IP'				=> 'Ban by IP',
+	'USER_ADMIN_BAN_IP_REASON'		=> 'IP banned via user management',
+	'USER_ADMIN_BAN_NAME_REASON'	=> 'Username banned via user management',
+	'USER_ADMIN_BAN_USER'			=> 'Ban by username',
+	'USER_ADMIN_DEACTIVATE'			=> 'Deactivate account',
+	'USER_ADMIN_DEACTIVED'			=> 'User deactivated successfully.',
+	'USER_ADMIN_DEL_ATTACH'			=> 'Delete all attachments',
+	'USER_ADMIN_DEL_AVATAR'			=> 'Delete avatar',
+	'USER_ADMIN_DEL_OUTBOX'			=> 'Empty PM outbox',
+	'USER_ADMIN_DEL_POSTS'			=> 'Delete all posts',
+	'USER_ADMIN_DEL_SIG'			=> 'Delete signature',
+	'USER_ADMIN_EXPLAIN'			=> 'Here you can change your users information and certain specific options.',
+	'USER_ADMIN_FORCE'				=> 'Force reactivation',
+	'USER_ADMIN_LEAVE_NR'			=> 'Remove from Newly Registered',
+	'USER_ADMIN_MOVE_POSTS'			=> 'Move all posts',
+	'USER_ADMIN_SIG_REMOVED'		=> 'Successfully removed signature from user account.',
+	'USER_ATTACHMENTS_REMOVED'		=> 'Successfully removed all attachments made by this user.',
+	'USER_AVATAR_NOT_ALLOWED'		=> 'The avatar cannot be displayed because avatars have been disallowed.',
+	'USER_AVATAR_UPDATED'			=> 'Successfully updated user avatars details.',
+	'USER_AVATAR_TYPE_NOT_ALLOWED'	=> 'The current avatar cannot be displayed because its type has been disallowed.',
+	'USER_CUSTOM_PROFILE_FIELDS'	=> 'Custom profile fields',
+	'USER_DELETED'					=> 'User deleted successfully.',
+	'USER_GROUP_ADD'				=> 'Add user to group',
+	'USER_GROUP_NORMAL'				=> 'User defined groups user is a member of',
+	'USER_GROUP_PENDING'			=> 'Groups user is in pending mode',
+	'USER_GROUP_SPECIAL'			=> 'Pre-defined groups user is a member of',
+	'USER_LIFTED_NR'				=> 'Successfully removed the user’s newly registered status.',
+	'USER_NO_ATTACHMENTS'			=> 'There are no attached files to display.',
+	'USER_OUTBOX_EMPTIED'			=> 'Successfully emptied user’s private message outbox.',
+	'USER_OUTBOX_EMPTY'				=> 'The user’s private message outbox was already empty.',
+	'USER_OVERVIEW_UPDATED'			=> 'User details updated.',
+	'USER_POSTS_DELETED'			=> 'Successfully removed all posts made by this user.',
+	'USER_POSTS_MOVED'				=> 'Successfully moved users posts to target forum.',
+	'USER_PREFS_UPDATED'			=> 'User preferences updated.',
+	'USER_PROFILE'					=> 'User profile',
+	'USER_PROFILE_UPDATED'			=> 'User profile updated.',
+	'USER_RANK'						=> 'User rank',
+	'USER_RANK_UPDATED'				=> 'User rank updated.',
+	'USER_SIG_UPDATED'				=> 'User signature successfully updated.',
+	'USER_WARNING_LOG_DELETED'		=> 'No information available. Possibly the log entry has been deleted.',
+	'USER_TOOLS'					=> 'Basic tools',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php
new file mode 100644
index 0000000000..1d443e995a
--- /dev/null
+++ b/phpBB/language/en/captcha_qa.php
@@ -0,0 +1,63 @@
+<?php
+/**
+*
+* captcha_qa [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'CAPTCHA_QA'				=> 'Q&amp;A CAPTCHA',
+	'CONFIRM_QUESTION_EXPLAIN'	=> 'This question is a means of identifying and preventing automated submissions.',
+	'CONFIRM_QUESTION_WRONG'	=> 'You have provided an invalid answer to the confirmation question.',
+
+	'QUESTION_ANSWERS'			=> 'Answers',
+	'ANSWERS_EXPLAIN'			=> 'Please enter valid answers to the question, one per line.',
+	'CONFIRM_QUESTION'			=> 'Question',
+
+	'ANSWER'					=> 'Answer',
+	'EDIT_QUESTION'				=> 'Edit Question',
+	'QUESTIONS'					=> 'Questions',
+	'QUESTIONS_EXPLAIN'			=> 'During registration, users will be asked one of the questions specified here. To use this plugin, at least one question must be set in the default language. These questions should be easy for your target audience to answer, but beyond the ability of a bot capable of running a Google™ search. Using a large and regulary changed set of questions will yield the best results. Enable the strict setting if your question relies on punctuation or capitalisation.',
+	'QUESTION_DELETED'			=> 'Question deleted',
+	'QUESTION_LANG'				=> 'Language',
+	'QUESTION_LANG_EXPLAIN'		=> 'The language that this question and its answers are written in.',
+	'QUESTION_STRICT'			=> 'Strict check',
+	'QUESTION_STRICT_EXPLAIN'	=> 'If enabled, capitalisation and whitespace will also be enforced.',
+
+	'QUESTION_TEXT'				=> 'Question',
+	'QUESTION_TEXT_EXPLAIN'		=> 'The question that will be asked on registration.',
+
+	'QA_ERROR_MSG'				=> 'Please fill in all fields and enter at least one answer.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php
new file mode 100644
index 0000000000..897e8a4979
--- /dev/null
+++ b/phpBB/language/en/captcha_recaptcha.php
@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* recaptcha [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'RECAPTCHA_LANG'				=> 'en',
+	'RECAPTCHA_NOT_AVAILABLE'		=> 'In order to use reCaptcha, you must create an account on <a href="http://recaptcha.net">reCaptcha.net</a>.',
+	'CAPTCHA_RECAPTCHA'				=> 'reCaptcha',
+	'RECAPTCHA_INCORRECT'			=> 'The visual confirmation code you submitted was incorrect',
+
+	'RECAPTCHA_PUBLIC'				=> 'Public reCaptcha key',
+	'RECAPTCHA_PUBLIC_EXPLAIN'		=> 'Your public reCaptcha key. Keys can be obtained on <a href="http://recaptcha.net">reCaptcha.net</a>.',
+	'RECAPTCHA_PRIVATE'				=> 'Private reCaptcha key',
+	'RECAPTCHA_PRIVATE_EXPLAIN'		=> 'Your private reCaptcha key. Keys can be obtained on <a href="http://recaptcha.net">reCaptcha.net</a>.',
+
+	'RECAPTCHA_EXPLAIN'				=> 'In an effort to prevent automatic submissions, we require that you enter both of the words displayed below into the text field underneath.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
new file mode 100644
index 0000000000..b97445f186
--- /dev/null
+++ b/phpBB/language/en/common.php
@@ -0,0 +1,866 @@
+<?php
+/**
+*
+* common [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+//
+// Some characters you may want to copy&paste:
+// ’ » “ ” …
+//
+
+$lang = array_merge($lang, array(
+	'TRANSLATION_INFO'	=> '',
+	'DIRECTION'			=> 'ltr',
+	'DATE_FORMAT'		=> '|d M Y|',	// 01 Jan 2007 (with Relative days enabled)
+	'USER_LANG'			=> 'en-gb',
+
+	'1_DAY'			=> '1 day',
+	'1_MONTH'		=> '1 month',
+	'1_YEAR'		=> '1 year',
+	'2_WEEKS'		=> '2 weeks',
+	'3_MONTHS'		=> '3 months',
+	'6_MONTHS'		=> '6 months',
+	'7_DAYS'		=> '7 days',
+
+	'ACCOUNT_ALREADY_ACTIVATED'		=> 'Your account has already been activated.',
+	'ACCOUNT_DEACTIVATED'			=> 'Your account has been manually deactivated and is only able to be reactivated by an administrator.',
+	'ACCOUNT_NOT_ACTIVATED'			=> 'Your account has not been activated yet.',
+	'ACP'							=> 'Administration Control Panel',
+	'ACTIVE'						=> 'active',
+	'ACTIVE_ERROR'					=> 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.',
+	'ADMINISTRATOR'					=> 'Administrator',
+	'ADMINISTRATORS'				=> 'Administrators',
+	'AGE'							=> 'Age',
+	'AIM'							=> 'AIM',
+	'ALLOWED'						=> 'Allowed',
+	'ALL_FILES'						=> 'All files',
+	'ALL_FORUMS'					=> 'All forums',
+	'ALL_MESSAGES'					=> 'All messages',
+	'ALL_POSTS'						=> 'All posts',
+	'ALL_TIMES'						=> 'All times are %1$s %2$s',
+	'ALL_TOPICS'					=> 'All Topics',
+	'AND'							=> 'And',
+	'ARE_WATCHING_FORUM'			=> 'You have subscribed to be notified of new posts in this forum.',
+	'ARE_WATCHING_TOPIC'			=> 'You have subscribed to be notified of new posts in this topic.',
+	'ASCENDING'						=> 'Ascending',
+	'ATTACHMENTS'					=> 'Attachments',
+	'ATTACHED_IMAGE_NOT_IMAGE'		=> 'The image file you tried to attach is invalid.',
+	'AUTHOR'						=> 'Author',
+	'AUTH_NO_PROFILE_CREATED'		=> 'The creation of a user profile was unsuccessful.',
+	'AVATAR_DISALLOWED_CONTENT'		=> 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
+	'AVATAR_DISALLOWED_EXTENSION'	=> 'This file cannot be displayed because the extension <strong>%s</strong> is not allowed.',
+	'AVATAR_EMPTY_REMOTE_DATA'		=> 'The specified avatar could not be uploaded because the remote data appears to be invalid or corrupted.',
+	'AVATAR_EMPTY_FILEUPLOAD'		=> 'The uploaded avatar file is empty.',
+	'AVATAR_INVALID_FILENAME'		=> '%s is an invalid filename.',
+	'AVATAR_NOT_UPLOADED'			=> 'Avatar could not be uploaded.',
+	'AVATAR_NO_SIZE'				=> 'The width or height of the linked avatar could not be determined. Please enter them manually.',
+	'AVATAR_PARTIAL_UPLOAD'			=> 'The specified file was only partially uploaded.',
+	'AVATAR_PHP_SIZE_NA'			=> 'The avatar’s filesize is too large.<br />The maximum allowed filesize set in php.ini could not be determined.',
+	'AVATAR_PHP_SIZE_OVERRUN'		=> 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
+	'AVATAR_URL_INVALID'			=> 'The URL you specified is invalid.',
+	'AVATAR_URL_NOT_FOUND'			=> 'The file specified could not be found.',
+	'AVATAR_WRONG_FILESIZE'			=> 'The avatar’s filesize must be between 0 and %1d %2s.',
+	'AVATAR_WRONG_SIZE'				=> 'The submitted avatar is %5$d pixels wide and %6$d pixels high. Avatars must be at least %1$d pixels wide and %2$d pixels high, but no larger than %3$d pixels wide and %4$d pixels high.',
+
+	'BACK_TO_TOP'			=> 'Top',
+	'BACK_TO_PREV'			=> 'Back to previous page',
+	'BAN_TRIGGERED_BY_EMAIL'=> 'A ban has been issued on your e-mail address.',
+	'BAN_TRIGGERED_BY_IP'	=> 'A ban has been issued on your IP address.',
+	'BAN_TRIGGERED_BY_USER'	=> 'A ban has been issued on your username.',
+	'BBCODE_GUIDE'			=> 'BBCode guide',
+	'BCC'					=> 'BCC',
+	'BIRTHDAYS'				=> 'Birthdays',
+	'BOARD_BAN_PERM'		=> 'You have been <strong>permanently</strong> banned from this board.<br /><br />Please contact the %2$sBoard Administrator%3$s for more information.',
+	'BOARD_BAN_REASON'		=> 'Reason given for ban: <strong>%s</strong>',
+	'BOARD_BAN_TIME'		=> 'You have been banned from this board until <strong>%1$s</strong>.<br /><br />Please contact the %2$sBoard Administrator%3$s for more information.',
+	'BOARD_DISABLE'			=> 'Sorry but this board is currently unavailable.',
+	'BOARD_DISABLED'		=> 'This board is currently disabled.',
+	'BOARD_UNAVAILABLE'		=> 'Sorry but the board is temporarily unavailable, please try again in a few minutes.',
+	'BROWSING_FORUM'		=> 'Users browsing this forum: %1$s',
+	'BROWSING_FORUM_GUEST'	=> 'Users browsing this forum: %1$s and %2$d guest',
+	'BROWSING_FORUM_GUESTS'	=> 'Users browsing this forum: %1$s and %2$d guests',
+	'BYTES'					=> 'Bytes',
+
+	'CANCEL'				=> 'Cancel',
+	'CHANGE'				=> 'Change',
+	'CHANGE_FONT_SIZE'		=> 'Change font size',
+	'CHANGING_PREFERENCES'	=> 'Changing board preferences',
+	'CHANGING_PROFILE'		=> 'Changing profile settings',
+	'CLICK_VIEW_PRIVMSG'	=> '%sGo to your inbox%s',
+	'COLLAPSE_VIEW'			=> 'Collapse view',
+	'CLOSE_WINDOW'			=> 'Close window',
+	'COLOUR_SWATCH'			=> 'Colour swatch',
+	'COMMA_SEPARATOR'		=> ', ',	// Used in pagination of ACP & prosilver, use localised comma if appropriate, eg: Ideographic or Arabic
+	'CONFIRM'				=> 'Confirm',
+	'CONFIRM_CODE'			=> 'Confirmation code',
+	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as it appears. All letters are case insensitive, there is no zero.',
+	'CONFIRM_CODE_WRONG'	=> 'The confirmation code you entered was incorrect.',
+	'CONFIRM_OPERATION'		=> 'Are you sure you wish to carry out this operation?',
+	'CONGRATULATIONS'		=> 'Congratulations to',
+	'CONNECTION_FAILED'		=> 'Connection failed.',
+	'CONNECTION_SUCCESS'	=> 'Connection was successful!',
+	'COOKIES_DELETED'		=> 'All board cookies successfully deleted.',
+	'CURRENT_TIME'			=> 'It is currently %s',
+
+	'DAY'					=> 'Day',
+	'DAYS'					=> 'Days',
+	'DELETE'				=> 'Delete',
+	'DELETE_ALL'			=> 'Delete all',
+	'DELETE_COOKIES'		=> 'Delete all board cookies',
+	'DELETE_MARKED'			=> 'Delete marked',
+	'DELETE_POST'			=> 'Delete post',
+	'DELIMITER'				=> 'Delimiter',
+	'DESCENDING'			=> 'Descending',
+	'DISABLED'				=> 'Disabled',
+	'DISPLAY'				=> 'Display',
+	'DISPLAY_GUESTS'		=> 'Display guests',
+	'DISPLAY_MESSAGES'		=> 'Display messages from previous',
+	'DISPLAY_POSTS'			=> 'Display posts from previous',
+	'DISPLAY_TOPICS'		=> 'Display topics from previous',
+	'DOWNLOADED'			=> 'Downloaded',
+	'DOWNLOADING_FILE'		=> 'Downloading file',
+	'DOWNLOAD_COUNT'		=> 'Downloaded %d time',
+	'DOWNLOAD_COUNTS'		=> 'Downloaded %d times',
+	'DOWNLOAD_COUNT_NONE'	=> 'Not downloaded yet',
+	'VIEWED_COUNT'			=> 'Viewed %d time',
+	'VIEWED_COUNTS'			=> 'Viewed %d times',
+	'VIEWED_COUNT_NONE'		=> 'Not viewed yet',
+
+	'EDIT_POST'							=> 'Edit post',
+	'EMAIL'								=> 'E-mail', // Short form for EMAIL_ADDRESS
+	'EMAIL_ADDRESS'						=> 'E-mail address',
+	'EMAIL_SMTP_ERROR_RESPONSE'			=> 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',
+	'EMPTY_SUBJECT'						=> 'You must specify a subject when posting a new topic.',
+	'EMPTY_MESSAGE_SUBJECT'				=> 'You must specify a subject when composing a new message.',
+	'ENABLED'							=> 'Enabled',
+	'ENCLOSURE'							=> 'Enclosure',
+	'ERR_CHANGING_DIRECTORY'			=> 'Unable to change directory.',
+	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',
+	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
+	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
+	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
+	'ERR_UNWATCHING'					=> 'An error occured while trying to unsubscribe.',
+	'ERR_WATCHING'						=> 'An error occured while trying to subscribe.',
+	'ERR_WRONG_PATH_TO_PHPBB'			=> 'The phpBB path specified appears to be invalid.',
+	'EXPAND_VIEW'						=> 'Expand view',
+	'EXTENSION'							=> 'Extension',
+	'EXTENSION_DISABLED_AFTER_POSTING'	=> 'The extension <strong>%s</strong> has been deactivated and can no longer be displayed.',
+
+	'FAQ'					=> 'FAQ',
+	'FAQ_EXPLAIN'			=> 'Frequently Asked Questions',
+	'FILENAME'				=> 'Filename',
+	'FILESIZE'				=> 'File size',
+	'FILEDATE'				=> 'File date',
+	'FILE_COMMENT'			=> 'File comment',
+	'FILE_NOT_FOUND'		=> 'The requested file could not be found.',
+	'FIND_USERNAME'			=> 'Find a member',
+	'FOLDER'				=> 'Folder',
+	'FORGOT_PASS'			=> 'I forgot my password',
+	'FORM_INVALID'			=> 'The submitted form was invalid. Try submitting again.',
+	'FORUM'					=> 'Forum',
+	'FORUMS'				=> 'Forums',
+	'FORUMS_MARKED'			=> 'All forums have been marked read.',
+	'FORUM_CAT'				=> 'Forum category',
+	'FORUM_INDEX'			=> 'Board index',
+	'FORUM_LINK'			=> 'Forum link',
+	'FORUM_LOCATION'		=> 'Forum location',
+	'FORUM_LOCKED'			=> 'Forum locked',
+	'FORUM_RULES'			=> 'Forum rules',
+	'FORUM_RULES_LINK'		=> 'Please click here to view the forum rules',
+	'FROM'					=> 'from',
+	'FSOCK_DISABLED'		=> 'The operation could not be completed because the <var>fsockopen</var> function has been disabled or the server being queried could not be found.',
+
+	'FTP_FSOCK_HOST'				=> 'FTP host',
+	'FTP_FSOCK_HOST_EXPLAIN'		=> 'FTP server used to connect your site.',
+	'FTP_FSOCK_PASSWORD'			=> 'FTP password',
+	'FTP_FSOCK_PASSWORD_EXPLAIN'	=> 'Password for your FTP username.',
+	'FTP_FSOCK_PORT'				=> 'FTP port',
+	'FTP_FSOCK_PORT_EXPLAIN'		=> 'Port used to connect to your server.',
+	'FTP_FSOCK_ROOT_PATH'			=> 'Path to phpBB',
+	'FTP_FSOCK_ROOT_PATH_EXPLAIN'	=> 'Path from the root to your phpBB board.',
+	'FTP_FSOCK_TIMEOUT'				=> 'FTP timeout',
+	'FTP_FSOCK_TIMEOUT_EXPLAIN'		=> 'The amount of time, in seconds, that the system will wait for a reply from your server.',
+	'FTP_FSOCK_USERNAME'			=> 'FTP username',
+	'FTP_FSOCK_USERNAME_EXPLAIN'	=> 'Username used to connect to your server.',
+
+	'FTP_HOST'					=> 'FTP host',
+	'FTP_HOST_EXPLAIN'			=> 'FTP server used to connect your site.',
+	'FTP_PASSWORD'				=> 'FTP password',
+	'FTP_PASSWORD_EXPLAIN'		=> 'Password for your FTP username.',
+	'FTP_PORT'					=> 'FTP port',
+	'FTP_PORT_EXPLAIN'			=> 'Port used to connect to your server.',
+	'FTP_ROOT_PATH'				=> 'Path to phpBB',
+	'FTP_ROOT_PATH_EXPLAIN'		=> 'Path from the root to your phpBB board.',
+	'FTP_TIMEOUT'				=> 'FTP timeout',
+	'FTP_TIMEOUT_EXPLAIN'		=> 'The amount of time, in seconds, that the system will wait for a reply from your server.',
+	'FTP_USERNAME'				=> 'FTP username',
+	'FTP_USERNAME_EXPLAIN'		=> 'Username used to connect to your server.',
+
+	'GENERAL_ERROR'				=> 'General Error',
+	'GB'						=> 'GB',
+	'GIB'						=> 'GiB',
+	'GO'						=> 'Go',
+	'GOTO_PAGE'					=> 'Go to page',
+	'GROUP'						=> 'Group',
+	'GROUPS'					=> 'Groups',
+	'GROUP_ERR_TYPE'			=> 'Inappropriate group type specified.',
+	'GROUP_ERR_USERNAME'		=> 'No group name specified.',
+	'GROUP_ERR_USER_LONG'		=> 'Group names cannot exceed 60 characters. The specified group name is too long.',
+	'GUEST'						=> 'Guest',
+	'GUEST_USERS_ONLINE'		=> 'There are %d guest users online',
+	'GUEST_USERS_TOTAL'			=> '%d guests',
+	'GUEST_USERS_ZERO_ONLINE'	=> 'There are 0 guest users online',
+	'GUEST_USERS_ZERO_TOTAL'	=> '0 guests',
+	'GUEST_USER_ONLINE'			=> 'There is %d guest user online',
+	'GUEST_USER_TOTAL'			=> '%d guest',
+	'G_ADMINISTRATORS'			=> 'Administrators',
+	'G_BOTS'					=> 'Bots',
+	'G_GUESTS'					=> 'Guests',
+	'G_REGISTERED'				=> 'Registered users',
+	'G_REGISTERED_COPPA'		=> 'Registered COPPA users',
+	'G_GLOBAL_MODERATORS'		=> 'Global moderators',
+	'G_NEWLY_REGISTERED'		=> 'Newly registered users',
+
+	'HIDDEN_USERS_ONLINE'			=> '%d hidden users online',
+	'HIDDEN_USERS_TOTAL'			=> '%d hidden',
+	'HIDDEN_USERS_TOTAL_AND'		=> '%d hidden and ',
+	'HIDDEN_USERS_ZERO_ONLINE'		=> '0 hidden users online',
+	'HIDDEN_USERS_ZERO_TOTAL'		=> '0 hidden',
+	'HIDDEN_USERS_ZERO_TOTAL_AND'	=> '0 hidden and ',
+	'HIDDEN_USER_ONLINE'			=> '%d hidden user online',
+	'HIDDEN_USER_TOTAL'				=> '%d hidden',
+	'HIDDEN_USER_TOTAL_AND'			=> '%d hidden and ',
+	'HIDE_GUESTS'					=> 'Hide guests',
+	'HIDE_ME'						=> 'Hide my online status this session',
+	'HOURS'							=> 'Hours',
+	'HOME'							=> 'Home',
+
+	'ICQ'						=> 'ICQ',
+	'ICQ_STATUS'				=> 'ICQ status',
+	'IF'						=> 'If',
+	'IMAGE'						=> 'Image',
+	'IMAGE_FILETYPE_INVALID'	=> 'Image file type %d for mimetype %s not supported.',
+	'IMAGE_FILETYPE_MISMATCH'	=> 'Image file type mismatch: expected extension %1$s but extension %2$s given.',
+	'IN'						=> 'in',
+	'INDEX'						=> 'Index page',
+	'INFORMATION'				=> 'Information',
+	'INTERESTS'					=> 'Interests',
+	'INVALID_DIGEST_CHALLENGE'	=> 'Invalid digest challenge.',
+	'INVALID_EMAIL_LOG'			=> '<strong>%s</strong> possibly an invalid e-mail address?',
+	'IP'						=> 'IP',
+	'IP_BLACKLISTED'			=> 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.',
+
+	'JABBER'				=> 'Jabber',
+	'JOINED'				=> 'Joined',
+	'JUMP_PAGE'				=> 'Enter the page number you wish to go to',
+	'JUMP_TO'				=> 'Jump to',
+	'JUMP_TO_PAGE'			=> 'Click to jump to page…',
+
+	'KB'					=> 'KB',
+	'KIB'					=> 'KiB',
+
+	'LAST_POST'							=> 'Last post',
+	'LAST_UPDATED'						=> 'Last updated',
+	'LAST_VISIT'						=> 'Last visit',
+	'LDAP_NO_LDAP_EXTENSION'			=> 'LDAP extension not available.',
+	'LDAP_NO_SERVER_CONNECTION'			=> 'Could not connect to LDAP server.',
+	'LEGEND'							=> 'Legend',
+	'LOCATION'							=> 'Location',
+	'LOCK_POST'							=> 'Lock post',
+	'LOCK_POST_EXPLAIN'					=> 'Prevent editing',
+	'LOCK_TOPIC'						=> 'Lock topic',
+	'LOGIN'								=> 'Login',
+	'LOGIN_CHECK_PM'					=> 'Log in to check your private messages.',
+	'LOGIN_CONFIRMATION'				=> 'Confirmation of login',
+	'LOGIN_CONFIRM_EXPLAIN'				=> 'To prevent brute forcing accounts the board requires you to enter a confirmation code after a maximum amount of failed logins. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
+	'LOGIN_ERROR_ATTEMPTS'				=> 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now also have to enter the confirm code from the image you see below.',
+	'LOGIN_ERROR_EXTERNAL_AUTH_APACHE'	=> 'You have not been authenticated by Apache.',
+	'LOGIN_ERROR_PASSWORD'				=> 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
+	'LOGIN_ERROR_PASSWORD_CONVERT'		=> 'It was not possible to convert your password when updating this bulletin board’s software. Please %srequest a new password%s. If you continue to have problems please contact the %sBoard Administrator%s.',
+	'LOGIN_ERROR_USERNAME'				=> 'You have specified an incorrect username. Please check your username and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
+	'LOGIN_FORUM'						=> 'To view or post in this forum you must enter its password.',
+	'LOGIN_INFO'						=> 'In order to login you must be registered. Registering takes only a few moments but gives you increased capabilities. The board administrator may also grant additional permissions to registered users. Before you register please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.',
+	'LOGIN_VIEWFORUM'					=> 'The board requires you to be registered and logged in to view this forum.',
+	'LOGIN_EXPLAIN_EDIT'				=> 'In order to edit posts in this forum you have to be registered and logged in.',
+	'LOGIN_EXPLAIN_VIEWONLINE'			=> 'In order to view the online list you have to be registered and logged in.',
+	'LOGOUT'							=> 'Logout',
+	'LOGOUT_USER'						=> 'Logout [ %s ]',
+	'LOG_ME_IN'							=> 'Log me on automatically each visit',
+
+	'MARK'					=> 'Mark',
+	'MARK_ALL'				=> 'Mark all',
+	'MARK_FORUMS_READ'		=> 'Mark forums read',
+	'MB'					=> 'MB',
+	'MIB'					=> 'MiB',
+	'MCP'					=> 'Moderator Control Panel',
+	'MEMBERLIST'			=> 'Members',
+	'MEMBERLIST_EXPLAIN'	=> 'View complete list of members',
+	'MERGE'					=> 'Merge',
+	'MERGE_POSTS'			=> 'Merge posts',
+	'MERGE_TOPIC'			=> 'Merge topic',
+	'MESSAGE'				=> 'Message',
+	'MESSAGES'				=> 'Messages',
+	'MESSAGE_BODY'			=> 'Message body',
+	'MINUTES'				=> 'Minutes',
+	'MODERATE'				=> 'Moderate',
+	'MODERATOR'				=> 'Moderator',
+	'MODERATORS'			=> 'Moderators',
+	'MONTH'					=> 'Month',
+	'MOVE'					=> 'Move',
+	'MSNM'					=> 'MSNM/WLM',
+
+	'NA'						=> 'N/A',
+	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
+	'NEW_MESSAGE'				=> 'New message',
+	'NEW_MESSAGES'				=> 'New messages',
+	'NEW_PM'					=> '<strong>%d</strong> new message',
+	'NEW_PMS'					=> '<strong>%d</strong> new messages',
+	'NEW_POST'					=> 'New post',
+	'NEW_POSTS'					=> 'New posts',
+	'NEXT'						=> 'Next',		// Used in pagination
+	'NEXT_STEP'					=> 'Next',
+	'NEVER'						=> 'Never',
+	'NO'						=> 'No',
+	'NOT_ALLOWED_MANAGE_GROUP'	=> 'You are not allowed to manage this group.',
+	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
+	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
+	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
+	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
+	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
+	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
+	'NO_ACTION'					=> 'No action specified.',
+	'NO_ADMINISTRATORS'			=> 'There are no administrators.',
+	'NO_AUTH_ADMIN'				=> 'Access to the Administration Control Panel is not allowed as you do not have administrative permissions.',
+	'NO_AUTH_ADMIN_USER_DIFFER'	=> 'You are not able to re-authenticate as a different user.',
+	'NO_AUTH_OPERATION'			=> 'You do not have the necessary permissions to complete this operation.',
+	'NO_CONNECT_TO_SMTP_HOST'	=> 'Could not connect to smtp host : %1$s : %2$s',
+	'NO_BIRTHDAYS'				=> 'No birthdays today',
+	'NO_EMAIL_MESSAGE'			=> 'E-mail message was blank.',
+	'NO_EMAIL_RESPONSE_CODE'	=> 'Could not get mail server response codes.',
+	'NO_EMAIL_SUBJECT'			=> 'No e-mail subject specified.',
+	'NO_FORUM'					=> 'The forum you selected does not exist.',
+	'NO_FORUMS'					=> 'This board has no forums.',
+	'NO_GROUP'					=> 'The requested usergroup does not exist.',
+	'NO_GROUP_MEMBERS'			=> 'This group currently has no members.',
+	'NO_IPS_DEFINED'			=> 'No IP addresses or hostnames defined',
+	'NO_MEMBERS'				=> 'No members found for this search criterion.',
+	'NO_MESSAGES'				=> 'No messages',
+	'NO_MODE'					=> 'No mode specified.',
+	'NO_MODERATORS'				=> 'There are no moderators.',
+	'NO_NEW_MESSAGES'			=> 'No new messages',
+	'NO_NEW_PM'					=> '<strong>0</strong> new messages',
+	'NO_NEW_POSTS'				=> 'No new posts',
+	'NO_ONLINE_USERS'			=> 'No registered users',
+	'NO_POSTS'					=> 'No posts',
+	'NO_POSTS_TIME_FRAME'		=> 'No posts exist inside this topic for the selected time frame.',
+	'NO_FEED_ENABLED'			=> 'Feeds are not available on this board.',
+	'NO_FEED'					=> 'The requested feed is not available.',
+	'NO_SUBJECT'				=> 'No subject specified',								// Used for posts having no subject defined but displayed within management pages.
+	'NO_SUCH_SEARCH_MODULE'		=> 'The specified search backend doesn’t exist.',
+	'NO_SUPPORTED_AUTH_METHODS'	=> 'No supported authentication methods.',
+	'NO_TOPIC'					=> 'The requested topic does not exist.',
+	'NO_TOPIC_FORUM'			=> 'The topic or forum no longer exists.',
+	'NO_TOPICS'					=> 'There are no topics or posts in this forum.',
+	'NO_TOPICS_TIME_FRAME'		=> 'No topics exist inside this forum for the selected time frame.',
+	'NO_UNREAD_PM'				=> '<strong>0</strong> unread messages',
+	'NO_UPLOAD_FORM_FOUND'		=> 'Upload initiated but no valid file upload form found.',
+	'NO_USER'					=> 'The requested user does not exist.',
+	'NO_USERS'					=> 'The requested users do not exist.',
+	'NO_USER_SPECIFIED'			=> 'No username was specified.',
+
+	// Nullar/Singular/Plural language entry. The key numbers define the number range in which a certain grammatical expression is valid.
+	'NUM_POSTS_IN_QUEUE'		=> array(
+		0			=> 'No posts in queue',		// 0
+		1			=> '1 post in queue',		// 1
+		2			=> '%d posts in queue',		// 2+
+	),
+
+	'OCCUPATION'				=> 'Occupation',
+	'OFFLINE'					=> 'Offline',
+	'ONLINE'					=> 'Online',
+	'ONLINE_BUDDIES'			=> 'Online friends',
+	'ONLINE_USERS_TOTAL'		=> 'In total there are <strong>%d</strong> users online :: ',
+	'ONLINE_USERS_ZERO_TOTAL'	=> 'In total there are <strong>0</strong> users online :: ',
+	'ONLINE_USER_TOTAL'			=> 'In total there is <strong>%d</strong> user online :: ',
+	'OPTIONS'					=> 'Options',
+
+	'PAGE_OF'				=> 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
+	'PASSWORD'				=> 'Password',
+	'PLAY_QUICKTIME_FILE'	=> 'Play Quicktime file',
+	'PM'					=> 'PM',
+	'POSTING_MESSAGE'		=> 'Posting message in %s',
+	'POSTING_PRIVATE_MESSAGE'	=> 'Composing private message',
+	'POST'					=> 'Post',
+	'POST_ANNOUNCEMENT'		=> 'Announce',
+	'POST_STICKY'			=> 'Sticky',
+	'POSTED'				=> 'Posted',
+	'POSTED_IN_FORUM'		=> 'in',
+	'POSTED_ON_DATE'		=> 'on',
+	'POSTS'					=> 'Posts',
+	'POSTS_UNAPPROVED'		=> 'At least one post in this topic has not been approved.',
+	'POST_BY_AUTHOR'		=> 'by',
+	'POST_BY_FOE'			=> 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. %2$sDisplay this post%3$s.',
+	'POST_DAY'				=> '%.2f posts per day',
+	'POST_DETAILS'			=> 'Post details',
+	'POST_NEW_TOPIC'		=> 'Post new topic',
+	'POST_PCT'				=> '%.2f%% of all posts',
+	'POST_PCT_ACTIVE'		=> '%.2f%% of user’s posts',
+	'POST_PCT_ACTIVE_OWN'	=> '%.2f%% of your posts',
+	'POST_REPLY'			=> 'Post a reply',
+	'POST_REPORTED'			=> 'Click to view report',
+	'POST_SUBJECT'			=> 'Post subject',
+	'POST_TIME'				=> 'Post time',
+	'POST_TOPIC'			=> 'Post a new topic',
+	'POST_UNAPPROVED'		=> 'This post is waiting for approval',
+	'PREVIEW'				=> 'Preview',
+	'PREVIOUS'				=> 'Previous',		// Used in pagination
+	'PREVIOUS_STEP'			=> 'Previous',
+	'PRIVACY'				=> 'Privacy policy',
+	'PRIVATE_MESSAGE'		=> 'Private message',
+	'PRIVATE_MESSAGES'		=> 'Private messages',
+	'PRIVATE_MESSAGING'		=> 'Private messaging',
+	'PROFILE'				=> 'User Control Panel',
+
+	'READING_FORUM'				=> 'Viewing topics in %s',
+	'READING_GLOBAL_ANNOUNCE'	=> 'Reading global announcement',
+	'READING_LINK'				=> 'Following forum link %s',
+	'READING_TOPIC'				=> 'Reading topic in %s',
+	'READ_PROFILE'				=> 'Profile',
+	'REASON'					=> 'Reason',
+	'RECORD_ONLINE_USERS'		=> 'Most users ever online was <strong>%1$s</strong> on %2$s',
+	'REDIRECT'					=> 'Redirect',
+	'REDIRECTS'					=> 'Total redirects',
+	'REGISTER'					=> 'Register',
+	'REGISTERED_USERS'			=> 'Registered users:',
+	'REG_USERS_ONLINE'			=> 'There are %d registered users and ',
+	'REG_USERS_TOTAL'			=> '%d registered, ',
+	'REG_USERS_TOTAL_AND'		=> '%d registered and ',
+	'REG_USERS_ZERO_ONLINE'		=> 'There are 0 registered users and ',
+	'REG_USERS_ZERO_TOTAL'		=> '0 registered, ',
+	'REG_USERS_ZERO_TOTAL_AND'	=> '0 registered and ',
+	'REG_USER_ONLINE'			=> 'There is %d registered user and ',
+	'REG_USER_TOTAL'			=> '%d registered, ',
+	'REG_USER_TOTAL_AND'		=> '%d registered and ',
+	'REMOVE'					=> 'Remove',
+	'REMOVE_INSTALL'			=> 'Please delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.',
+	'REPLIES'					=> 'Replies',
+	'REPLY_WITH_QUOTE'			=> 'Reply with quote',
+	'REPLYING_GLOBAL_ANNOUNCE'	=> 'Replying to global announcement',
+	'REPLYING_MESSAGE'			=> 'Replying to message in %s',
+	'REPORT_BY'					=> 'Report by',
+	'REPORT_POST'				=> 'Report this post',
+	'REPORTING_POST'			=> 'Reporting post',
+	'RESEND_ACTIVATION'			=> 'Resend activation e-mail',
+	'RESET'						=> 'Reset',
+	'RESTORE_PERMISSIONS'		=> 'Restore permissions',
+	'RETURN_INDEX'				=> '%sReturn to the index page%s',
+	'RETURN_FORUM'				=> '%sReturn to the forum last visited%s',
+	'RETURN_PAGE'				=> '%sReturn to the previous page%s',
+	'RETURN_TOPIC'				=> '%sReturn to the topic last visited%s',
+	'RETURN_TO'					=> 'Return to',
+	'FEED'						=> 'Feed',
+	'FEED_NEWS'					=> 'News',
+	'RULES_ATTACH_CAN'			=> 'You <strong>can</strong> post attachments in this forum',
+	'RULES_ATTACH_CANNOT'		=> 'You <strong>cannot</strong> post attachments in this forum',
+	'RULES_DELETE_CAN'			=> 'You <strong>can</strong> delete your posts in this forum',
+	'RULES_DELETE_CANNOT'		=> 'You <strong>cannot</strong> delete your posts in this forum',
+	'RULES_DOWNLOAD_CAN'		=> 'You <strong>can</strong> download attachments in this forum',
+	'RULES_DOWNLOAD_CANNOT'		=> 'You <strong>cannot</strong> download attachments in this forum',
+	'RULES_EDIT_CAN'			=> 'You <strong>can</strong> edit your posts in this forum',
+	'RULES_EDIT_CANNOT'			=> 'You <strong>cannot</strong> edit your posts in this forum',
+	'RULES_LOCK_CAN'			=> 'You <strong>can</strong> lock your topics in this forum',
+	'RULES_LOCK_CANNOT'			=> 'You <strong>cannot</strong> lock your topics in this forum',
+	'RULES_POST_CAN'			=> 'You <strong>can</strong> post new topics in this forum',
+	'RULES_POST_CANNOT'			=> 'You <strong>cannot</strong> post new topics in this forum',
+	'RULES_REPLY_CAN'			=> 'You <strong>can</strong> reply to topics in this forum',
+	'RULES_REPLY_CANNOT'		=> 'You <strong>cannot</strong> reply to topics in this forum',
+	'RULES_VOTE_CAN'			=> 'You <strong>can</strong> vote in polls in this forum',
+	'RULES_VOTE_CANNOT'			=> 'You <strong>cannot</strong> vote in polls in this forum',
+
+	'SEARCH'					=> 'Search',
+	'SEARCH_MINI'				=> 'Search…',
+	'SEARCH_ADV'				=> 'Advanced search',
+	'SEARCH_ADV_EXPLAIN'		=> 'View the advanced search options',
+	'SEARCH_KEYWORDS'			=> 'Search for keywords',
+	'SEARCHING_FORUMS'			=> 'Searching forums',
+	'SEARCH_ACTIVE_TOPICS'		=> 'View active topics',
+	'SEARCH_FOR'				=> 'Search for',
+	'SEARCH_FORUM'				=> 'Search this forum…',
+	'SEARCH_NEW'				=> 'View new posts',
+	'SEARCH_POSTS_BY'			=> 'Search posts by',
+	'SEARCH_SELF'				=> 'View your posts',
+	'SEARCH_TOPIC'				=> 'Search this topic…',
+	'SEARCH_UNANSWERED'			=> 'View unanswered posts',
+	'SEARCH_UNREAD'				=> 'View unread posts',
+	'SECONDS'					=> 'Seconds',
+	'SELECT'					=> 'Select',
+	'SELECT_ALL_CODE'			=> 'Select all',
+	'SELECT_DESTINATION_FORUM'	=> 'Please select a destination forum',
+	'SELECT_FORUM'				=> 'Select a forum',
+	'SEND_EMAIL'				=> 'E-mail',				// Used for submit buttons
+	'SEND_EMAIL_USER'			=> 'E-mail',				// Used as: {L_SEND_EMAIL_USER} {USERNAME} -> E-mail UserX
+	'SEND_PRIVATE_MESSAGE'		=> 'Send private message',
+	'SETTINGS'					=> 'Settings',
+	'SIGNATURE'					=> 'Signature',
+	'SKIP'						=> 'Skip to content',
+	'SMTP_NO_AUTH_SUPPORT'		=> 'SMTP server does not support authentication.',
+	'SORRY_AUTH_READ'			=> 'You are not authorised to read this forum.',
+	'SORRY_AUTH_VIEW_ATTACH'	=> 'You are not authorised to download this attachment.',
+	'SORT_BY'					=> 'Sort by',
+	'SORT_JOINED'				=> 'Joined date',
+	'SORT_LOCATION'				=> 'Location',
+	'SORT_RANK'					=> 'Rank',
+	'SORT_POSTS'				=> 'Posts',
+	'SORT_TOPIC_TITLE'			=> 'Topic title',
+	'SORT_USERNAME'				=> 'Username',
+	'SPLIT_TOPIC'				=> 'Split topic',
+	'SQL_ERROR_OCCURRED'		=> 'An SQL error occurred while fetching this page. Please contact the %sBoard Administrator%s if this problem persists.',
+	'STATISTICS'				=> 'Statistics',
+	'START_WATCHING_FORUM'		=> 'Subscribe forum',
+	'START_WATCHING_TOPIC'		=> 'Subscribe topic',
+	'STOP_WATCHING_FORUM'		=> 'Unsubscribe forum',
+	'STOP_WATCHING_TOPIC'		=> 'Unsubscribe topic',
+	'SUBFORUM'					=> 'Subforum',
+	'SUBFORUMS'					=> 'Subforums',
+	'SUBJECT'					=> 'Subject',
+	'SUBMIT'					=> 'Submit',
+
+	'TERMS_USE'			=> 'Terms of use',
+	'TEST_CONNECTION'	=> 'Test connection',
+	'THE_TEAM'			=> 'The team',
+	'TIME'				=> 'Time',
+
+	'TOO_LONG'						=> 'The value you entered is too long.',
+
+	'TOO_LONG_AIM'					=> 'The screenname you entered is too long.',
+	'TOO_LONG_CONFIRM_CODE'			=> 'The confirm code you entered is too long.',
+	'TOO_LONG_DATEFORMAT'			=> 'The date format you entered is too long.',
+	'TOO_LONG_ICQ'					=> 'The ICQ number you entered is too long.',
+	'TOO_LONG_INTERESTS'			=> 'The interests you entered is too long.',
+	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
+	'TOO_LONG_LOCATION'				=> 'The location you entered is too long.',
+	'TOO_LONG_MSN'					=> 'The MSNM/WLM name you entered is too long.',
+	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
+	'TOO_LONG_OCCUPATION'			=> 'The occupation you entered is too long.',
+	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
+	'TOO_LONG_USER_PASSWORD'		=> 'The password you entered is too long.',
+	'TOO_LONG_USERNAME'				=> 'The username you entered is too long.',
+	'TOO_LONG_EMAIL'				=> 'The e-mail address you entered is too long.',
+	'TOO_LONG_EMAIL_CONFIRM'		=> 'The e-mail address confirmation you entered is too long.',
+	'TOO_LONG_WEBSITE'				=> 'The website address you entered is too long.',
+	'TOO_LONG_YIM'					=> 'The Yahoo! Messenger name you entered is too long.',
+
+	'TOO_MANY_VOTE_OPTIONS'			=> 'You have tried to vote for too many options.',
+
+	'TOO_SHORT'						=> 'The value you entered is too short.',
+
+	'TOO_SHORT_AIM'					=> 'The screenname you entered is too short.',
+	'TOO_SHORT_CONFIRM_CODE'		=> 'The confirm code you entered is too short.',
+	'TOO_SHORT_DATEFORMAT'			=> 'The date format you entered is too short.',
+	'TOO_SHORT_ICQ'					=> 'The ICQ number you entered is too short.',
+	'TOO_SHORT_INTERESTS'			=> 'The interests you entered is too short.',
+	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
+	'TOO_SHORT_LOCATION'			=> 'The location you entered is too short.',
+	'TOO_SHORT_MSN'					=> 'The MSNM/WLM name you entered is too short.',
+	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
+	'TOO_SHORT_OCCUPATION'			=> 'The occupation you entered is too short.',
+	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
+	'TOO_SHORT_USER_PASSWORD'		=> 'The password you entered is too short.',
+	'TOO_SHORT_USERNAME'			=> 'The username you entered is too short.',
+	'TOO_SHORT_EMAIL'				=> 'The e-mail address you entered is too short.',
+	'TOO_SHORT_EMAIL_CONFIRM'		=> 'The e-mail address confirmation you entered is too short.',
+	'TOO_SHORT_WEBSITE'				=> 'The website address you entered is too short.',
+	'TOO_SHORT_YIM'					=> 'The Yahoo! Messenger name you entered is too short.',
+
+	'TOPIC'				=> 'Topic',
+	'TOPICS'			=> 'Topics',
+	'TOPICS_UNAPPROVED'	=> 'At least one topic in this forum has not been approved.',
+	'TOPIC_ICON'		=> 'Topic icon',
+	'TOPIC_LOCKED'		=> 'This topic is locked, you cannot edit posts or make further replies.',
+	'TOPIC_LOCKED_SHORT'=> 'Topic locked',
+	'TOPIC_MOVED'		=> 'Moved topic',
+	'TOPIC_REVIEW'		=> 'Topic review',
+	'TOPIC_TITLE'		=> 'Topic title',
+	'TOPIC_UNAPPROVED'	=> 'This topic has not been approved',
+	'TOTAL_ATTACHMENTS'	=> 'Attachment(s)',
+	'TOTAL_LOG'			=> '1 log',
+	'TOTAL_LOGS'		=> '%d logs',
+	'TOTAL_NO_PM'		=> '0 private messages in total',
+	'TOTAL_PM'			=> '1 private message in total',
+	'TOTAL_PMS'			=> '%d private messages in total',
+	'TOTAL_POSTS'		=> 'Total posts',
+	'TOTAL_POSTS_OTHER'	=> 'Total posts <strong>%d</strong>',
+	'TOTAL_POSTS_ZERO'	=> 'Total posts <strong>0</strong>',
+	'TOPIC_REPORTED'	=> 'This topic has been reported',
+	'TOTAL_TOPICS_OTHER'=> 'Total topics <strong>%d</strong>',
+	'TOTAL_TOPICS_ZERO'	=> 'Total topics <strong>0</strong>',
+	'TOTAL_USERS_OTHER'	=> 'Total members <strong>%d</strong>',
+	'TOTAL_USERS_ZERO'	=> 'Total members <strong>0</strong>',
+	'TRACKED_PHP_ERROR'	=> 'Tracked PHP errors: %s',
+
+	'UNABLE_GET_IMAGE_SIZE'	=> 'It was not possible to determine the dimensions of the image.',
+	'UNABLE_TO_DELIVER_FILE'=> 'Unable to deliver file.',
+	'UNKNOWN_BROWSER'		=> 'Unknown browser',
+	'UNMARK_ALL'			=> 'Unmark all',
+	'UNREAD_MESSAGES'		=> 'Unread messages',
+	'UNREAD_PM'				=> '<strong>%d</strong> unread message',
+	'UNREAD_PMS'			=> '<strong>%d</strong> unread messages',
+	'UNWATCHED_FORUMS'			=> 'You are no longer subscribed to the selected forums.',
+	'UNWATCHED_TOPICS'			=> 'You are no longer subscribed to the selected topics.',
+	'UNWATCHED_FORUMS_TOPICS'	=> 'You are no longer subscribed to the selected entries.',
+	'UPDATE'				=> 'Update',
+	'UPLOAD_IN_PROGRESS'	=> 'The upload is currently in progress.',
+	'URL_REDIRECT'			=> 'If your browser does not support meta redirection %splease click HERE to be redirected%s.',
+	'USERGROUPS'			=> 'Groups',
+	'USERNAME'				=> 'Username',
+	'USERNAMES'				=> 'Usernames',
+	'USER_AVATAR'			=> 'User avatar',
+	'USER_CANNOT_READ'		=> 'You cannot read posts in this forum.',
+	'USER_POST'				=> '%d Post',
+	'USER_POSTS'			=> '%d Posts',
+	'USERS'					=> 'Users',
+	'USE_PERMISSIONS'		=> 'Test out user’s permissions',
+
+	'USER_NEW_PERMISSION_DISALLOWED'	=> 'We are sorry, but you are not authorised to use this feature. You may have just registered here and may need to participate more to be able to use this feature.',
+
+	'VARIANT_DATE_SEPARATOR'	=> ' / ',	// Used in date format dropdown, eg: "Today, 13:37 / 01 Jan 2007, 13:37" ... to join a relative date with calendar date
+	'VIEWED'					=> 'Viewed',
+	'VIEWING_FAQ'				=> 'Viewing FAQ',
+	'VIEWING_MEMBERS'			=> 'Viewing member details',
+	'VIEWING_ONLINE'			=> 'Viewing who is online',
+	'VIEWING_MCP'				=> 'Viewing moderator control panel',
+	'VIEWING_MEMBER_PROFILE'	=> 'Viewing member profile',
+	'VIEWING_PRIVATE_MESSAGES'	=> 'Viewing private messages',
+	'VIEWING_REGISTER'			=> 'Registering account',
+	'VIEWING_UCP'				=> 'Viewing user control panel',
+	'VIEWS'						=> 'Views',
+	'VIEW_BOOKMARKS'			=> 'View bookmarks',
+	'VIEW_FORUM_LOGS'			=> 'View Logs',
+	'VIEW_LATEST_POST'			=> 'View the latest post',
+	'VIEW_NEWEST_POST'			=> 'View first unread post',
+	'VIEW_NOTES'				=> 'View user notes',
+	'VIEW_ONLINE_TIME'			=> 'based on users active over the past %d minute',
+	'VIEW_ONLINE_TIMES'			=> 'based on users active over the past %d minutes',
+	'VIEW_TOPIC'				=> 'View topic',
+	'VIEW_TOPIC_ANNOUNCEMENT'	=> 'Announcement: ',
+	'VIEW_TOPIC_GLOBAL'			=> 'Global Announcement: ',
+	'VIEW_TOPIC_LOCKED'			=> 'Locked: ',
+	'VIEW_TOPIC_LOGS'			=> 'View logs',
+	'VIEW_TOPIC_MOVED'			=> 'Moved: ',
+	'VIEW_TOPIC_POLL'			=> 'Poll: ',
+	'VIEW_TOPIC_STICKY'			=> 'Sticky: ',
+	'VISIT_WEBSITE'				=> 'Visit website',
+
+	'WARNINGS'			=> 'Warnings',
+	'WARN_USER'			=> 'Warn user',
+	'WELCOME_SUBJECT'	=> 'Welcome to %s forums',
+	'WEBSITE'			=> 'Website',
+	'WHOIS'				=> 'Whois',
+	'WHO_IS_ONLINE'		=> 'Who is online',
+	'WRONG_PASSWORD'	=> 'You entered an incorrect password.',
+
+	'WRONG_DATA_ICQ'			=> 'The number you entered is not a valid ICQ number.',
+	'WRONG_DATA_JABBER'			=> 'The name you entered is not a valid Jabber account name.',
+	'WRONG_DATA_LANG'			=> 'The language you specified is not valid.',
+	'WRONG_DATA_WEBSITE'		=> 'The website address has to be a valid URL, including the protocol. For example http://www.example.com/.',
+	'WROTE'						=> 'wrote',
+
+	'YEAR'				=> 'Year',
+	'YEAR_MONTH_DAY'	=> '(YYYY-MM-DD)',
+	'YES'				=> 'Yes',
+	'YIM'				=> 'YIM',
+	'YOU_LAST_VISIT'	=> 'Last visit was: %s',
+	'YOU_NEW_PM'		=> 'A new private message is waiting for you in your Inbox.',
+	'YOU_NEW_PMS'		=> 'New private messages are waiting for you in your Inbox.',
+	'YOU_NO_NEW_PM'		=> 'No new private messages are waiting for you.',
+
+	'datetime'			=> array(
+		'TODAY'		=> 'Today',
+		'TOMORROW'	=> 'Tomorrow',
+		'YESTERDAY'	=> 'Yesterday',
+		'AGO'		=> array(
+			0		=> 'less than a minute ago',
+			1		=> '%d minute ago',
+			2		=> '%d minutes ago',
+			60		=> '1 hour ago',
+		),
+
+		'Sunday'	=> 'Sunday',
+		'Monday'	=> 'Monday',
+		'Tuesday'	=> 'Tuesday',
+		'Wednesday'	=> 'Wednesday',
+		'Thursday'	=> 'Thursday',
+		'Friday'	=> 'Friday',
+		'Saturday'	=> 'Saturday',
+
+		'Sun'		=> 'Sun',
+		'Mon'		=> 'Mon',
+		'Tue'		=> 'Tue',
+		'Wed'		=> 'Wed',
+		'Thu'		=> 'Thu',
+		'Fri'		=> 'Fri',
+		'Sat'		=> 'Sat',
+
+		'January'	=> 'January',
+		'February'	=> 'February',
+		'March'		=> 'March',
+		'April'		=> 'April',
+		'May'		=> 'May',
+		'June'		=> 'June',
+		'July'		=> 'July',
+		'August'	=> 'August',
+		'September' => 'September',
+		'October'	=> 'October',
+		'November'	=> 'November',
+		'December'	=> 'December',
+
+		'Jan'		=> 'Jan',
+		'Feb'		=> 'Feb',
+		'Mar'		=> 'Mar',
+		'Apr'		=> 'Apr',
+		'May_short'	=> 'May',	// Short representation of "May". May_short used because in English the short and long date are the same for May.
+		'Jun'		=> 'Jun',
+		'Jul'		=> 'Jul',
+		'Aug'		=> 'Aug',
+		'Sep'		=> 'Sep',
+		'Oct'		=> 'Oct',
+		'Nov'		=> 'Nov',
+		'Dec'		=> 'Dec',
+	),
+
+	'tz'				=> array(
+		'-12'	=> 'UTC - 12 hours',
+		'-11'	=> 'UTC - 11 hours',
+		'-10'	=> 'UTC - 10 hours',
+		'-9.5'	=> 'UTC - 9:30 hours',
+		'-9'	=> 'UTC - 9 hours',
+		'-8'	=> 'UTC - 8 hours',
+		'-7'	=> 'UTC - 7 hours',
+		'-6'	=> 'UTC - 6 hours',
+		'-5'	=> 'UTC - 5 hours',
+		'-4.5'	=> 'UTC - 4:30 hours',
+		'-4'	=> 'UTC - 4 hours',
+		'-3.5'	=> 'UTC - 3:30 hours',
+		'-3'	=> 'UTC - 3 hours',
+		'-2'	=> 'UTC - 2 hours',
+		'-1'	=> 'UTC - 1 hour',
+		'0'		=> 'UTC',
+		'1'		=> 'UTC + 1 hour',
+		'2'		=> 'UTC + 2 hours',
+		'3'		=> 'UTC + 3 hours',
+		'3.5'	=> 'UTC + 3:30 hours',
+		'4'		=> 'UTC + 4 hours',
+		'4.5'	=> 'UTC + 4:30 hours',
+		'5'		=> 'UTC + 5 hours',
+		'5.5'	=> 'UTC + 5:30 hours',
+		'5.75'	=> 'UTC + 5:45 hours',
+		'6'		=> 'UTC + 6 hours',
+		'6.5'	=> 'UTC + 6:30 hours',
+		'7'		=> 'UTC + 7 hours',
+		'8'		=> 'UTC + 8 hours',
+		'8.75'	=> 'UTC + 8:45 hours',
+		'9'		=> 'UTC + 9 hours',
+		'9.5'	=> 'UTC + 9:30 hours',
+		'10'	=> 'UTC + 10 hours',
+		'10.5'	=> 'UTC + 10:30 hours',
+		'11'	=> 'UTC + 11 hours',
+		'11.5'	=> 'UTC + 11:30 hours',
+		'12'	=> 'UTC + 12 hours',
+		'12.75'	=> 'UTC + 12:45 hours',
+		'13'	=> 'UTC + 13 hours',
+		'14'	=> 'UTC + 14 hours',
+		'dst'	=> '[ <abbr title="Daylight Saving Time">DST</abbr> ]',
+	),
+
+	'tz_zones'	=> array(
+		'-12'	=> '[UTC - 12] Baker Island Time',
+		'-11'	=> '[UTC - 11] Niue Time, Samoa Standard Time',
+		'-10'	=> '[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time',
+		'-9.5'	=> '[UTC - 9:30] Marquesas Islands Time',
+		'-9'	=> '[UTC - 9] Alaska Standard Time, Gambier Island Time',
+		'-8'	=> '[UTC - 8] Pacific Standard Time',
+		'-7'	=> '[UTC - 7] Mountain Standard Time',
+		'-6'	=> '[UTC - 6] Central Standard Time',
+		'-5'	=> '[UTC - 5] Eastern Standard Time',
+		'-4.5'	=> '[UTC - 4:30] Venezuelan Standard Time',
+		'-4'	=> '[UTC - 4] Atlantic Standard Time',
+		'-3.5'	=> '[UTC - 3:30] Newfoundland Standard Time',
+		'-3'	=> '[UTC - 3] Amazon Standard Time, Central Greenland Time',
+		'-2'	=> '[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time',
+		'-1'	=> '[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time',
+		'0'		=> '[UTC] Western European Time, Greenwich Mean Time',
+		'1'		=> '[UTC + 1] Central European Time, West African Time',
+		'2'		=> '[UTC + 2] Eastern European Time, Central African Time',
+		'3'		=> '[UTC + 3] Moscow Standard Time, Eastern African Time',
+		'3.5'	=> '[UTC + 3:30] Iran Standard Time',
+		'4'		=> '[UTC + 4] Gulf Standard Time, Samara Standard Time',
+		'4.5'	=> '[UTC + 4:30] Afghanistan Time',
+		'5'		=> '[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time',
+		'5.5'	=> '[UTC + 5:30] Indian Standard Time, Sri Lanka Time',
+		'5.75'	=> '[UTC + 5:45] Nepal Time',
+		'6'		=> '[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time',
+		'6.5'	=> '[UTC + 6:30] Cocos Islands Time, Myanmar Time',
+		'7'		=> '[UTC + 7] Indochina Time, Krasnoyarsk Standard Time',
+		'8'		=> '[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time',
+		'8.75'	=> '[UTC + 8:45] Southeastern Western Australia Standard Time',
+		'9'		=> '[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time',
+		'9.5'	=> '[UTC + 9:30] Australian Central Standard Time',
+		'10'	=> '[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time',
+		'10.5'	=> '[UTC + 10:30] Lord Howe Standard Time',
+		'11'	=> '[UTC + 11] Solomon Island Time, Magadan Standard Time',
+		'11.5'	=> '[UTC + 11:30] Norfolk Island Time',
+		'12'	=> '[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time',
+		'12.75'	=> '[UTC + 12:45] Chatham Islands Time',
+		'13'	=> '[UTC + 13] Tonga Time, Phoenix Islands Time',
+		'14'	=> '[UTC + 14] Line Island Time',
+	),
+
+	// The value is only an example and will get replaced by the current time on view
+	'dateformats'	=> array(
+		'd M Y, H:i'			=> '01 Jan 2007, 13:37',
+		'd M Y H:i'				=> '01 Jan 2007 13:37',
+		'M jS, \'y, H:i'		=> 'Jan 1st, \'07, 13:37',
+		'D M d, Y g:i a'		=> 'Mon Jan 01, 2007 1:37 pm',
+		'F jS, Y, g:i a'		=> 'January 1st, 2007, 1:37 pm',
+		'|d M Y|, H:i'			=> 'Today, 13:37 / 01 Jan 2007, 13:37',
+		'|F jS, Y|, g:i a'		=> 'Today, 1:37 pm / January 1st, 2007, 1:37 pm'
+	),
+
+	// The default dateformat which will be used on new installs in this language
+	// Translators should change this if a the usual date format is different
+	'default_dateformat'	=> 'D M d, Y g:i a', // Mon Jan 01, 2007 1:37 pm
+
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/email/admin_activate.txt b/phpBB/language/en/email/admin_activate.txt
new file mode 100644
index 0000000000..8b11f1b450
--- /dev/null
+++ b/phpBB/language/en/email/admin_activate.txt
@@ -0,0 +1,14 @@
+Subject: Activate user account
+
+Hello,
+
+The account owned by "{USERNAME}" has been deactivated or newly created, you should check the details of this user (if required) and handle it appropriately.
+
+Use this link to view the user's profile:
+{U_USER_DETAILS}
+
+Use this link to activate the account:
+{U_ACTIVATE}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/admin_send_email.txt b/phpBB/language/en/email/admin_send_email.txt
new file mode 100644
index 0000000000..6687404527
--- /dev/null
+++ b/phpBB/language/en/email/admin_send_email.txt
@@ -0,0 +1,14 @@
+
+The following is an e-mail sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
+
+{CONTACT_EMAIL}
+
+Include this full e-mail (particularly the headers). 
+
+Message sent to you follows:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+{MESSAGE}
+
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/admin_welcome_activated.txt b/phpBB/language/en/email/admin_welcome_activated.txt
new file mode 100644
index 0000000000..c16a403f00
--- /dev/null
+++ b/phpBB/language/en/email/admin_welcome_activated.txt
@@ -0,0 +1,7 @@
+Subject: Account activated
+
+Hello {USERNAME},
+
+Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous e-mail.
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt
new file mode 100644
index 0000000000..af3ac9ca87
--- /dev/null
+++ b/phpBB/language/en/email/admin_welcome_inactive.txt
@@ -0,0 +1,19 @@
+Subject: Welcome to "{SITENAME}"
+
+{WELCOME_MSG}
+
+Please keep this e-mail for your records. Your account information is as follows:
+
+----------------------------
+Username: {USERNAME}
+
+Board URL: {U_BOARD}
+----------------------------
+
+Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this had occured.
+
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
+
+Thank you for registering.
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt
new file mode 100644
index 0000000000..c3e4af576d
--- /dev/null
+++ b/phpBB/language/en/email/coppa_resend_inactive.txt
@@ -0,0 +1,42 @@
+Subject: Welcome to "{SITENAME}"
+
+{WELCOME_MSG}
+
+In compliance with the COPPA, your account is currently inactive.
+
+Please print this message and have your parent or guardian sign and date it. Then fax it to:
+
+{FAX_INFO}
+
+OR mail it to:
+
+{MAIL_INFO}
+
+------------------------------ CUT HERE ------------------------------
+Permission to participate at "{SITENAME}" - {U_BOARD}
+
+Username: {USERNAME}
+E-mail: {EMAIL_ADDRESS}
+
+I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION. 
+I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. 
+I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM "{SITENAME}" AT ANY TIME.
+
+
+Parent or guardian 
+(print your name here): _____________________
+
+(sign here): __________________ 
+
+Date: _______________
+
+------------------------------ CUT HERE ------------------------------
+
+
+Once the administrator has received the above form via fax or regular mail, your account will be activated.
+
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
+
+Thank you for registering.
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt
new file mode 100644
index 0000000000..c3e4af576d
--- /dev/null
+++ b/phpBB/language/en/email/coppa_welcome_inactive.txt
@@ -0,0 +1,42 @@
+Subject: Welcome to "{SITENAME}"
+
+{WELCOME_MSG}
+
+In compliance with the COPPA, your account is currently inactive.
+
+Please print this message and have your parent or guardian sign and date it. Then fax it to:
+
+{FAX_INFO}
+
+OR mail it to:
+
+{MAIL_INFO}
+
+------------------------------ CUT HERE ------------------------------
+Permission to participate at "{SITENAME}" - {U_BOARD}
+
+Username: {USERNAME}
+E-mail: {EMAIL_ADDRESS}
+
+I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION. 
+I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. 
+I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM "{SITENAME}" AT ANY TIME.
+
+
+Parent or guardian 
+(print your name here): _____________________
+
+(sign here): __________________ 
+
+Date: _______________
+
+------------------------------ CUT HERE ------------------------------
+
+
+Once the administrator has received the above form via fax or regular mail, your account will be activated.
+
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
+
+Thank you for registering.
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/email_notify.txt b/phpBB/language/en/email/email_notify.txt
new file mode 100644
index 0000000000..0d0ac7fc28
--- /dev/null
+++ b/phpBB/language/en/email/email_notify.txt
@@ -0,0 +1,17 @@
+Subject: "{SITENAME}" - E-mail a friend
+
+Hello {TO_USERNAME},
+
+This e-mail was sent from "{SITENAME}" by {FROM_USERNAME} who thought you may be interested in the following topic:
+
+{TOPIC_NAME}
+
+You can find it at:
+
+{U_TOPIC}
+
+A message from {FROM_USERNAME} may also be included below. Please note that this message has not been seen or approved by the board administrators. If you wish to complain about having received this e-mail please contact the board administrator at {BOARD_CONTACT}. Please quote the message headers when contacting this address.
+
+----------
+
+{MESSAGE}
\ No newline at end of file
diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt
new file mode 100644
index 0000000000..fae5a83885
--- /dev/null
+++ b/phpBB/language/en/email/forum_notify.txt
@@ -0,0 +1,19 @@
+Subject: Forum post notification - "{FORUM_NAME}"
+
+Hello {USERNAME},
+
+You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
+
+{U_NEWEST_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
+
+{U_STOP_WATCHING_FORUM}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/group_added.txt b/phpBB/language/en/email/group_added.txt
new file mode 100644
index 0000000000..9464aae094
--- /dev/null
+++ b/phpBB/language/en/email/group_added.txt
@@ -0,0 +1,11 @@
+Subject: You have been added to this usergroup
+
+Congratulations,
+
+You have been added to the "{GROUP_NAME}" group on "{SITENAME}".
+This action was done by a group leader or the site administrator, contact them for more information.
+
+You can view your groups information here:
+{U_GROUP}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/group_approved.txt b/phpBB/language/en/email/group_approved.txt
new file mode 100644
index 0000000000..24afefcd07
--- /dev/null
+++ b/phpBB/language/en/email/group_approved.txt
@@ -0,0 +1,10 @@
+Subject: Your request has been approved
+
+Congratulations,
+
+Your request to join the "{GROUP_NAME}" group on "{SITENAME}" has been approved.
+Click on the following link to see your group membership.
+
+{U_GROUP}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/group_request.txt b/phpBB/language/en/email/group_request.txt
new file mode 100644
index 0000000000..75840831fb
--- /dev/null
+++ b/phpBB/language/en/email/group_request.txt
@@ -0,0 +1,10 @@
+Subject: A request to join your group has been made
+
+Dear {USERNAME},
+
+The user "{REQUEST_USERNAME}" has requested to join the group "{GROUP_NAME}" you moderate on "{SITENAME}".
+To approve or deny this request for group membership please visit the following link:
+
+{U_PENDING}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/index.htm b/phpBB/language/en/email/index.htm
new file mode 100644
index 0000000000..ee1f723a7d
--- /dev/null
+++ b/phpBB/language/en/email/index.htm
@@ -0,0 +1,10 @@
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+
+</body>
+</html>
diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt
new file mode 100644
index 0000000000..2aa03a7f33
--- /dev/null
+++ b/phpBB/language/en/email/installed.txt
@@ -0,0 +1,19 @@
+Subject: phpBB installed
+
+Congratulations,
+
+You have successfully installed phpBB on your server.
+
+This e-mail contains important information regarding your installation and should be kept for reference. Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
+
+----------------------------
+Username: {USERNAME}
+
+Board URL: {U_BOARD}
+----------------------------
+
+Useful information regarding the phpBB software can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/
+
+In order to keep your board safe and secure, we highly recommended keeping current with software releases. For your convenience, a mailing list is available at the page referenced above.
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt
new file mode 100644
index 0000000000..529bbf0f8f
--- /dev/null
+++ b/phpBB/language/en/email/newtopic_notify.txt
@@ -0,0 +1,13 @@
+Subject: New topic notification - "{FORUM_NAME}"
+
+Hello {USERNAME},
+
+You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
+
+{U_FORUM}
+
+If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
+
+{U_STOP_WATCHING_FORUM}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/pm_report_closed.txt b/phpBB/language/en/email/pm_report_closed.txt
new file mode 100644
index 0000000000..1b9f4a6658
--- /dev/null
+++ b/phpBB/language/en/email/pm_report_closed.txt
@@ -0,0 +1,8 @@
+Subject: Report closed - "{PM_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" has been tended to by a moderator or administrator. The report is now closed. If you have further questions, please contact {CLOSER_NAME} by private message.
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/pm_report_deleted.txt b/phpBB/language/en/email/pm_report_deleted.txt
new file mode 100644
index 0000000000..a868837841
--- /dev/null
+++ b/phpBB/language/en/email/pm_report_deleted.txt
@@ -0,0 +1,8 @@
+Subject: Report deleted - "{PM_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or administrator.
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt
new file mode 100644
index 0000000000..e715b54026
--- /dev/null
+++ b/phpBB/language/en/email/post_approved.txt
@@ -0,0 +1,14 @@
+Subject: Post approved - "{POST_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator.
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_VIEW_TOPIC}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt
new file mode 100644
index 0000000000..3bc64bb611
--- /dev/null
+++ b/phpBB/language/en/email/post_disapproved.txt
@@ -0,0 +1,12 @@
+Subject: Post disapproved - "{POST_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator.
+
+The following reason was given for the disapproval:
+
+{REASON}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt
new file mode 100644
index 0000000000..d363df7973
--- /dev/null
+++ b/phpBB/language/en/email/privmsg_notify.txt
@@ -0,0 +1,15 @@
+Subject: New private message has arrived
+
+Hello {USERNAME},
+
+You have received a new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject:
+
+{SUBJECT}
+
+You can view your new message by clicking on the following link:
+
+{U_INBOX}
+
+You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/profile_send_email.txt b/phpBB/language/en/email/profile_send_email.txt
new file mode 100644
index 0000000000..9fb19e7eb1
--- /dev/null
+++ b/phpBB/language/en/email/profile_send_email.txt
@@ -0,0 +1,13 @@
+
+Hello {TO_USERNAME},
+
+The following is an e-mail sent to you by {FROM_USERNAME} via your account on "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
+
+{BOARD_CONTACT}
+
+Include this full e-mail (particularly the headers). Please note that the reply address to this e-mail has been set to that of {FROM_USERNAME}.
+
+Message sent to you follows
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+{MESSAGE}
diff --git a/phpBB/language/en/email/profile_send_im.txt b/phpBB/language/en/email/profile_send_im.txt
new file mode 100644
index 0000000000..02c820c69d
--- /dev/null
+++ b/phpBB/language/en/email/profile_send_im.txt
@@ -0,0 +1,13 @@
+
+Hello {TO_USERNAME},
+
+The following is a message sent to you by {FROM_USERNAME} via your account on "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
+
+{BOARD_CONTACT}
+
+Include this full message. Please note that the sender address has been set to the boards IM account.
+
+Message sent to you follows
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+{MESSAGE}
diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt
new file mode 100644
index 0000000000..eb7ef22b5e
--- /dev/null
+++ b/phpBB/language/en/email/report_closed.txt
@@ -0,0 +1,8 @@
+Subject: Report closed - "{POST_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message.
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/report_deleted.txt b/phpBB/language/en/email/report_deleted.txt
new file mode 100644
index 0000000000..4292ca2239
--- /dev/null
+++ b/phpBB/language/en/email/report_deleted.txt
@@ -0,0 +1,8 @@
+Subject: Report deleted - "{POST_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was deleted by a moderator or by an administrator.
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt
new file mode 100644
index 0000000000..ffda378d30
--- /dev/null
+++ b/phpBB/language/en/email/topic_approved.txt
@@ -0,0 +1,11 @@
+Subject: Topic approved - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator.
+
+If you want to view the topic, click the following link:
+{U_VIEW_TOPIC}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt
new file mode 100644
index 0000000000..49ef58bf39
--- /dev/null
+++ b/phpBB/language/en/email/topic_disapproved.txt
@@ -0,0 +1,12 @@
+Subject: Topic disapproved - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator.
+
+The following reason was given for the disapproval:
+
+{REASON}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
new file mode 100644
index 0000000000..99587b28e0
--- /dev/null
+++ b/phpBB/language/en/email/topic_notify.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because you are watching the topic, "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+
+If you want to view the newest post made since your last visit, click the following link:
+{U_NEWEST_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link:
+
+{U_STOP_WATCHING_TOPIC}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_activate.txt b/phpBB/language/en/email/user_activate.txt
new file mode 100644
index 0000000000..7d7960c4c5
--- /dev/null
+++ b/phpBB/language/en/email/user_activate.txt
@@ -0,0 +1,9 @@
+Subject: Reactivate your account
+
+Hello {USERNAME},
+
+Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. In order to reactivate your account you must click on the link below:
+
+{U_ACTIVATE}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_activate_inactive.txt b/phpBB/language/en/email/user_activate_inactive.txt
new file mode 100644
index 0000000000..a90773d48c
--- /dev/null
+++ b/phpBB/language/en/email/user_activate_inactive.txt
@@ -0,0 +1,7 @@
+Subject: Your account has been deactivated
+
+Hello {USERNAME},
+
+Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. The administrator of the board will need to activate it before you can log in. You will receive another notification when this has occurred.
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_activate_passwd.txt b/phpBB/language/en/email/user_activate_passwd.txt
new file mode 100644
index 0000000000..695be115f8
--- /dev/null
+++ b/phpBB/language/en/email/user_activate_passwd.txt
@@ -0,0 +1,17 @@
+Subject: New password activation
+
+Hello {USERNAME}
+
+You are receiving this notification because you have (or someone pretending to be you has) requested a new password be sent for your account on "{SITENAME}". If you did not request this notification then please ignore it, if you keep receiving it please contact the board administrator.
+
+To use the new password you need to activate it. To do this click the link provided below.
+
+{U_ACTIVATE}
+
+If successful you will be able to login using the following password:
+
+Password: {PASSWORD}
+
+You can of course change this password yourself via the profile page. If you have any difficulties please contact the board administrator.
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt
new file mode 100644
index 0000000000..4ef7dd899a
--- /dev/null
+++ b/phpBB/language/en/email/user_reactivate_account.txt
@@ -0,0 +1,19 @@
+Subject: Reactivate your account on "{SITENAME}"
+
+A board administrator requested that your account be reactivated. Your account is currently inactive.
+Please follow the steps listed here to reactivate your account.
+
+Please keep this e-mail for your records. Your account information is as follows:
+
+----------------------------
+Username: {USERNAME}
+----------------------------
+
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
+
+Please visit the following link to reactivate your account:
+
+{U_ACTIVATE}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_remind_inactive.txt b/phpBB/language/en/email/user_remind_inactive.txt
new file mode 100644
index 0000000000..1ba28329f6
--- /dev/null
+++ b/phpBB/language/en/email/user_remind_inactive.txt
@@ -0,0 +1,11 @@
+Subject: Inactive account reminder
+
+Hello {USERNAME},
+
+This notification is a reminder that your account at "{SITENAME}", created on {REGISTER_DATE}, remains inactive. If you would like to activate this account, please visit the following link:
+
+{U_ACTIVATE}
+
+Thank you for registering at "{SITENAME}", we look forward to your participation.
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt
new file mode 100644
index 0000000000..4638d6df63
--- /dev/null
+++ b/phpBB/language/en/email/user_resend_inactive.txt
@@ -0,0 +1,20 @@
+Subject: Welcome to "{SITENAME}"
+
+{WELCOME_MSG}
+
+Please keep this e-mail for your records. Your account information is as follows:
+
+----------------------------
+Username: {USERNAME}
+----------------------------
+
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
+
+Please visit the following link in order to activate your account:
+
+{U_ACTIVATE}
+
+
+Thank you for registering.
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt
new file mode 100644
index 0000000000..2648769dfd
--- /dev/null
+++ b/phpBB/language/en/email/user_welcome.txt
@@ -0,0 +1,17 @@
+Subject: Welcome to "{SITENAME}"
+
+{WELCOME_MSG}
+
+Please keep this e-mail for your records. Your account information is as follows:
+
+----------------------------
+Username: {USERNAME}
+
+Board URL: {U_BOARD}
+----------------------------
+
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
+
+Thank you for registering.
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt
new file mode 100644
index 0000000000..1b72b1c5a8
--- /dev/null
+++ b/phpBB/language/en/email/user_welcome_inactive.txt
@@ -0,0 +1,21 @@
+Subject: Welcome to "{SITENAME}"
+
+{WELCOME_MSG}
+
+Please keep this e-mail for your records. Your account information is as follows:
+
+----------------------------
+Username: {USERNAME}
+
+Board URL: {U_BOARD}
+----------------------------
+
+Please visit the following link in order to activate your account:
+
+{U_ACTIVATE}
+
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
+
+Thank you for registering.
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php
new file mode 100644
index 0000000000..9f72d4070f
--- /dev/null
+++ b/phpBB/language/en/groups.php
@@ -0,0 +1,96 @@
+<?php
+/**
+*
+* groups [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ALREADY_DEFAULT_GROUP'		=> 'The selected group is already your default group.',
+	'ALREADY_IN_GROUP'			=> 'You are already a member of the selected group.',
+	'ALREADY_IN_GROUP_PENDING'	=> 'You already requested joining the selected group.',
+
+	'CANNOT_JOIN_GROUP'			=> 'You are not able to join this group. You are only able to join open and freely open groups.',
+	'CANNOT_RESIGN_GROUP'		=> 'You are not able to resign from this group. You are only able to resign from open and freely open groups.',
+	'CHANGED_DEFAULT_GROUP'		=> 'Successfully changed default group.',
+
+	'GROUP_AVATAR'						=> 'Group avatar',
+	'GROUP_CHANGE_DEFAULT'				=> 'Are you sure you want to change your default membership to the group “%s”?',
+	'GROUP_CLOSED'						=> 'Closed',
+	'GROUP_DESC'						=> 'Group description',
+	'GROUP_HIDDEN'						=> 'Hidden',
+	'GROUP_INFORMATION'					=> 'Usergroup information',
+	'GROUP_IS_CLOSED'					=> 'This is a closed group, new members can only join upon invitation of a group leader.',
+	'GROUP_IS_FREE'						=> 'This is a freely open group, all new members are welcome.',
+	'GROUP_IS_HIDDEN'					=> 'This is a hidden group, only members of this group can view its membership.',
+	'GROUP_IS_OPEN'						=> 'This is an open group, members can apply to join.',
+	'GROUP_IS_SPECIAL'					=> 'This is a special group, special groups are managed by the board administrators.',
+	'GROUP_JOIN'						=> 'Join group',
+	'GROUP_JOIN_CONFIRM'				=> 'Are you sure you want to join the selected group?',
+	'GROUP_JOIN_PENDING'				=> 'Request to join group',
+	'GROUP_JOIN_PENDING_CONFIRM'		=> 'Are you sure you want to request joining the selected group?',
+	'GROUP_JOINED'						=> 'Successfully joined selected group.',
+	'GROUP_JOINED_PENDING'				=> 'Successfully requested group membership. Please wait for a group leader to approve your membership.',
+	'GROUP_LIST'						=> 'Manage users',
+	'GROUP_MEMBERS'						=> 'Group members',
+	'GROUP_NAME'						=> 'Group name',
+	'GROUP_OPEN'						=> 'Open',
+	'GROUP_RANK'						=> 'Group rank',
+	'GROUP_RESIGN_MEMBERSHIP'			=> 'Resign group membership',
+	'GROUP_RESIGN_MEMBERSHIP_CONFIRM'	=> 'Are you sure you want to resign your membership from the selected group?',
+	'GROUP_RESIGN_PENDING'				=> 'Resign a pending group membership',
+	'GROUP_RESIGN_PENDING_CONFIRM'		=> 'Are you sure you want to resign your pending membership from the selected group?',
+	'GROUP_RESIGNED_MEMBERSHIP'			=> 'You were successfully removed from the selected group.',
+	'GROUP_RESIGNED_PENDING'			=> 'Your pending membership was successfully removed from the selected group.',
+	'GROUP_TYPE'						=> 'Group type',
+	'GROUP_UNDISCLOSED'					=> 'Hidden group',
+	'FORUM_UNDISCLOSED'					=> 'Moderating hidden forum(s)',
+
+	'LOGIN_EXPLAIN_GROUP'	=> 'You need to login to view group details.',
+
+	'NO_LEADERS'					=> 'You are not a leader of any group.',
+	'NOT_LEADER_OF_GROUP'			=> 'The requested operation cannot be taken because you are not a leader of the selected group.',
+	'NOT_MEMBER_OF_GROUP'			=> 'The requested operation cannot be taken because you are not a member of the selected group or your membership has not been approved yet.',
+	'NOT_RESIGN_FROM_DEFAULT_GROUP'	=> 'You are not allowed to resign from your default group.',
+	
+	'PRIMARY_GROUP'		=> 'Primary group',
+
+	'REMOVE_SELECTED'		=> 'Remove selected',
+
+	'USER_GROUP_CHANGE'			=> 'From “%1$s” group to “%2$s”',
+	'USER_GROUP_DEMOTE'			=> 'Demote leadership',
+	'USER_GROUP_DEMOTE_CONFIRM'	=> 'Are you sure you want to demote as group leader from the selected group?',
+	'USER_GROUP_DEMOTED'		=> 'Successfully demoted your leadership.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
new file mode 100644
index 0000000000..df5f950e3e
--- /dev/null
+++ b/phpBB/language/en/help_bbcode.php
@@ -0,0 +1,116 @@
+<?php
+/**
+*
+* help_bbcode [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+$help = array(
+	array(
+		0 => '--',
+		1 => 'Introduction'
+	),
+	array(
+		0 => 'What is BBCode?',
+		1 => 'BBCode is a special implementation of HTML. Whether you can actually use BBCode in your posts on the forum is determined by the administrator. In addition you can disable BBCode on a per post basis via the posting form. BBCode itself is similar in style to HTML, tags are enclosed in square brackets [ and ] rather than &lt; and &gt; and it offers greater control over what and how something is displayed. Depending on the template you are using you may find adding BBCode to your posts is made much easier through a clickable interface above the message area on the posting form. Even with this you may find the following guide useful.'
+	),
+	array(
+		0 => '--',
+		1 => 'Text Formatting'
+	),
+	array(
+		0 => 'How to create bold, italic and underlined text',
+		1 => 'BBCode includes tags to allow you to quickly change the basic style of your text. This is achieved in the following ways: <ul><li>To make a piece of text bold enclose it in <strong>[b][/b]</strong>, e.g. <br /><br /><strong>[b]</strong>Hello<strong>[/b]</strong><br /><br />will become <strong>Hello</strong></li><li>For underlining use <strong>[u][/u]</strong>, for example:<br /><br /><strong>[u]</strong>Good Morning<strong>[/u]</strong><br /><br />becomes <span style="text-decoration: underline">Good Morning</span></li><li>To italicise text use <strong>[i][/i]</strong>, e.g.<br /><br />This is <strong>[i]</strong>Great!<strong>[/i]</strong><br /><br />would give This is <i>Great!</i></li></ul>'
+	),
+	array(
+		0 => 'How to change the text colour or size',
+		1 => 'To alter the colour or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: <ul><li>Changing the colour of text is achieved by wrapping it in <strong>[color=][/color]</strong>. You can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, e.g. #FFFFFF, #000000. For example, to create red text you could use:<br /><br /><strong>[color=red]</strong>Hello!<strong>[/color]</strong><br /><br />or<br /><br /><strong>[color=#FF0000]</strong>Hello!<strong>[/color]</strong><br /><br />Both will output <span style="color:red">Hello!</span></li><li>Changing the text size is achieved in a similar way using <strong>[size=][/size]</strong>. This tag is dependent on the template the user has selected but the recommended format is a numerical value representing the text size in percent, starting at 20 (very small) through to 200 (very large) by default. For example:<br /><br /><strong>[size=30]</strong>SMALL<strong>[/size]</strong><br /><br />will generally be <span style="font-size:30%;">SMALL</span><br /><br />whereas:<br /><br /><strong>[size=200]</strong>HUGE!<strong>[/size]</strong><br /><br />will be <span style="font-size:200%;">HUGE!</span></li></ul>'
+	),
+	array(
+		0 => 'Can I combine formatting tags?',
+		1 => 'Yes, of course you can, for example to get someones attention you may write:<br /><br /><strong>[size=200][color=red][b]</strong>LOOK AT ME!<strong>[/b][/color][/size]</strong><br /><br />this would output <span style="color:red;font-size:200%;"><strong>LOOK AT ME!</strong></span><br /><br />We don’t recommend you output lots of text that looks like this though! Remember it is up to you, the poster, to ensure tags are closed correctly. For example the following is incorrect:<br /><br /><strong>[b][u]</strong>This is wrong<strong>[/b][/u]</strong>'
+	),
+	array(
+		0 => '--',
+		1 => 'Quoting and outputting fixed-width text'
+	),
+	array(
+		0 => 'Quoting text in replies',
+		1 => 'There are two ways you can quote text, with a reference or without.<ul><li>When you utilise the Quote function to reply to a post on the board you should notice that the post text is added to the message window enclosed in a <strong>[quote=&quot;&quot;][/quote]</strong> block. This method allows you to quote with a reference to a person or whatever else you choose to put! For example to quote a piece of text Mr. Blobby wrote you would enter:<br /><br /><strong>[quote=&quot;Mr. Blobby&quot;]</strong>The text Mr. Blobby wrote would go here<strong>[/quote]</strong><br /><br />The resulting output will automatically add &quot;Mr. Blobby wrote:&quot; before the actual text. Remember you <strong>must</strong> include the quotation marks &quot;&quot; around the name you are quoting, they are not optional.</li><li>The second method allows you to blindly quote something. To utilise this enclose the text in <strong>[quote][/quote]</strong> tags. When you view the message it will simply show the text within a quotation block.</li></ul>'
+	),
+	array(
+		0 => 'Outputting code or fixed width data',
+		1 => 'If you want to output a piece of code or in fact anything that requires a fixed width, e.g. Courier type font you should enclose the text in <strong>[code][/code]</strong> tags, e.g.<br /><br /><strong>[code]</strong>echo &quot;This is some code&quot;;<strong>[/code]</strong><br /><br />All formatting used within <strong>[code][/code]</strong> tags is retained when you later view it. PHP syntax highlighting can be enabled using <strong>[code=php][/code]</strong> and is recommended when posting PHP code samples as it improves readability.'
+	),
+	array(
+		0 => '--',
+		1 => 'Generating lists'
+	),
+	array(
+		0 => 'Creating an Unordered list',
+		1 => 'BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list outputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use <strong>[list][/list]</strong> and define each item within the list using <strong>[*]</strong>. For example to list your favourite colours you could use:<br /><br /><strong>[list]</strong><br /><strong>[*]</strong>Red<br /><strong>[*]</strong>Blue<br /><strong>[*]</strong>Yellow<br /><strong>[/list]</strong><br /><br />This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul>'
+	),
+	array(
+		0 => 'Creating an Ordered list',
+		1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>'
+	),
+	// This block will switch the FAQ-Questions to the second template column
+	array(
+		0 => '--',
+		1 => '--'
+	),
+	array(
+		0 => '--',
+		1 => 'Creating Links'
+	),
+	array(
+		0 => 'Linking to another site',
+		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to e-mail addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=http://www.google.com/][img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
+	),
+	array(
+		0 => '--',
+		1 => 'Showing images in posts'
+	),
+	array(
+		0 => 'Adding an image to a post',
+		1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br /><br /><strong>[img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/img]</strong><br /><br />As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br /><br /><strong>[url=http://www.google.com/][img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="http://www.google.com/"><img src="http://www.google.com/intl/en_ALL/images/logo.gif" alt="" /></a>'
+	),
+	array(
+		0 => 'Adding attachments into a post',
+		1 => 'Attachments can now be placed in any part of a post by using the new <strong>[attachment=][/attachment]</strong> BBCode, if the attachments functionality has been enabled by a board administrator and if you are given the appropriate permissions to create attachments. Within the posting screen is a drop-down box (respectively a button) for placing attachments inline.'
+	),
+	array(
+		0 => '--',
+		1 => 'Other matters'
+	),
+	array(
+		0 => 'Can I add my own tags?',
+		1 => 'If you are an administrator on this board and have the proper permissions, you can add further BBCodes through the Custom BBCodes section.'
+	)
+);
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
new file mode 100644
index 0000000000..88b2cc273d
--- /dev/null
+++ b/phpBB/language/en/help_faq.php
@@ -0,0 +1,344 @@
+<?php
+/**
+*
+* help_faq [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+$help = array(
+	array(
+		0 => '--',
+		1 => 'Login and Registration Issues'
+	),
+	array(
+		0 => 'Why can’t I login?',
+		1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact the board owner to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.'
+	),
+	array(
+		0 => 'Why do I need to register at all?',
+		1 => 'You may not have to, it is up to the administrator of the board as to whether you need to register in order to post messages. However; registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.'
+	),
+	array(
+		0 => 'Why do I get logged off automatically?',
+		1 => 'If you do not check the <em>Log me in automatically</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.'
+	),
+	array(
+		0 => 'How do I prevent my username appearing in the online user listings?',
+		1 => 'Within your User Control Panel, under “Board preferences”, you will find the option <em>Hide your online status</em>. Enable this option with <samp>Yes</samp> and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.'
+	),
+	array(
+		0 => 'I’ve lost my password!',
+		1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I’ve forgotten my password</em>. Follow the instructions and you should be able to log in again shortly.'
+	),
+	array(
+		0 => 'I registered but cannot login!',
+		1 => 'First, check your username and password. If they are correct, then one of two things may have happened. If COPPA support is enabled and you specified being under 13 years old during registration, you will have to follow the instructions you received. Some boards will also require new registrations to be activated, either by yourself or by an administrator before you can logon; this information was present during registration. If you were sent an e-mail, follow the instructions. If you did not receive an e-mail, you may have provided an incorrect e-mail address or the e-mail may have been picked up by a spam filer. If you are sure the e-mail address you provided is correct, try contacting an administrator.'
+	),
+	array(
+		0 => 'I registered in the past but cannot login any more?!',
+		1 => 'Attempt to locate the e-mail sent to you when you first registered, check your username and password and try again. It is possible an administrator has deactivated or deleted your account for some reason. Also, many boards periodically remove users who have not posted for a long time to reduce the size of the database. If this has happened, try registering again and being more involved in discussions.'
+	),
+	array(
+		0 => 'What is COPPA?',
+		1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Group cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined below.',
+	),
+	array(
+		0 => 'Why can’t I register?',
+		1 => 'It is possible the website owner has banned your IP address or disallowed the username you are attempting to register. The website owner could have also disabled registration to prevent new visitors from signing up. Contact a board administrator for assistance.',
+	),
+	array(
+		0 => 'What does the “Delete all board cookies” do?',
+		1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.',
+	),
+	array(
+		0 => '--',
+		1 => 'User Preferences and settings'
+	),
+	array(
+		0 => 'How do I change my settings?',
+		1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found at the top of board pages. This system will allow you to change all your settings and preferences.'
+	),
+	array(
+		0 => 'The times are not correct!',
+		1 => 'It is possible the time displayed is from a timezone different from the one you are in. If this is the case, visit your User Control Panel and change your timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings, can only be done by registered users. If you are not registered, this is a good time to do so.'
+	),
+	array(
+		0 => 'I changed the timezone and the time is still wrong!',
+		1 => 'If you are sure you have set the timezone and Summer Time/DST correctly and the time is still incorrect, then the time stored on the server clock is incorrect. Please notify an administrator to correct the problem.'
+	),
+	array(
+		0 => 'My language is not in the list!',
+		1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB website (see link at the bottom of board pages).'
+	),
+	array(
+		0 => 'How do I show an image below my username?',
+		1 => 'There are two images that may appear below a username when viewing posts. Depending on the used style, the first may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. The second, usually a larger image, is known as an avatar and is generally unique or personal to each user. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.'
+	),
+	array(
+		0 => 'What is my rank and how do I change it?',
+		1 => 'Ranks, which appear below your username, indicate the number of posts you have made or identify certain users, e.g. moderators and administrators. In general, you cannot directly change the wording of any board ranks as they are set by the board administrator. Please do not abuse the board by posting unnecessarily just to increase your rank. Most boards will not tolerate this and the moderator or administrator will simply lower your post count.'
+	),
+	array(
+		0 => 'When I click the e-mail link for a user it asks me to login?',
+		1 => 'Only registered users can send e-mail to other users via the built-in e-mail form, and only if the administrator has enabled this feature. This is to prevent malicious use of the e-mail system by anonymous users.'
+	),
+	array(
+		0 => '--',
+		1 => 'Posting Issues'
+	),
+	array(
+		0 => 'How do I post a topic in a forum?',
+		1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can vote in polls, etc.'
+	),
+	array(
+		0 => 'How do I edit or delete a post?',
+		1 => 'Unless you are a board administrator or moderator, you can only edit or delete your own posts. You can edit a post by clicking the edit button for the relevant post, sometimes for only a limited time after the post was made. If someone has already replied to the post, you will find a small piece of text output below the post when you return to the topic which lists the number of times you edited it along with the date and time. This will only appear if someone has made a reply; it will not appear if a moderator or administrator edited the post, though they may leave a note as to why they’ve edited the post at their own digression. Please note that normal users cannot delete a post once someone has replied.'
+	),
+	array(
+		0 => 'How do I add a signature to my post?',
+		1 => 'To add a signature to a post you must first create one via your User Control Panel. Once created, you can check the <em>Attach a signature</em> box on the posting form to add your signature. You can also add a signature by default to all your posts by checking the appropriate radio button in your profile. If you do so, you can still prevent a signature being added to individual posts by un-checking the add signature box within the posting form.'
+	),
+	array(
+		0 => 'How do I create a poll?',
+		1 => 'When posting a new topic or editing the first post of a topic, click the “Poll creation” tab below the main posting form; if you cannot see this, you do not have appropriate permissions to create polls. Enter a title and at least two options in the appropriate fields, making sure each option is on a separate line in the textarea. You can also set the number of options users may select during voting under “Options per user”, a time limit in days for the poll (0 for infinite duration) and lastly the option to allow users to amend their votes.'
+	),
+	array(
+		0 => 'Why can’t I add more poll options?',
+		1 => 'The limit for poll options is set by the board administrator. If you feel you need to add more options to your poll then the allowed amount, contact the board administrator.'
+	),
+	array(
+		0 => 'How do I edit or delete a poll?',
+		1 => 'As with posts, polls can only be edited by the original poster, a moderator or an administrator. To edit a poll, click to edit the first post in the topic; this always has the poll associated with it. If no one has cast a vote, users can delete the poll or edit any poll option. However, if members have already placed votes, only moderators or administrators can edit or delete it. This prevents the poll’s options from being changed mid-way through a poll.'
+	),
+	array(
+		0 => 'Why can’t I access a forum?',
+		1 => 'Some forums may be limited to certain users or groups. To view, read, post or perform another action you may need special permissions. Contact a moderator or board administrator to grant you access.'
+	),
+	array(
+		0 => 'Why can’t I add attachments?',
+		1 => 'Attachment permissions are granted on a per forum, per group, or per user basis. The board administrator may not have allowed attachments to be added for the specific forum you are posting in, or perhaps only certain groups can post attachments. Contact the board administrator if you are unsure about why you are unable to add attachments.'
+	),
+	array(
+		0 => 'Why did I receive a warning?',
+		1 => 'Each board administrator has their own set of rules for their site. If you have broken a rule, you may be issued a warning. Please note that this is the board administrator’s decision, and the phpBB Group has nothing to do with the warnings on the given site. Contact the board administrator if you are unsure about why you were issued a warning.'
+	),
+	array(
+		0 => 'How can I report posts to a moderator?',
+		1 => 'If the board administrator has allowed it, you should see a button for reporting posts next to the post you wish to report. Clicking this will walk you through the steps necessary to report the post.'
+	),
+	array(
+		0 => 'What is the “Save” button for in topic posting?',
+		1 => 'This allows you to save passages to be completed and submitted at a later date. To reload a saved passage, visit the User Control Panel.'
+	),
+	array(
+		0 => 'Why does my post need to be approved?',
+		1 => 'The board administrator may have decided that posts in the forum you are posting to require review before submission. It is also possible that the administrator has placed you in a group of users whose posts require review before submission. Please contact the board administrator for further details.'
+	),
+	array(
+		0 => 'How do I bump my topic?',
+		1 => 'By clicking the “Bump topic” link when you are viewing it, you can “bump” the topic to the top of the forum on the first page. However, if you do not see this, then topic bumping may be disabled or the time allowance between bumps has not yet been reached. It is also possible to bump the topic simply by replying to it, however, be sure to follow the board rules when doing so.'
+	),
+	array(
+		0 => '--',
+		1 => 'Formatting and Topic Types'
+	),
+	array(
+		0 => 'What is BBCode?',
+		1 => 'BBCode is a special implementation of HTML, offering great formatting control on particular objects in a post. The use of BBCode is granted by the administrator, but it can also be disabled on a per post basis from the posting form. BBCode itself is similar in style to HTML, but tags are enclosed in square brackets [ and ] rather than &lt; and &gt;. For more information on BBCode see the guide which can be accessed from the posting page.'
+	),
+	array(
+		0 => 'Can I use HTML?',
+		1 => 'No. It is not possible to post HTML on this board and have it rendered as HTML. Most formatting which can be carried out using HTML can be applied using BBCode instead.'
+	),
+	array(
+		0 => 'What are Smilies?',
+		1 => 'Smilies, or Emoticons, are small images which can be used to express a feeling using a short code, e.g. :) denotes happy, while :( denotes sad. The full list of emoticons can be seen in the posting form. Try not to overuse smilies, however, as they can quickly render a post unreadable and a moderator may edit them out or remove the post altogether. The board administrator may also have set a limit to the number of smilies you may use within a post.'
+	),
+	array(
+		0 => 'Can I post images?',
+		1 => 'Yes, images can be shown in your posts. If the administrator has allowed attachments, you may be able to upload the image to the board. Otherwise, you must link to an image stored on a publicly accessible web server, e.g. http://www.example.com/my-picture.gif. You cannot link to pictures stored on your own PC (unless it is a publicly accessible server) nor images stored behind authentication mechanisms, e.g. hotmail or yahoo mailboxes, password protected sites, etc. To display the image use the BBCode [img] tag.'
+	),
+	array(
+		0 => 'What are global announcements?',
+		1 => 'Global announcements contain important information and you should read them whenever possible. They will appear at the top of every forum and within your User Control Panel. Global announcement permissions are granted by the board administrator.'
+	),
+	array(
+		0 => 'What are announcements?',
+		1 => 'Announcements often contain important information for the forum you are currently reading and you should read them whenever possible. Announcements appear at the top of every page in the forum to which they are posted. As with global announcements, announcement permissions are granted by the board administrator.'
+	),
+	array(
+		0 => 'What are sticky topics?',
+		1 => 'Sticky topics within the forum appear below announcements and only on the first page. They are often quite important so you should read them whenever possible. As with announcements and global announcements, sticky topic permissions are granted by the board administrator.'
+	),
+	array(
+		0 => 'What are locked topics?',
+		1 => 'Locked topics are topics where users can no longer reply and any poll it contained was automatically ended. Topics may be locked for many reasons and were set this way by either the forum moderator or board administrator. You may also be able to lock your own topics depending on the permissions you are granted by the board administrator.'
+	),
+	array(
+		0 => 'What are topic icons?',
+		1 => 'Topic icons are author chosen images associated with posts to indicate their content. The ability to use topic icons depends on the permissions set by the board administrator.'
+	),
+	// This block will switch the FAQ-Questions to the second template column
+	array(
+		0 => '--',
+		1 => '--'
+	),
+	array(
+		0 => '--',
+		1 => 'User Levels and Groups'
+	),
+	array(
+		0 => 'What are Administrators?',
+		1 => 'Administrators are members assigned with the highest level of control over the entire board. These members can control all facets of board operation, including setting permissions, banning users, creating usergroups or moderators, etc., dependent upon the board founder and what permissions he or she has given the other administrators. They may also have full moderator capabilities in all forums, depending on the settings put forth by the board founder.'
+	),
+	array(
+		0 => 'What are Moderators?',
+		1 => 'Moderators are individuals (or groups of individuals) who look after the forums from day to day. They have the authority to edit or delete posts and lock, unlock, move, delete and split topics in the forum they moderate. Generally, moderators are present to prevent users from going off-topic or posting abusive or offensive material.'
+	),
+	array(
+		0 => 'What are usergroups?',
+		1 => 'Usergroups are groups of users that divide the community into manageable sections board administrators can work with. Each user can belong to several groups and each group can be assigned individual permissions. This provides an easy way for administrators to change permissions for many users at once, such as changing moderator permissions or granting users access to a private forum.'
+	),
+	array(
+		0 => 'Where are the usergroups and how do I join one?',
+		1 => 'You can view all usergroups via the “Usergroups” link within your User Control Panel. If you would like to join one, proceed by clicking the appropriate button. Not all groups have open access, however. Some may require approval to join, some may be closed and some may even have hidden memberships. If the group is open, you can join it by clicking the appropriate button. If a group requires approval to join you may request to join by clicking the appropriate button. The user group leader will need to approve your request and may ask why you want to join the group. Please do not harass a group leader if they reject your request; they will have their reasons.'
+	),
+	array(
+		0 => 'How do I become a usergroup leader?',
+		1 => 'A usergroup leader is usually assigned when usergroups are initially created by a board administrator. If you are interested in creating a usergroup, your first point of contact should be an administrator; try sending a private message.',
+	),
+	array(
+		0 => 'Why do some usergroups appear in a different colour?',
+		1 => 'It is possible for the board administrator to assign a colour to the members of a usergroup to make it easy to identify the members of this group.'
+	),
+	array(
+		0 => 'What is a “Default usergroup”?',
+		1 => 'If you are a member of more than one usergroup, your default is used to determine which group colour and group rank should be shown for you by default. The board administrator may grant you permission to change your default usergroup via your User Control Panel.'
+	),
+	array(
+		0 => 'What is “The team” link?',
+		1 => 'This page provides you with a list of board staff, including board administrators and moderators and other details such as the forums they moderate.'
+	),
+	array(
+		0 => '--',
+		1 => 'Private Messaging'
+	),
+	array(
+		0 => 'I cannot send private messages!',
+		1 => 'There are three reasons for this; you are not registered and/or not logged on, the board administrator has disabled private messaging for the entire board, or the board administrator has prevented you from sending messages. Contact a board administrator for more information.'
+	),
+	array(
+		0 => 'I keep getting unwanted private messages!',
+		1 => 'You can block a user from sending you private messages by using message rules within your User Control Panel. If you are receiving abusive private messages from a particular user, inform a board administrator; they have the power to prevent a user from sending private messages.'
+	),
+	array(
+		0 => 'I have received a spamming or abusive e-mail from someone on this board!',
+		1 => 'We are sorry to hear that. The e-mail form feature of this board includes safeguards to try and track users who send such posts, so e-mail the board administrator with a full copy of the e-mail you received. It is very important that this includes the headers that contain the details of the user that sent the e-mail. The board administrator can then take action.'
+	),
+	array(
+		0 => '--',
+		1 => 'Friends and Foes'
+	),
+	array(
+		0 => 'What are my Friends and Foes lists?',
+		1 => 'You can use these lists to organise other members of the board. Members added to your friends list will be listed within your User Control Panel for quick access to see their online status and to send them private messages. Subject to template support, posts from these users may also be highlighted. If you add a user to your foes list, any posts they make will be hidden by default.'
+	),
+	array(
+		0 => 'How can I add / remove users to my Friends or Foes list?',
+		1 => 'You can add users to your list in two ways. Within each user’s profile, there is a link to add them to either your Friend or Foe list. Alternatively, from your User Control Panel, you can directly add users by entering their member name. You may also remove users from your list using the same page.'
+	),
+	array(
+		0 => '--',
+		1 => 'Searching the Forums'
+	),
+	array(
+		0 => 'How can I search a forum or forums?',
+		1 => 'Enter a search term in the search box located on the index, forum or topic pages. Advanced search can be accessed by clicking the “Advance Search” link which is available on all pages on the forum. How to access the search may depend on the style used.'
+	),
+	array(
+		0 => 'Why does my search return no results?',
+		1 => 'Your search was probably too vague and included many common terms which are not indexed by phpBB3. Be more specific and use the options available within Advanced search.'
+	),
+	array(
+		0 => 'Why does my search return a blank page!?',
+		1 => 'Your search returned too many results for the webserver to handle. Use “Advanced search” and be more specific in the terms used and forums that are to be searched.'
+	),
+	array(
+		0 => 'How do I search for members?',
+		1 => 'Visit to the “Members” page and click the “Find a member” link.'
+	),
+	array(
+		0 => 'How can I find my own posts and topics?',
+		1 => 'Your own posts can be retrieved either by clicking the “Search user’s posts” within the User Control Panel or via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropriately.'
+	),
+	array(
+		0 => '--',
+		1 => 'Topic Subscriptions and Bookmarks'
+	),
+	array(
+		0 => 'What is the difference between bookmarking and subscribing?',
+		1 => 'Bookmarking in phpBB3 is much like bookmarking in your web browser. You aren’t alerted when there’s an update, but you can come back to the topic later. Subscribing, however, will notify you when there is an update to the topic or forum on the board via your preferred method or methods.'
+	),
+	array(
+		0 => 'How do I subscribe to specific forums or topics?',
+		1 => 'To subscribe to a specific forum, click the “Subscribe forum” link upon entering the forum. To subscribe to a topic, reply to the topic with the subscribe checkbox checked or click the “Subscribe topic” link within the topic itself.'
+	),
+	array(
+		0 => 'How do I remove my subscriptions?',
+		1 => 'To remove your subscriptions, go to your User Control Panel and follow the links to your subscriptions.'
+	),
+	array(
+		0 => '--',
+		1 => 'Attachments'
+	),
+	array(
+		0 => 'What attachments are allowed on this board?',
+		1 => 'Each board administrator can allow or disallow certain attachment types. If you are unsure what is allowed to be uploaded, contact the board administrator for assistance.'
+	),
+	array(
+		0 => 'How do I find all my attachments?',
+		1 => 'To find your list of attachments that you have uploaded, go to your User Control Panel and follow the links to the attachments section.'
+	),
+	array(
+		0 => '--',
+		1 => 'phpBB 3 Issues'
+	),
+	array(
+		0 => 'Who wrote this bulletin board?',
+		1 => 'This software (in its unmodified form) is produced, released and is copyright <a href="http://www.phpbb.com/">phpBB Group</a>. It is made available under the GNU General Public License and may be freely distributed. See the link for more details.'
+	),
+	array(
+		0 => 'Why isn’t X feature available?',
+		1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added, please visit the phpbb.com website and see what phpBB Group have to say. Please do not post feature requests to the board at phpbb.com, the group uses SourceForge to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for a feature and then follow the procedure given there.'
+	),
+	array(
+		0 => 'Who do I contact about abusive and/or legal matters related to this board?',
+		1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a <a href="http://www.google.com/search?q=whois">whois lookup</a>) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Group has <strong>absolutely no jurisdiction</strong> and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter <strong>not directly related</strong> to the phpBB.com website or the discrete software of phpBB itself. If you do e-mail phpBB Group <strong>about any third party</strong> use of this software then you should expect a terse response or no response at all.'
+	)
+);
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/index.htm b/phpBB/language/en/index.htm
new file mode 100644
index 0000000000..ee1f723a7d
--- /dev/null
+++ b/phpBB/language/en/index.htm
@@ -0,0 +1,10 @@
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+
+</body>
+</html>
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
new file mode 100644
index 0000000000..9543c712da
--- /dev/null
+++ b/phpBB/language/en/install.php
@@ -0,0 +1,635 @@
+<?php
+/**
+*
+* install [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ADMIN_CONFIG'				=> 'Administrator configuration',
+	'ADMIN_PASSWORD'			=> 'Administrator password',
+	'ADMIN_PASSWORD_CONFIRM'	=> 'Confirm administrator password',
+	'ADMIN_PASSWORD_EXPLAIN'	=> 'Please enter a password between 6 and 30 characters in length.',
+	'ADMIN_TEST'				=> 'Check administrator settings',
+	'ADMIN_USERNAME'			=> 'Administrator username',
+	'ADMIN_USERNAME_EXPLAIN'	=> 'Please enter a username between 3 and 20 characters in length.',
+	'APP_MAGICK'				=> 'Imagemagick support [ Attachments ]',
+	'AUTHOR_NOTES'				=> 'Author notes<br />» %s',
+	'AVAILABLE'					=> 'Available',
+	'AVAILABLE_CONVERTORS'		=> 'Available convertors',
+
+	'BEGIN_CONVERT'					=> 'Begin conversion',
+	'BLANK_PREFIX_FOUND'			=> 'A scan of your tables has shown a valid installation using no table prefix.',
+	'BOARD_NOT_INSTALLED'			=> 'No installation found',
+	'BOARD_NOT_INSTALLED_EXPLAIN'	=> 'The phpBB Unified Convertor Framework requires a default installation of phpBB3 to function, please <a href="%s">proceed by first installing phpBB3</a>.',
+
+	'CATEGORY'					=> 'Category',
+	'CACHE_STORE'				=> 'Cache type',
+	'CACHE_STORE_EXPLAIN'		=> 'The physical location where data is cached, filesystem is preferred.',
+	'CAT_CONVERT'				=> 'Convert',
+	'CAT_INSTALL'				=> 'Install',
+	'CAT_OVERVIEW'				=> 'Overview',
+	'CAT_UPDATE'				=> 'Update',
+	'CHANGE'					=> 'Change',
+	'CHECK_TABLE_PREFIX'		=> 'Please check your table prefix and try again.',
+	'CLEAN_VERIFY'				=> 'Cleaning up and verifying the final structure',
+	'CLEANING_USERNAMES'		=> 'Cleaning usernames',
+	'COLLIDING_CLEAN_USERNAME'	=> '<strong>%s</strong> is the clean username for:',
+	'COLLIDING_USERNAMES_FOUND'	=> 'Colliding usernames were found on your old board. In order to complete the conversion please delete or rename these users so that there is only one user on your old board for each clean username.',
+	'COLLIDING_USER'			=> '» user id: <strong>%d</strong> username: <strong>%s</strong> (%d posts)',
+	'CONFIG_CONVERT'			=> 'Converting the configuration',
+	'CONFIG_FILE_UNABLE_WRITE'	=> 'It was not possible to write the configuration file. Alternative methods for this file to be created are presented below.',
+	'CONFIG_FILE_WRITTEN'		=> 'The configuration file has been written. You may now proceed to the next step of the installation.',
+	'CONFIG_PHPBB_EMPTY'		=> 'The phpBB3 config variable for “%s” is empty.',
+	'CONFIG_RETRY'				=> 'Retry',
+	'CONTACT_EMAIL_CONFIRM'		=> 'Confirm contact e-mail',
+	'CONTINUE_CONVERT'			=> 'Continue conversion',
+	'CONTINUE_CONVERT_BODY'		=> 'A previous conversion attempt has been determined. You are now able to choose between starting a new conversion or continuing the conversion.',
+	'CONTINUE_LAST'				=> 'Continue last statements',
+	'CONTINUE_OLD_CONVERSION'	=> 'Continue previously started conversion',
+	'CONVERT'					=> 'Convert',
+	'CONVERT_COMPLETE'			=> 'Conversion completed',
+	'CONVERT_COMPLETE_EXPLAIN'	=> 'You have now successfully converted your board to phpBB 3.0. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>.',
+	'CONVERT_INTRO'				=> 'Welcome to the phpBB Unified Convertor Framework',
+	'CONVERT_INTRO_BODY'		=> 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.',
+	'CONVERT_NEW_CONVERSION'	=> 'New conversion',
+	'CONVERT_NOT_EXIST'			=> 'The specified convertor does not exist.',
+	'CONVERT_OPTIONS'			=> 'Options',
+	'CONVERT_SETTINGS_VERIFIED'	=> 'The information you entered has been verified. To start the conversion process, please push the button below.',
+	'CONV_ERR_FATAL'			=> 'Fatal conversion error',
+
+	'CONV_ERROR_ATTACH_FTP_DIR'			=> 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
+	'CONV_ERROR_CONFIG_EMPTY'			=> 'There is no configuration information available for the conversion.',
+	'CONV_ERROR_FORUM_ACCESS'			=> 'Unable to get forum access information.',
+	'CONV_ERROR_GET_CATEGORIES'			=> 'Unable to get categories.',
+	'CONV_ERROR_GET_CONFIG'				=> 'Could not retrieve your board configuration.',
+	'CONV_ERROR_COULD_NOT_READ'			=> 'Unable to access/read “%s”.',
+	'CONV_ERROR_GROUP_ACCESS'			=> 'Unable to get group authentication information.',
+	'CONV_ERROR_INCONSISTENT_GROUPS'	=> 'Inconsistency in groups table detected in add_bots() - you need to add all special groups if you do it manually.',
+	'CONV_ERROR_INSERT_BOT'				=> 'Unable to insert bot into users table.',
+	'CONV_ERROR_INSERT_BOTGROUP'		=> 'Unable to insert bot into bots table.',
+	'CONV_ERROR_INSERT_USER_GROUP'		=> 'Unable to insert user into user_group table.',
+	'CONV_ERROR_MESSAGE_PARSER'			=> 'Message parser error',
+	'CONV_ERROR_NO_AVATAR_PATH'			=> 'Note to developer: you must specify $convertor[\'avatar_path\'] to use %s.',
+	'CONV_ERROR_NO_FORUM_PATH'			=> 'The relative path to the source board has not been specified.',
+	'CONV_ERROR_NO_GALLERY_PATH'		=> 'Note to developer: you must specify $convertor[\'avatar_gallery_path\'] to use %s.',
+	'CONV_ERROR_NO_GROUP'				=> 'Group “%1$s” could not be found in %2$s.',
+	'CONV_ERROR_NO_RANKS_PATH'			=> 'Note to developer: you must specify $convertor[\'ranks_path\'] to use %s.',
+	'CONV_ERROR_NO_SMILIES_PATH'		=> 'Note to developer: you must specify $convertor[\'smilies_path\'] to use %s.',
+	'CONV_ERROR_NO_UPLOAD_DIR'			=> 'Note to developer: you must specify $convertor[\'upload_path\'] to use %s.',
+	'CONV_ERROR_PERM_SETTING'			=> 'Unable to insert/update permission setting.',
+	'CONV_ERROR_PM_COUNT'				=> 'Unable to select folder pm count.',
+	'CONV_ERROR_REPLACE_CATEGORY'		=> 'Unable to insert new forum replacing old category.',
+	'CONV_ERROR_REPLACE_FORUM'			=> 'Unable to insert new forum replacing old forum.',
+	'CONV_ERROR_USER_ACCESS'			=> 'Unable to get user authentication information.',
+	'CONV_ERROR_WRONG_GROUP'			=> 'Wrong group “%1$s” defined in %2$s.',
+	'CONV_OPTIONS_BODY'					=> 'This page collects the data required to access the source board. Enter the database details of your former board; the converter will not change anything in the database given below. The source board should be disabled to allow a consistent conversion.',
+	'CONV_SAVED_MESSAGES'				=> 'Saved messages',
+
+	'COULD_NOT_COPY'			=> 'Could not copy file <strong>%1$s</strong> to <strong>%2$s</strong><br /><br />Please check that the target directory exists and is writable by the webserver.',
+	'COULD_NOT_FIND_PATH'		=> 'Could not find path to your former board. Please check your settings and try again.<br />» %s was specified as the source path.',
+
+	'DBMS'						=> 'Database type',
+	'DB_CONFIG'					=> 'Database configuration',
+	'DB_CONNECTION'				=> 'Database connection',
+	'DB_ERR_INSERT'				=> 'Error while processing <code>INSERT</code> query.',
+	'DB_ERR_LAST'				=> 'Error while processing <var>query_last</var>.',
+	'DB_ERR_QUERY_FIRST'		=> 'Error while executing <var>query_first</var>.',
+	'DB_ERR_QUERY_FIRST_TABLE'	=> 'Error while executing <var>query_first</var>, %s (“%s”).',
+	'DB_ERR_SELECT'				=> 'Error while running <code>SELECT</code> query.',
+	'DB_HOST'					=> 'Database server hostname or DSN',
+	'DB_HOST_EXPLAIN'			=> 'DSN stands for Data Source Name and is relevant only for ODBC installs.',
+	'DB_NAME'					=> 'Database name',
+	'DB_PASSWORD'				=> 'Database password',
+	'DB_PORT'					=> 'Database server port',
+	'DB_PORT_EXPLAIN'			=> 'Leave this blank unless you know the server operates on a non-standard port.',
+	'DB_UPDATE_NOT_SUPPORTED'	=> 'We are sorry, but this script does not support updating from versions of phpBB prior to “%1$s”. The version you currently have installed is “%2$s”. Please update to a previous version before running this script. Assistance with this is available in the Support Forum on phpBB.com.',
+	'DB_USERNAME'				=> 'Database username',
+	'DB_TEST'					=> 'Test connection',
+	'DEFAULT_LANG'				=> 'Default board language',
+	'DEFAULT_PREFIX_IS'			=> 'The convertor was not able to find tables with the specified prefix. Please make sure you have entered the correct details for the board you are converting from. The default table prefix for %1$s is <strong>%2$s</strong>.',
+	'DEV_NO_TEST_FILE'			=> 'No value has been specified for the test_file variable in the convertor. If you are a user of this convertor, you should not be seeing this error, please report this message to the convertor author. If you are a convertor author, you must specify the name of a file which exists in the source board to allow the path to it to be verified.',
+	'DIRECTORIES_AND_FILES'		=> 'Directory and file setup',
+	'DISABLE_KEYS'				=> 'Disabling keys',
+	'DLL_FIREBIRD'				=> 'Firebird',
+	'DLL_FTP'					=> 'Remote FTP support [ Installation ]',
+	'DLL_GD'					=> 'GD graphics support [ Visual Confirmation ]',
+	'DLL_MBSTRING'				=> 'Multi-byte character support',
+	'DLL_MSSQL'					=> 'MSSQL Server 2000+',
+	'DLL_MSSQL_ODBC'			=> 'MSSQL Server 2000+ via ODBC',
+	'DLL_MYSQL'					=> 'MySQL',
+	'DLL_MYSQLI'				=> 'MySQL with MySQLi Extension',
+	'DLL_ORACLE'				=> 'Oracle',
+	'DLL_POSTGRES'				=> 'PostgreSQL 7.x/8.x',
+	'DLL_SQLITE'				=> 'SQLite',
+	'DLL_XML'					=> 'XML support [ Jabber ]',
+	'DLL_ZLIB'					=> 'zlib compression support [ gz, .tar.gz, .zip ]',
+	'DL_CONFIG'					=> 'Download config',
+	'DL_CONFIG_EXPLAIN'			=> 'You may download the complete config.php to your own PC. You will then need to upload the file manually, replacing any existing config.php in your phpBB 3.0 root directory. Please remember to upload the file in ASCII format (see your FTP application documentation if you are unsure how to achieve this). When you have uploaded the config.php please click “Done” to move to the next stage.',
+	'DL_DOWNLOAD'				=> 'Download',
+	'DONE'						=> 'Done',
+
+	'ENABLE_KEYS'				=> 'Re-enabling keys. This can take a while.',
+
+	'FILES_OPTIONAL'			=> 'Optional files and directories',
+	'FILES_OPTIONAL_EXPLAIN'	=> '<strong>Optional</strong> - These files, directories or permission settings are not required. The installation system will attempt to use various techniques to create them if they do not exist or cannot be written to. However, the presence of these will speed installation.',
+	'FILES_REQUIRED'			=> 'Files and Directories',
+	'FILES_REQUIRED_EXPLAIN'	=> '<strong>Required</strong> - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see “Not Found” you need to create the relevant file or directory. If you see “Unwritable” you need to change the permissions on the file or directory to allow phpBB to write to it.',
+	'FILLING_TABLE'				=> 'Filling table <strong>%s</strong>',
+	'FILLING_TABLES'			=> 'Filling tables',
+
+	'FIREBIRD_DBMS_UPDATE_REQUIRED'		=> 'phpBB no longer supports Firebird/Interbase prior to Version 2.1. Please update your Firebird installation to at least 2.1.0 before proceeding with the update.',
+
+	'FINAL_STEP'				=> 'Process final step',
+	'FORUM_ADDRESS'				=> 'Board address',
+	'FORUM_ADDRESS_EXPLAIN'		=> 'This is the URL of your former board, for example <samp>http://www.example.com/phpBB2/</samp>. If an address is entered here and not left empty every instance of this address will be replaced by your new board address within messages, private messages and signatures.',
+	'FORUM_PATH'				=> 'Board path',
+	'FORUM_PATH_EXPLAIN'		=> 'This is the <strong>relative</strong> path on disk to your former board from the <strong>root of this phpBB3 installation</strong>.',
+	'FOUND'						=> 'Found',
+	'FTP_CONFIG'				=> 'Transfer config by FTP',
+	'FTP_CONFIG_EXPLAIN'		=> 'phpBB has detected the presence of the FTP module on this server. You may attempt to install your config.php via this if you wish. You will need to supply the information listed below. Remember your username and password are those to your server! (ask your hosting provider for details if you are unsure what these are).',
+	'FTP_PATH'					=> 'FTP path',
+	'FTP_PATH_EXPLAIN'			=> 'This is the path from your root directory to that of phpBB, e.g. <samp>htdocs/phpBB3/</samp>.',
+	'FTP_UPLOAD'				=> 'Upload',
+
+	'GPL'						=> 'General Public License',
+
+	'INITIAL_CONFIG'			=> 'Basic configuration',
+	'INITIAL_CONFIG_EXPLAIN'	=> 'Now that install has determined your server can run phpBB you need to supply some specific information. If you do not know how to connect to your database please contact your hosting provider (in the first instance) or use the phpBB support forums. When entering data please ensure you check it thoroughly before continuing.',
+	'INSTALL_CONGRATS'			=> 'Congratulations!',
+	'INSTALL_CONGRATS_EXPLAIN'	=> '
+		You have successfully installed phpBB %1$s. Please proceed by choosing one of the following options:</p>
+		<h2>Convert an existing board to phpBB3</h2>
+		<p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed to the convertor</a>.</p>
+		<h2>Go live with your phpBB3!</h2>
+		<p>Clicking the button below will take you to a form for submitting statistical data to phpBB in your Administration Control Panel (ACP). We would appreciate it if you could help us by sending that information. Afterwards you should take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a>, <a href="%3$s">README</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">Support Forums</a>.</p><p><strong>Please delete, move or rename the install directory before using your board. While this directory exists, only the Administration Control Panel (ACP) will be accessible.</strong>',
+	'INSTALL_INTRO'				=> 'Welcome to Installation',
+
+	'INSTALL_INTRO_BODY'		=> 'With this option, it is possible to install phpBB3 onto your server.</p><p>In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
+
+	<ul>
+		<li>The Database Type - the database you will be using.</li>
+		<li>The Database server hostname or DSN - the address of the database server.</li>
+		<li>The Database server port - the port of the database server (most of the time this is not needed).</li>
+		<li>The Database name - the name of the database on the server.</li>
+		<li>The Database username and Database password - the login data to access the database.</li>
+	</ul>
+
+	<p><strong>Note:</strong> if you are installing using SQLite, you should enter the full path to your database file in the DSN field and leave the username and password fields blank. For security reasons, you should make sure that the database file is not stored in a location accessible from the web.</p>
+
+	<p>phpBB3 supports the following databases:</p>
+	<ul>
+		<li>MySQL 3.23 or above (MySQLi supported)</li>
+		<li>PostgreSQL 7.3+</li>
+		<li>SQLite 2.8.2+</li>
+		<li>Firebird 2.1+</li>
+		<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
+		<li>Oracle</li>
+	</ul>
+
+	<p>Only those databases supported on your server will be displayed.',
+	'INSTALL_INTRO_NEXT'		=> 'To commence the installation, please press the button below.',
+	'INSTALL_LOGIN'				=> 'Login',
+	'INSTALL_NEXT'				=> 'Next stage',
+	'INSTALL_NEXT_FAIL'			=> 'Some tests failed and you should correct these problems before proceeding to the next stage. Failure to do so may result in an incomplete installation.',
+	'INSTALL_NEXT_PASS'			=> 'All the basic tests have been passed and you may proceed to the next stage of installation. If you have changed any permissions, modules, etc. and wish to re-test you can do so if you wish.',
+	'INSTALL_PANEL'				=> 'Installation Panel',
+	'INSTALL_SEND_CONFIG'		=> 'Unfortunately phpBB could not write the configuration information directly to your config.php. This may be because the file does not exist or is not writable. A number of options will be listed below enabling you to complete installation of config.php.',
+	'INSTALL_START'				=> 'Start install',
+	'INSTALL_TEST'				=> 'Test again',
+	'INST_ERR'					=> 'Installation error',
+	'INST_ERR_DB_CONNECT'		=> 'Could not connect to the database, see error message below.',
+	'INST_ERR_DB_FORUM_PATH'	=> 'The database file specified is within your board directory tree. You should put this file in a non web-accessible location.',
+	'INST_ERR_DB_NO_ERROR'		=> 'No error message given.',
+	'INST_ERR_DB_NO_MYSQLI'		=> 'The version of MySQL installed on this machine is incompatible with the “MySQL with MySQLi Extension” option you have selected. Please try the “MySQL” option instead.',
+	'INST_ERR_DB_NO_SQLITE'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
+	'INST_ERR_DB_NO_ORACLE'		=> 'The version of Oracle installed on this machine requires you to set the <var>NLS_CHARACTERSET</var> parameter to <var>UTF8</var>. Either upgrade your installation to 9.2+ or change the parameter.',
+	'INST_ERR_DB_NO_FIREBIRD'	=> 'The version of Firebird installed on this machine is older than 2.1, please upgrade to a newer version.',
+	'INST_ERR_DB_NO_FIREBIRD_PS'=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
+	'INST_ERR_DB_NO_POSTGRES'	=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
+	'INST_ERR_DB_NO_NAME'		=> 'No database name specified.',
+	'INST_ERR_EMAIL_INVALID'	=> 'The e-mail address you entered is invalid.',
+	'INST_ERR_EMAIL_MISMATCH'	=> 'The e-mails you entered did not match.',
+	'INST_ERR_FATAL'			=> 'Fatal installation error',
+	'INST_ERR_FATAL_DB'			=> 'A fatal and unrecoverable database error has occurred. This may be because the specified user does not have appropriate permissions to <code>CREATE TABLES</code> or <code>INSERT</code> data, etc. Further information may be given below. Please contact your hosting provider in the first instance or the support forums of phpBB for further assistance.',
+	'INST_ERR_FTP_PATH'			=> 'Could not change to the given directory, please check the path.',
+	'INST_ERR_FTP_LOGIN'		=> 'Could not login to FTP server, check your username and password.',
+	'INST_ERR_MISSING_DATA'		=> 'You must fill out all fields in this block.',
+	'INST_ERR_NO_DB'			=> 'Cannot load the PHP module for the selected database type.',
+	'INST_ERR_PASSWORD_MISMATCH'	=> 'The passwords you entered did not match.',
+	'INST_ERR_PASSWORD_TOO_LONG'	=> 'The password you entered is too long. The maximum length is 30 characters.',
+	'INST_ERR_PASSWORD_TOO_SHORT'	=> 'The password you entered is too short. The minimum length is 6 characters.',
+	'INST_ERR_PREFIX'			=> 'Tables with the specified prefix already exist, please choose an alternative.',
+	'INST_ERR_PREFIX_INVALID'	=> 'The table prefix you have specified is invalid for your database. Please try another, removing characters such as the hyphen.',
+	'INST_ERR_PREFIX_TOO_LONG'	=> 'The table prefix you have specified is too long. The maximum length is %d characters.',
+	'INST_ERR_USER_TOO_LONG'	=> 'The username you entered is too long. The maximum length is 20 characters.',
+	'INST_ERR_USER_TOO_SHORT'	=> 'The username you entered is too short. The minimum length is 3 characters.',
+	'INVALID_PRIMARY_KEY'		=> 'Invalid primary key : %s',
+
+	'LONG_SCRIPT_EXECUTION'		=> 'Please note that this can take a while... Please do not stop the script.',
+
+	// mbstring
+	'MBSTRING_CHECK'						=> '<samp>mbstring</samp> extension check',
+	'MBSTRING_CHECK_EXPLAIN'				=> '<strong>Required</strong> - <samp>mbstring</samp> is a PHP extension that provides multibyte string functions. Certain features of mbstring are not compatible with phpBB and must be disabled.',
+	'MBSTRING_FUNC_OVERLOAD'				=> 'Function overloading',
+	'MBSTRING_FUNC_OVERLOAD_EXPLAIN'		=> '<var>mbstring.func_overload</var> must be set to either 0 or 4.',
+	'MBSTRING_ENCODING_TRANSLATION'			=> 'Transparent character encoding',
+	'MBSTRING_ENCODING_TRANSLATION_EXPLAIN'	=> '<var>mbstring.encoding_translation</var> must be set to 0.',
+	'MBSTRING_HTTP_INPUT'					=> 'HTTP input character conversion',
+	'MBSTRING_HTTP_INPUT_EXPLAIN'			=> '<var>mbstring.http_input</var> must be set to <samp>pass</samp>.',
+	'MBSTRING_HTTP_OUTPUT'					=> 'HTTP output character conversion',
+	'MBSTRING_HTTP_OUTPUT_EXPLAIN'			=> '<var>mbstring.http_output</var> must be set to <samp>pass</samp>.',
+
+	'MAKE_FOLDER_WRITABLE'		=> 'Please make sure that this folder exists and is writable by the webserver then try again:<br />»<strong>%s</strong>.',
+	'MAKE_FOLDERS_WRITABLE'		=> 'Please make sure that these folders exist and are writable by the webserver then try again:<br />»<strong>%s</strong>.',
+
+	'MYSQL_SCHEMA_UPDATE_REQUIRED'	=> 'Your MySQL database schema for phpBB is outdated. phpBB detected a schema for MySQL 3.x/4.x, but the server runs on MySQL %2$s.<br /><strong>Before you proceed the update, you need to upgrade the schema.</strong><br /><br />Please refer to the <a href="http://www.phpbb.com/kb/article/doesnt-have-a-default-value-errors/">Knowledge Base article about upgrading the MySQL schema</a>. If you encounter problems, please use <a href="http://www.phpbb.com/community/viewforum.php?f=46">our support forums</a>.',
+
+	'NAMING_CONFLICT'			=> 'Naming conflict: %s and %s are both aliases<br /><br />%s',
+	'NEXT_STEP'					=> 'Proceed to next step',
+	'NOT_FOUND'					=> 'Cannot find',
+	'NOT_UNDERSTAND'			=> 'Could not understand %s #%d, table %s (“%s”)',
+	'NO_CONVERTORS'				=> 'No convertors are available for use.',
+	'NO_CONVERT_SPECIFIED'		=> 'No convertor specified.',
+	'NO_LOCATION'				=> 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel',
+	'NO_TABLES_FOUND'			=> 'No tables found.',
+
+	'OVERVIEW_BODY'				=> 'Welcome to phpBB3!<br /><br />phpBB™ is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="../docs/INSTALL.html">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
+
+	'PCRE_UTF_SUPPORT'				=> 'PCRE UTF-8 support',
+	'PCRE_UTF_SUPPORT_EXPLAIN'		=> 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.',
+	'PHP_GETIMAGESIZE_SUPPORT'			=> 'PHP function getimagesize() is available',
+	'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN'	=> '<strong>Required</strong> - In order for phpBB to function correctly, the getimagesize function needs to be available.',
+	'PHP_OPTIONAL_MODULE'			=> 'Optional modules',
+	'PHP_OPTIONAL_MODULE_EXPLAIN'	=> '<strong>Optional</strong> - These modules or applications are optional. However, if they are available they will enable extra features.',
+	'PHP_SUPPORTED_DB'				=> 'Supported databases',
+	'PHP_SUPPORTED_DB_EXPLAIN'		=> '<strong>Required</strong> - You must have support for at least one compatible database within PHP. If no database modules are shown as available you should contact your hosting provider or review the relevant PHP installation documentation for advice.',
+	'PHP_REGISTER_GLOBALS'			=> 'PHP setting <var>register_globals</var> is disabled',
+	'PHP_REGISTER_GLOBALS_EXPLAIN'	=> 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.',
+	'PHP_SAFE_MODE'					=> 'Safe mode',
+	'PHP_SETTINGS'					=> 'PHP version and settings',
+	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 4.3.3 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
+	'PHP_URL_FOPEN_SUPPORT'			=> 'PHP setting <var>allow_url_fopen</var> is enabled',
+	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it. ',
+	'PHP_VERSION_REQD'				=> 'PHP version >= 4.3.3',
+	'POST_ID'						=> 'Post ID',
+	'PREFIX_FOUND'					=> 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
+	'PREPROCESS_STEP'				=> 'Executing pre-processing functions/queries',
+	'PRE_CONVERT_COMPLETE'			=> 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process. Please note that you may have to manually do and adjust several things. After conversion, especially check the permissions assigned, rebuild your search index which is not converted and also make sure files got copied correctly, for example avatars and smilies.',
+	'PROCESS_LAST'					=> 'Processing last statements',
+
+	'REFRESH_PAGE'				=> 'Refresh page to continue conversion',
+	'REFRESH_PAGE_EXPLAIN'		=> 'If set to yes, the convertor will refresh the page to continue the conversion after having finished a step. If this is your first conversion for testing purposes and to determine any errors in advance, we suggest to set this to No.',
+	'REQUIREMENTS_TITLE'		=> 'Installation compatibility',
+	'REQUIREMENTS_EXPLAIN'		=> 'Before proceeding with the full installation phpBB will carry out some tests on your server configuration and files to ensure that you are able to install and run phpBB. Please ensure you read through the results thoroughly and do not proceed until all the required tests are passed. If you wish to use any of the features depending on the optional tests, you should ensure that these tests are passed also.',
+	'RETRY_WRITE'				=> 'Retry writing config',
+	'RETRY_WRITE_EXPLAIN'		=> 'If you wish you can change the permissions on config.php to allow phpBB to write to it. Should you wish to do that you can click Retry below to try again. Remember to return the permissions on config.php after phpBB has finished installation.',
+
+	'SCRIPT_PATH'				=> 'Script path',
+	'SCRIPT_PATH_EXPLAIN'		=> 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>.',
+	'SELECT_LANG'				=> 'Select language',
+	'SERVER_CONFIG'				=> 'Server configuration',
+	'SEARCH_INDEX_UNCONVERTED'	=> 'Search index was not converted',
+	'SEARCH_INDEX_UNCONVERTED_EXPLAIN'	=> 'Your old search index was not converted. Searching will always yield an empty result. To create a new search index go to the Administration Control Panel, select Maintenance and then choose Search index from the submenu.',
+	'SOFTWARE'					=> 'Board software',
+	'SPECIFY_OPTIONS'			=> 'Specify conversion options',
+	'STAGE_ADMINISTRATOR'		=> 'Administrator details',
+	'STAGE_ADVANCED'			=> 'Advanced settings',
+	'STAGE_ADVANCED_EXPLAIN'	=> 'The settings on this page are only necessary to set if you know that you require something different from the default. If you are unsure, just proceed to the next page, as these settings can be altered from the Administration Control Panel later.',
+	'STAGE_CONFIG_FILE'			=> 'Configuration file',
+	'STAGE_CREATE_TABLE'		=> 'Create database tables',
+	'STAGE_CREATE_TABLE_EXPLAIN'	=> 'The database tables used by phpBB 3.0 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.',
+	'STAGE_DATABASE'			=> 'Database settings',
+	'STAGE_FINAL'				=> 'Final stage',
+	'STAGE_INTRO'				=> 'Introduction',
+	'STAGE_IN_PROGRESS'			=> 'Conversion in progress',
+	'STAGE_REQUIREMENTS'		=> 'Requirements',
+	'STAGE_SETTINGS'			=> 'Settings',
+	'STARTING_CONVERT'			=> 'Starting conversion process',
+	'STEP_PERCENT_COMPLETED'	=> 'Step <strong>%d</strong> of <strong>%d</strong>',
+	'SUB_INTRO'					=> 'Introduction',
+	'SUB_LICENSE'				=> 'License',
+	'SUB_SUPPORT'				=> 'Support',
+	'SUCCESSFUL_CONNECT'		=> 'Successful connection',
+	'SUPPORT_BODY'				=> 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="http://www.phpbb.com/community/viewforum.php?f=65">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>MODs / Styles</h2><p>For issues relating to MODs, please post in the appropriate <a href="http://www.phpbb.com/community/viewforum.php?f=81">Modifications Forum</a>.<br />For issues relating to styles, templates and imagesets, please post in the appropriate <a href="http://www.phpbb.com/community/viewforum.php?f=80">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="http://www.phpbb.com/community/viewtopic.php?f=14&amp;t=571070">The phpBB Welcome Package</a><br /><a href="http://www.phpbb.com/support/">Support Section</a><br /><a href="http://www.phpbb.com/support/documentation/3.0/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/">subscribe to our mailing list</a>?<br /><br />',
+	'SYNC_FORUMS'				=> 'Starting to synchronise forums',
+	'SYNC_POST_COUNT'			=> 'Synchronising post_counts',
+	'SYNC_POST_COUNT_ID'		=> 'Synchronising post_counts from <var>entry</var> %1$s to %2$s.',
+	'SYNC_TOPICS'				=> 'Starting to synchronise topics',
+	'SYNC_TOPIC_ID'				=> 'Synchronising topics from <var>topic_id</var> %1$s to %2$s.',
+
+	'TABLES_MISSING'			=> 'Could not find these tables<br />» <strong>%s</strong>.',
+	'TABLE_PREFIX'				=> 'Prefix for tables in database',
+	'TABLE_PREFIX_SAME'			=> 'The table prefix needs to be the one used by the software you are converting from.<br />» Specified table prefix was %s.',
+	'TESTS_PASSED'				=> 'Tests passed',
+	'TESTS_FAILED'				=> 'Tests failed',
+
+	'UNABLE_WRITE_LOCK'			=> 'Unable to write lock file.',
+	'UNAVAILABLE'				=> 'Unavailable',
+	'UNWRITABLE'				=> 'Unwritable',
+	'UPDATE_TOPICS_POSTED'		=> 'Generating topics posted information',
+	'UPDATE_TOPICS_POSTED_ERR'	=> 'An error occured while generating topics posted information. You can retry this step in the ACP after the conversion process is completed.',
+	'VERIFY_OPTIONS'			=> 'Verifying conversion options',
+	'VERSION'					=> 'Version',
+
+	'WELCOME_INSTALL'			=> 'Welcome to phpBB3 Installation',
+	'WRITABLE'					=> 'Writable',
+));
+
+// Updater
+$lang = array_merge($lang, array(
+	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">Send statistics</a> module in your ACP.',
+	'ARCHIVE_FILE'				=> 'Source file within archive',
+
+	'BACK'				=> 'Back',
+	'BINARY_FILE'		=> 'Binary file',
+	'BOT'				=> 'Spider/Robot',
+
+	'CHANGE_CLEAN_NAMES'			=> 'The method used to make sure a username is not used by multiple users has been changed. There are some users which have the same name when compared with the new method. You have to delete or rename these users to make sure that each name is only used by one user before you can proceed.',
+	'CHECK_FILES'					=> 'Check files',
+	'CHECK_FILES_AGAIN'				=> 'Check files again',
+	'CHECK_FILES_EXPLAIN'			=> 'Within the next step all files will be checked against the update files - this can take a while if this is the first file check.',
+	'CHECK_FILES_UP_TO_DATE'		=> 'According to your database your version is up to date. You may want to proceed with the file check to make sure all files are really up to date with the latest phpBB version.',
+	'CHECK_UPDATE_DATABASE'			=> 'Continue update process',
+	'COLLECTED_INFORMATION'			=> 'File information',
+	'COLLECTED_INFORMATION_EXPLAIN'	=> 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
+	'COLLECTING_FILE_DIFFS'			=> 'Collecting file differences',
+	'COMPLETE_LOGIN_TO_BOARD'		=> 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
+	'CONTINUE_UPDATE_NOW'			=> 'Continue the update process now',		// Shown within the database update script at the end if called from the updater
+	'CONTINUE_UPDATE'				=> 'Continue update now',					// Shown after file upload to indicate the update process is not yet finished
+	'CURRENT_FILE'					=> 'Begin of Conflict - Original File code before update',
+	'CURRENT_VERSION'				=> 'Current version',
+
+	'DATABASE_TYPE'						=> 'Database type',
+	'DATABASE_UPDATE_INFO_OLD'			=> 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.',
+	'DELETE_USER_REMOVE'				=> 'Delete user and remove posts',
+	'DELETE_USER_RETAIN'				=> 'Delete user but keep posts',
+	'DESTINATION'						=> 'Destination file',
+	'DIFF_INLINE'						=> 'Inline',
+	'DIFF_RAW'							=> 'Raw unified diff',
+	'DIFF_SEP_EXPLAIN'					=> 'Code block used within the updated/new file',
+	'DIFF_SIDE_BY_SIDE'					=> 'Side by Side',
+	'DIFF_UNIFIED'						=> 'Unified diff',
+	'DO_NOT_UPDATE'						=> 'Do not update this file',
+	'DONE'								=> 'Done',
+	'DOWNLOAD'							=> 'Download',
+	'DOWNLOAD_AS'						=> 'Download as',
+	'DOWNLOAD_UPDATE_METHOD_BUTTON'		=> 'Download modified files archive (recommended)',
+	'DOWNLOAD_CONFLICTS'				=> 'Download conflicts for this file',
+	'DOWNLOAD_CONFLICTS_EXPLAIN'		=> 'Search for &lt;&lt;&lt; to spot conflicts',
+	'DOWNLOAD_UPDATE_METHOD'			=> 'Download modified files archive',
+	'DOWNLOAD_UPDATE_METHOD_EXPLAIN'	=> 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.',
+
+	'ERROR'			=> 'Error',
+	'EDIT_USERNAME'	=> 'Edit username',
+
+	'FILE_ALREADY_UP_TO_DATE'		=> 'File is already up to date.',
+	'FILE_DIFF_NOT_ALLOWED'			=> 'File not allowed to be diffed.',
+	'FILE_USED'						=> 'Information used from',			// Single file
+	'FILES_CONFLICT'				=> 'Conflict files',
+	'FILES_CONFLICT_EXPLAIN'		=> 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in losing the changes from the newer file.',
+	'FILES_MODIFIED'				=> 'Modified files',
+	'FILES_MODIFIED_EXPLAIN'		=> 'The following files are modified and do not represent the original files from the old version. The updated file will be a merge between your modifications and the new file.',
+	'FILES_NEW'						=> 'New files',
+	'FILES_NEW_EXPLAIN'				=> 'The following files currently do not exist within your installation. These files will be added to your installation.',
+	'FILES_NEW_CONFLICT'			=> 'New conflicting files',
+	'FILES_NEW_CONFLICT_EXPLAIN'	=> 'The following files are new within the latest version but it has been determined that there is already a file with the same name within the same position. This file will be overwritten by the new file.',
+	'FILES_NOT_MODIFIED'			=> 'Not modified files',
+	'FILES_NOT_MODIFIED_EXPLAIN'	=> 'The following files are not modified and represent the original phpBB files from the version you want to update from.',
+	'FILES_UP_TO_DATE'				=> 'Already updated files',
+	'FILES_UP_TO_DATE_EXPLAIN'		=> 'The following files are already up to date and do not need to be updated.',
+	'FTP_SETTINGS'					=> 'FTP settings',
+	'FTP_UPDATE_METHOD'				=> 'FTP upload',
+
+	'INCOMPATIBLE_UPDATE_FILES'		=> 'The update files found are incompatible with your installed version. Your installed version is %1$s and the update file is for updating phpBB %2$s to %3$s.',
+	'INCOMPLETE_UPDATE_FILES'		=> 'The update files are incomplete.',
+	'INLINE_UPDATE_SUCCESSFUL'		=> 'The database update was successful. Now you need to continue the update process.',
+
+	'KEEP_OLD_NAME'		=> 'Keep username',
+
+	'LATEST_VERSION'		=> 'Latest version',
+	'LINE'					=> 'Line',
+	'LINE_ADDED'			=> 'Added',
+	'LINE_MODIFIED'			=> 'Modified',
+	'LINE_REMOVED'			=> 'Removed',
+	'LINE_UNMODIFIED'		=> 'Unmodified',
+	'LOGIN_UPDATE_EXPLAIN'	=> 'In order to update your installation you need to login first.',
+
+	'MAPPING_FILE_STRUCTURE'	=> 'To ease the upload here are the file locations which map your phpBB installation.',
+
+	'MERGE_MODIFICATIONS_OPTION'	=> 'Merge modifications',
+
+	'MERGE_NO_MERGE_NEW_OPTION'	=> 'Do not merge - use new file',
+	'MERGE_NO_MERGE_MOD_OPTION'	=> 'Do not merge - use currently installed file',
+	'MERGE_MOD_FILE_OPTION'		=> 'Merge modifications (removes new phpBB code within conflicting block)',
+	'MERGE_NEW_FILE_OPTION'		=> 'Merge modifications (removes modified code within conflicting block)',
+	'MERGE_SELECT_ERROR'		=> 'Conflicting file merge modes are not correctly selected.',
+	'MERGING_FILES'				=> 'Merging differences',
+	'MERGING_FILES_EXPLAIN'		=> 'Currently collecting final file changes.<br /><br />Please wait until phpBB has completed all operations on changed files.',
+
+	'NEW_FILE'						=> 'End of Conflict',
+	'NEW_USERNAME'					=> 'New username',
+	'NO_AUTH_UPDATE'				=> 'Not authorised to update',
+	'NO_ERRORS'						=> 'No errors',
+	'NO_UPDATE_FILES'				=> 'Not updating the following files',
+	'NO_UPDATE_FILES_EXPLAIN'		=> 'The following files are new or modified but the directory they normally reside in could not be found on your installation. If this list contains files to other directories than language/ or styles/ than you may have modified your directory structure and the update may be incomplete.',
+	'NO_UPDATE_FILES_OUTDATED'		=> 'No valid update directory was found, please make sure you uploaded the relevant files.<br /><br />Your installation does <strong>not</strong> seem to be up to date. Updates are available for your version of phpBB %1$s, please visit <a href="http://www.phpbb.com/downloads/" rel="external">http://www.phpbb.com/downloads/</a> to obtain the correct package to update from Version %2$s to Version %3$s.',
+	'NO_UPDATE_FILES_UP_TO_DATE'	=> 'Your version is up to date. There is no need to run the update tool. If you want to make an integrity check on your files make sure you uploaded the correct update files.',
+	'NO_UPDATE_INFO'				=> 'Update file information could not be found.',
+	'NO_UPDATES_REQUIRED'			=> 'No updates required',
+	'NO_VISIBLE_CHANGES'			=> 'No visible changes',
+	'NOTICE'						=> 'Notice',
+	'NUM_CONFLICTS'					=> 'Number of conflicts',
+	'NUMBER_OF_FILES_COLLECTED'		=> 'Currently differences from %1$d of %2$d files have been checked.<br />Please wait until all files are checked.',
+
+	'OLD_UPDATE_FILES'		=> 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
+
+	'PACKAGE_UPDATES_TO'				=> 'Current package updates to version',
+	'PERFORM_DATABASE_UPDATE'			=> 'Perform database update',
+	'PERFORM_DATABASE_UPDATE_EXPLAIN'	=> 'Below you will find a button to the database update script. The database update can take a while, so please do not stop the execution if it seems to hang. After the database update has been performed just follow the instructions to continue the update process.',
+	'PREVIOUS_VERSION'					=> 'Previous version',
+	'PROGRESS'							=> 'Progress',
+
+	'RESULT'					=> 'Result',
+	'RUN_DATABASE_SCRIPT'		=> 'Update my database now',
+
+	'SELECT_DIFF_MODE'			=> 'Select diff mode',
+	'SELECT_DOWNLOAD_FORMAT'	=> 'Select download archive format',
+	'SELECT_FTP_SETTINGS'		=> 'Select FTP settings',
+	'SHOW_DIFF_CONFLICT'		=> 'Show differences/conflicts',
+	'SHOW_DIFF_FINAL'			=> 'Show resulting file',
+	'SHOW_DIFF_MODIFIED'		=> 'Show merged differences',
+	'SHOW_DIFF_NEW'				=> 'Show file contents',
+	'SHOW_DIFF_NEW_CONFLICT'	=> 'Show differences',
+	'SHOW_DIFF_NOT_MODIFIED'	=> 'Show differences',
+	'SOME_QUERIES_FAILED'		=> 'Some queries failed, the statements and errors are listing below.',
+	'SQL'						=> 'SQL',
+	'SQL_FAILURE_EXPLAIN'		=> 'This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our support forums. See <a href="../docs/README.html">README</a> for details on how to obtain advice.',
+	'STAGE_FILE_CHECK'			=> 'Check files',
+	'STAGE_UPDATE_DB'			=> 'Update database',
+	'STAGE_UPDATE_FILES'		=> 'Update files',
+	'STAGE_VERSION_CHECK'		=> 'Version check',
+	'STATUS_CONFLICT'			=> 'Modified file producing conflicts',
+	'STATUS_MODIFIED'			=> 'Modified file',
+	'STATUS_NEW'				=> 'New file',
+	'STATUS_NEW_CONFLICT'		=> 'Conflicting new file',
+	'STATUS_NOT_MODIFIED'		=> 'Not modified file',
+	'STATUS_UP_TO_DATE'			=> 'Already updated file',
+
+	'TOGGLE_DISPLAY'			=> 'View/Hide file list',
+	'TRY_DOWNLOAD_METHOD'		=> 'You may want to try the download modified files method.<br />This method always works and is also the recommended update path.',
+	'TRY_DOWNLOAD_METHOD_BUTTON'=> 'Try this method now',
+
+	'UPDATE_COMPLETED'				=> 'Update completed',
+	'UPDATE_DATABASE'				=> 'Update database',
+	'UPDATE_DATABASE_EXPLAIN'		=> 'Within the next step the database will be updated.',
+	'UPDATE_DATABASE_SCHEMA'		=> 'Updating database schema',
+	'UPDATE_FILES'					=> 'Update files',
+	'UPDATE_FILES_NOTICE'			=> 'Please make sure you have updated your board files too, this file is only updating your database.',
+	'UPDATE_INSTALLATION'			=> 'Update phpBB installation',
+	'UPDATE_INSTALLATION_EXPLAIN'	=> 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />',
+	'UPDATE_INSTRUCTIONS'			=> '
+
+		<h1>Release announcement</h1>
+
+		<p>Please read <a href="%1$s" title="%1$s"><strong>the release announcement for the latest version</strong></a> before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.</p>
+
+		<br />
+
+		<h1>How to update your installation with the Automatic Update Package</h1>
+
+		<p>The recommended way of updating your installation listed here is only valid for the automatic update package. You are also able to update your installation using the methods listed within the INSTALL.html document. The steps for updating phpBB3 automatically are:</p>
+
+		<ul style="margin-left: 20px; font-size: 1.1em;">
+			<li>Go to the <a href="http://www.phpbb.com/downloads/" title="http://www.phpbb.com/downloads/">phpBB.com downloads page</a> and download the "Automatic Update Package" archive.<br /><br /></li>
+			<li>Unpack the archive.<br /><br /></li>
+			<li>Upload the complete uncompressed install folder to your phpBB root directory (where your config.php file is).<br /><br /></li>
+		</ul>
+
+		<p>Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.<br /><br />
+		<strong><a href="%2$s" title="%2$s">Now start the update process by pointing your browser to the install folder</a>.</strong><br />
+		<br />
+		You will then be guided through the update process. You will be notified once the update is complete.
+		</p>
+	',
+	'UPDATE_INSTRUCTIONS_INCOMPLETE'	=> '
+
+		<h1>Incomplete update detected</h1>
+
+		<p>phpBB detected an incomplete automatic update. Please make sure you followed every step within the automatic update tool. Below you will find the link again, or go directly to your install directory.</p>
+	',
+	'UPDATE_METHOD'					=> 'Update method',
+	'UPDATE_METHOD_EXPLAIN'			=> 'You are now able to choose your preferred update method. Using the FTP upload will present you with a form you need to enter your FTP account details into. With this method the files will be automatically moved to the new location and backups of the old files being created by appending .bak to the filename. If you choose to download the modified files you are able to unpack and upload them to their correct location manually later.',
+	'UPDATE_REQUIRES_FILE'			=> 'The updater requires that the following file is present: %s',
+	'UPDATE_SUCCESS'				=> 'Update was successful',
+	'UPDATE_SUCCESS_EXPLAIN'		=> 'Successfully updated all files. The next step involves checking all files again to make sure the files got updated correctly.',
+	'UPDATE_VERSION_OPTIMIZE'		=> 'Updating version and optimising tables',
+	'UPDATING_DATA'					=> 'Updating data',
+	'UPDATING_TO_LATEST_STABLE'		=> 'Updating database to latest stable release',
+	'UPDATED_VERSION'				=> 'Updated version',
+	'UPLOAD_METHOD'					=> 'Upload method',
+
+	'UPDATE_DB_SUCCESS'				=> 'Database update was successful.',
+	'USER_ACTIVE'					=> 'Active user',
+	'USER_INACTIVE'					=> 'Inactive user',
+
+	'VERSION_CHECK'					=> 'Version check',
+	'VERSION_CHECK_EXPLAIN'			=> 'Checks to see if your phpBB installation is up to date.',
+	'VERSION_NOT_UP_TO_DATE'		=> 'Your phpBB installation is not up to date. Please continue the update process.',
+	'VERSION_NOT_UP_TO_DATE_ACP'	=> 'Your phpBB installation is not up to date.<br />Below is a link to the release announcement, which contains more information as well as instructions on updating.',
+	'VERSION_NOT_UP_TO_DATE_TITLE'	=> 'Your phpBB installation is not up to date.',
+	'VERSION_UP_TO_DATE'			=> 'Your phpBB installation is up to date. Although there are no updates available at this time, you may continue in order to perform a file validity check.',
+	'VERSION_UP_TO_DATE_ACP'		=> 'Your phpBB installation is up to date. There are no updates available at this time.',
+	'VIEWING_FILE_CONTENTS'			=> 'Viewing file contents',
+	'VIEWING_FILE_DIFF'				=> 'Viewing file differences',
+
+	'WRONG_INFO_FILE_FORMAT'	=> 'Wrong info file format',
+));
+
+// Default database schema entries...
+$lang = array_merge($lang, array(
+	'CONFIG_BOARD_EMAIL_SIG'		=> 'Thanks, The Management',
+	'CONFIG_SITE_DESC'				=> 'A short text to describe your forum',
+	'CONFIG_SITENAME'				=> 'yourdomain.com',
+
+	'DEFAULT_INSTALL_POST'			=> 'This is an example post in your phpBB3 installation. Everything seems to be working. You may delete this post if you like and continue to set up your board. During the installation process your first category and your first forum are assigned an appropriate set of permissions for the predefined usergroups administrators, bots, global moderators, guests, registered users and registered COPPA users. If you also choose to delete your first category and your first forum, do not forget to assign permissions for all these usergroups for all new categories and forums you create. It is recommended to rename your first category and your first forum and copy permissions from these while creating new categories and forums. Have fun!',
+
+	'EXT_GROUP_ARCHIVES'			=> 'Archives',
+	'EXT_GROUP_DOCUMENTS'			=> 'Documents',
+	'EXT_GROUP_DOWNLOADABLE_FILES'	=> 'Downloadable Files',
+	'EXT_GROUP_FLASH_FILES'			=> 'Flash Files',
+	'EXT_GROUP_IMAGES'				=> 'Images',
+	'EXT_GROUP_PLAIN_TEXT'			=> 'Plain Text',
+	'EXT_GROUP_QUICKTIME_MEDIA'		=> 'Quicktime Media',
+	'EXT_GROUP_REAL_MEDIA'			=> 'Real Media',
+	'EXT_GROUP_WINDOWS_MEDIA'		=> 'Windows Media',
+
+	'FORUMS_FIRST_CATEGORY'			=> 'Your first category',
+	'FORUMS_TEST_FORUM_DESC'		=> 'Description of your first forum.',
+	'FORUMS_TEST_FORUM_TITLE'		=> 'Your first forum',
+
+	'RANKS_SITE_ADMIN_TITLE'		=> 'Site Admin',
+	'REPORT_WAREZ'					=> 'The post contains links to illegal or pirated software.',
+	'REPORT_SPAM'					=> 'The reported post has the only purpose to advertise for a website or another product.',
+	'REPORT_OFF_TOPIC'				=> 'The reported post is off topic.',
+	'REPORT_OTHER'					=> 'The reported post does not fit into any other category, please use the further information field.',
+
+	'SMILIES_ARROW'					=> 'Arrow',
+	'SMILIES_CONFUSED'				=> 'Confused',
+	'SMILIES_COOL'					=> 'Cool',
+	'SMILIES_CRYING'				=> 'Crying or Very Sad',
+	'SMILIES_EMARRASSED'			=> 'Embarrassed',
+	'SMILIES_EVIL'					=> 'Evil or Very Mad',
+	'SMILIES_EXCLAMATION'			=> 'Exclamation',
+	'SMILIES_GEEK'					=> 'Geek',
+	'SMILIES_IDEA'					=> 'Idea',
+	'SMILIES_LAUGHING'				=> 'Laughing',
+	'SMILIES_MAD'					=> 'Mad',
+	'SMILIES_MR_GREEN'				=> 'Mr. Green',
+	'SMILIES_NEUTRAL'				=> 'Neutral',
+	'SMILIES_QUESTION'				=> 'Question',
+	'SMILIES_RAZZ'					=> 'Razz',
+	'SMILIES_ROLLING_EYES'			=> 'Rolling Eyes',
+	'SMILIES_SAD'					=> 'Sad',
+	'SMILIES_SHOCKED'				=> 'Shocked',
+	'SMILIES_SMILE'					=> 'Smile',
+	'SMILIES_SURPRISED'				=> 'Surprised',
+	'SMILIES_TWISTED_EVIL'			=> 'Twisted Evil',
+	'SMILIES_UBER_GEEK'				=> 'Uber Geek',
+	'SMILIES_VERY_HAPPY'			=> 'Very Happy',
+	'SMILIES_WINK'					=> 'Wink',
+
+	'TOPICS_TOPIC_TITLE'			=> 'Welcome to phpBB3',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/iso.txt b/phpBB/language/en/iso.txt
new file mode 100644
index 0000000000..c421dd4316
--- /dev/null
+++ b/phpBB/language/en/iso.txt
@@ -0,0 +1,3 @@
+British English
+British English
+phpBB Group
\ No newline at end of file
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
new file mode 100644
index 0000000000..ab03cdb0be
--- /dev/null
+++ b/phpBB/language/en/mcp.php
@@ -0,0 +1,402 @@
+<?php
+/**
+*
+* mcp [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ACTION'				=> 'Action',
+	'ACTION_NOTE'			=> 'Action/Note',
+	'ADD_FEEDBACK'			=> 'Add feedback',
+	'ADD_FEEDBACK_EXPLAIN'	=> 'If you would like to add a report on this please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.',
+	'ADD_WARNING'			=> 'Add warning',
+	'ADD_WARNING_EXPLAIN'	=> 'To send a warning to this user please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.',
+	'ALL_ENTRIES'			=> 'All entries',
+	'ALL_NOTES_DELETED'		=> 'Successfully removed all user notes.',
+	'ALL_REPORTS'			=> 'All reports',
+	'ALREADY_REPORTED'		=> 'This post has already been reported.',
+	'ALREADY_REPORTED_PM'	=> 'This private message has already been reported.',
+	'ALREADY_WARNED'		=> 'A warning has already been issued for this post.',
+	'APPROVE'				=> 'Approve',
+	'APPROVE_POST'			=> 'Approve post',
+	'APPROVE_POST_CONFIRM'	=> 'Are you sure you want to approve this post?',
+	'APPROVE_POSTS'			=> 'Approve posts',
+	'APPROVE_POSTS_CONFIRM'	=> 'Are you sure you want to approve the selected posts?',
+
+	'CANNOT_MOVE_SAME_FORUM'=> 'You cannot move a topic to the forum it’s already in.',
+	'CANNOT_WARN_ANONYMOUS'	=> 'You cannot warn unregistered guest users.',
+	'CANNOT_WARN_SELF'		=> 'You cannot warn yourself.',
+	'CAN_LEAVE_BLANK'		=> 'This can be left blank.',
+	'CHANGE_POSTER'			=> 'Change poster',
+	'CLOSE_PM_REPORT'		=> 'Close PM report',
+	'CLOSE_PM_REPORT_CONFIRM'	=> 'Are you sure you want to close the selected PM report?',
+	'CLOSE_PM_REPORTS'		=> 'Close PM reports',
+	'CLOSE_PM_REPORTS_CONFIRM'	=> 'Are you sure you want to close the selected PM reports?',
+	'CLOSE_REPORT'			=> 'Close report',
+	'CLOSE_REPORT_CONFIRM'	=> 'Are you sure you want to close the selected report?',
+	'CLOSE_REPORTS'			=> 'Close reports',
+	'CLOSE_REPORTS_CONFIRM'	=> 'Are you sure you want to close the selected reports?',
+
+	'DELETE_PM_REPORT'			=> 'Delete PM report',
+	'DELETE_PM_REPORT_CONFIRM'	=> 'Are you sure you want to delete the selected PM report?',
+	'DELETE_PM_REPORTS'			=> 'Delete PM reports',
+	'DELETE_PM_REPORTS_CONFIRM'	=> 'Are you sure you want to delete the selected PM reports?',
+	'DELETE_POSTS'				=> 'Delete posts',
+	'DELETE_POSTS_CONFIRM'		=> 'Are you sure you want to delete these posts?',
+	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
+	'DELETE_REPORT'				=> 'Delete report',
+	'DELETE_REPORT_CONFIRM'		=> 'Are you sure you want to delete the selected report?',
+	'DELETE_REPORTS'			=> 'Delete reports',
+	'DELETE_REPORTS_CONFIRM'	=> 'Are you sure you want to delete the selected reports?',
+	'DELETE_SHADOW_TOPIC'		=> 'Delete shadow topic',
+	'DELETE_TOPICS'				=> 'Delete selected topics',
+	'DELETE_TOPICS_CONFIRM'		=> 'Are you sure you want to delete these topics?',
+	'DELETE_TOPIC_CONFIRM'		=> 'Are you sure you want to delete this topic?',
+	'DISAPPROVE'				=> 'Disapprove',
+	'DISAPPROVE_REASON'			=> 'Reason for disapproval',
+	'DISAPPROVE_POST'			=> 'Disapprove post',
+	'DISAPPROVE_POST_CONFIRM'	=> 'Are you sure you want to disapprove this post?',
+	'DISAPPROVE_POSTS'			=> 'Disapprove posts',
+	'DISAPPROVE_POSTS_CONFIRM'	=> 'Are you sure you want to disapprove the selected posts?',
+	'DISPLAY_LOG'				=> 'Display entries from previous',
+	'DISPLAY_OPTIONS'			=> 'Display options',
+
+	'EMPTY_REPORT'					=> 'You must enter a description when selecting this reason.',
+	'EMPTY_TOPICS_REMOVED_WARNING'	=> 'Please note that one or several topics have been removed from the database because they were or become empty.',
+
+	'FEEDBACK'				=> 'Feedback',
+	'FORK'					=> 'Copy',
+	'FORK_TOPIC'			=> 'Copy topic',
+	'FORK_TOPIC_CONFIRM'	=> 'Are you sure you want to copy this topic?',
+	'FORK_TOPICS'			=> 'Copy selected topics',
+	'FORK_TOPICS_CONFIRM'	=> 'Are you sure you want to copy the selected topics?',
+	'FORUM_DESC'			=> 'Description',
+	'FORUM_NAME'			=> 'Forum name',
+	'FORUM_NOT_EXIST'		=> 'The forum you selected does not exist.',
+	'FORUM_NOT_POSTABLE'	=> 'The forum you selected cannot be posted to.',
+	'FORUM_STATUS'			=> 'Forum status',
+	'FORUM_STYLE'			=> 'Forum style',
+
+	'GLOBAL_ANNOUNCEMENT'	=> 'Global announcement',
+
+	'IP_INFO'				=> 'IP address information',
+	'IPS_POSTED_FROM'		=> 'IP addresses this user has posted from',
+
+	'LATEST_LOGS'				=> 'Latest 5 logged actions',
+	'LATEST_REPORTED'			=> 'Latest 5 reports',
+	'LATEST_REPORTED_PMS'		=> 'Latest 5 PM reports',
+	'LATEST_UNAPPROVED'			=> 'Latest 5 posts awaiting approval',
+	'LATEST_WARNING_TIME'		=> 'Latest warning issued',
+	'LATEST_WARNINGS'			=> 'Latest 5 warnings',
+	'LEAVE_SHADOW'				=> 'Leave shadow topic in place',
+	'LIST_REPORT'				=> '1 report',
+	'LIST_REPORTS'				=> '%d reports',
+	'LOCK'						=> 'Lock',
+	'LOCK_POST_POST'			=> 'Lock post',
+	'LOCK_POST_POST_CONFIRM'	=> 'Are you sure you want to prevent editing this post?',
+	'LOCK_POST_POSTS'			=> 'Lock selected posts',
+	'LOCK_POST_POSTS_CONFIRM'	=> 'Are you sure you want to prevent editing the selected posts?',
+	'LOCK_TOPIC_CONFIRM'		=> 'Are you sure you want to lock this topic?',
+	'LOCK_TOPICS'				=> 'Lock selected topics',
+	'LOCK_TOPICS_CONFIRM'		=> 'Are you sure you want to lock all selected topics?',
+	'LOGS_CURRENT_TOPIC'		=> 'Currently viewing logs of:',
+	'LOGIN_EXPLAIN_MCP'			=> 'To moderate this forum you must login.',
+	'LOGVIEW_VIEWTOPIC'			=> 'View topic',
+	'LOGVIEW_VIEWLOGS'			=> 'View topic log',
+	'LOGVIEW_VIEWFORUM'			=> 'View forum',
+	'LOOKUP_ALL'				=> 'Look up all IPs',
+	'LOOKUP_IP'					=> 'Look up IP',
+
+	'MARKED_NOTES_DELETED'		=> 'Successfully removed all marked user notes.',
+
+	'MCP_ADD'						=> 'Add a warning',
+
+	'MCP_BAN'					=> 'Banning',
+	'MCP_BAN_EMAILS'			=> 'Ban e-mails',
+	'MCP_BAN_IPS'				=> 'Ban IPs',
+	'MCP_BAN_USERNAMES'			=> 'Ban Usernames',
+
+	'MCP_LOGS'						=> 'Moderator logs',
+	'MCP_LOGS_FRONT'				=> 'Front page',
+	'MCP_LOGS_FORUM_VIEW'			=> 'Forum logs',
+	'MCP_LOGS_TOPIC_VIEW'			=> 'Topic logs',
+
+	'MCP_MAIN'						=> 'Main',
+	'MCP_MAIN_FORUM_VIEW'			=> 'View forum',
+	'MCP_MAIN_FRONT'				=> 'Front page',
+	'MCP_MAIN_POST_DETAILS'			=> 'Post details',
+	'MCP_MAIN_TOPIC_VIEW'			=> 'View topic',
+	'MCP_MAKE_ANNOUNCEMENT'			=> 'Modify to “Announcement”',
+	'MCP_MAKE_ANNOUNCEMENT_CONFIRM'	=> 'Are you sure you want to change this topic to an “Announcement”?',
+	'MCP_MAKE_ANNOUNCEMENTS'		=> 'Modify to “Announcements”',
+	'MCP_MAKE_ANNOUNCEMENTS_CONFIRM'=> 'Are you sure you want to change the selected topics to “Announcements”?',
+	'MCP_MAKE_GLOBAL'				=> 'Modify to “Global announcement”',
+	'MCP_MAKE_GLOBAL_CONFIRM'		=> 'Are you sure you want to change this topic to a “Global announcement”?',
+	'MCP_MAKE_GLOBALS'				=> 'Modify to “Global announcements”',
+	'MCP_MAKE_GLOBALS_CONFIRM'		=> 'Are you sure you want to change the selected topics to “Global announcements”?',
+	'MCP_MAKE_STICKY'				=> 'Modify to “Sticky”',
+	'MCP_MAKE_STICKY_CONFIRM'		=> 'Are you sure you want to change this topic to a “Sticky”?',
+	'MCP_MAKE_STICKIES'				=> 'Modify to “Stickies”',
+	'MCP_MAKE_STICKIES_CONFIRM'		=> 'Are you sure you want to change the selected topics to “Stickies”?',
+	'MCP_MAKE_NORMAL'				=> 'Modify to “Standard Topic”',
+	'MCP_MAKE_NORMAL_CONFIRM'		=> 'Are you sure you want to change this topic to a “Standard Topic”?',
+	'MCP_MAKE_NORMALS'				=> 'Modify to “Standard Topics”',
+	'MCP_MAKE_NORMALS_CONFIRM'		=> 'Are you sure you want to change the selected topics to “Standard Topics”?',
+
+	'MCP_NOTES'						=> 'User notes',
+	'MCP_NOTES_FRONT'				=> 'Front page',
+	'MCP_NOTES_USER'				=> 'User details',
+
+	'MCP_POST_REPORTS'				=> 'Reports issued on this post',
+
+	'MCP_PM_REPORTS'				=> 'Reported PMs',
+	'MCP_PM_REPORT_DETAILS'			=> 'PM Report details',
+	'MCP_PM_REPORTS_CLOSED'			=> 'Closed PM reports',
+	'MCP_PM_REPORTS_CLOSED_EXPLAIN'	=> 'This is a list of all reports about private messages which have previously been resolved.',
+	'MCP_PM_REPORTS_OPEN'			=> 'Open PM reports',
+	'MCP_PM_REPORTS_OPEN_EXPLAIN'	=> 'This is a list of all reported private messages which are still to be handled.',
+
+	'MCP_REPORTS'					=> 'Reported messages',
+	'MCP_REPORT_DETAILS'			=> 'Report details',
+	'MCP_REPORTS_CLOSED'			=> 'Closed reports',
+	'MCP_REPORTS_CLOSED_EXPLAIN'	=> 'This is a list of all reports about posts which have previously been resolved.',
+	'MCP_REPORTS_OPEN'				=> 'Open reports',
+	'MCP_REPORTS_OPEN_EXPLAIN'		=> 'This is a list of all reported posts which are still to be handled.',
+
+	'MCP_QUEUE'								=> 'Moderation queue',
+	'MCP_QUEUE_APPROVE_DETAILS'				=> 'Approve details',
+	'MCP_QUEUE_UNAPPROVED_POSTS'			=> 'Posts awaiting approval',
+	'MCP_QUEUE_UNAPPROVED_POSTS_EXPLAIN'	=> 'This is a list of all posts which require approving before they will be visible to users.',
+	'MCP_QUEUE_UNAPPROVED_TOPICS'			=> 'Topics awaiting approval',
+	'MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN'	=> 'This is a list of all topics which require approving before they will be visible to users.',
+
+	'MCP_VIEW_USER'			=> 'View warnings for a specific user',
+
+	'MCP_WARN'				=> 'Warnings',
+	'MCP_WARN_FRONT'		=> 'Front page',
+	'MCP_WARN_LIST'			=> 'List warnings',
+	'MCP_WARN_POST'			=> 'Warn for specific post',
+	'MCP_WARN_USER'			=> 'Warn user',
+
+	'MERGE_POSTS'			=> 'Merge posts',
+	'MERGE_POSTS_CONFIRM'	=> 'Are you sure you want to merge the selected posts?',
+	'MERGE_TOPIC_EXPLAIN'	=> 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on “Select topic” to search for one.',
+	'MERGE_TOPIC_ID'		=> 'Destination topic identification number',
+	'MERGE_TOPICS'			=> 'Merge topics',
+	'MERGE_TOPICS_CONFIRM'	=> 'Are you sure you want to merge the selected topics?',
+	'MODERATE_FORUM'		=> 'Moderate forum',
+	'MODERATE_TOPIC'		=> 'Moderate topic',
+	'MODERATE_POST'			=> 'Moderate post',
+	'MOD_OPTIONS'			=> 'Moderator options',
+	'MORE_INFO'				=> 'Further information',
+	'MOST_WARNINGS'			=> 'Users with most warnings',
+	'MOVE_TOPIC_CONFIRM'	=> 'Are you sure you want to move the topic into a new forum?',
+	'MOVE_TOPICS'			=> 'Move selected topics',
+	'MOVE_TOPICS_CONFIRM'	=> 'Are you sure you want to move the selected topics into a new forum?',
+
+	'NOTIFY_POSTER_APPROVAL'		=> 'Notify poster about approval?',
+	'NOTIFY_POSTER_DISAPPROVAL'		=> 'Notify poster about disapproval?',
+	'NOTIFY_USER_WARN'				=> 'Notify user about warning?',
+	'NOT_MODERATOR'					=> 'You are not a moderator of this forum.',
+	'NO_DESTINATION_FORUM'			=> 'Please select a forum for destination.',
+	'NO_DESTINATION_FORUM_FOUND'	=> 'There is no destination forum available.',
+	'NO_ENTRIES'					=> 'No log entries for this period.',
+	'NO_FEEDBACK'					=> 'No feedback exists for this user.',
+	'NO_FINAL_TOPIC_SELECTED'		=> 'You have to select a destination topic for merging posts.',
+	'NO_MATCHES_FOUND'				=> 'No matches found.',
+	'NO_POST'						=> 'You have to select a post in order to warn the user for a post.',
+	'NO_POST_REPORT'				=> 'This post was not reported.',
+	'NO_POST_SELECTED'				=> 'You must select at least one post to perform this action.',
+	'NO_REASON_DISAPPROVAL'			=> 'Please give an appropriate reason for disapproval.',
+	'NO_REPORT'						=> 'No report found',
+	'NO_REPORTS'					=> 'No reports found',
+	'NO_REPORT_SELECTED'			=> 'You must select at least one report to perform this action.',
+	'NO_TOPIC_ICON'					=> 'None',
+	'NO_TOPIC_SELECTED'				=> 'You must select at least one topic to perform this action.',
+	'NO_TOPICS_QUEUE'				=> 'There are no topics waiting for approval.',
+
+	'ONLY_TOPIC'			=> 'Only topic “%s”',
+	'OTHER_USERS'			=> 'Other users posting from this IP',
+
+	'PM_REPORT_CLOSED_SUCCESS'	=> 'The selected PM report has been closed successfully.',
+	'PM_REPORT_DELETED_SUCCESS'	=> 'The selected PM report has been deleted successfully.',
+	'PM_REPORTED_SUCCESS'		=> 'This private message has been successfully reported.',
+	'PM_REPORT_TOTAL'			=> 'In total there is <strong>1</strong> PM report to review.',
+	'PM_REPORTS_TOTAL'			=> 'In total there are <strong>%d</strong> PM reports to review.',
+	'PM_REPORTS_ZERO_TOTAL'		=> 'There are no PM reports to review.',
+	'PM_REPORT_DETAILS'			=> 'Private message report details',
+	'POSTER'					=> 'Poster',
+	'POSTS_APPROVED_SUCCESS'	=> 'The selected posts have been approved.',
+	'POSTS_DELETED_SUCCESS'		=> 'The selected posts have been successfully removed from the database.',
+	'POSTS_DISAPPROVED_SUCCESS'	=> 'The selected posts have been disapproved.',
+	'POSTS_LOCKED_SUCCESS'		=> 'The selected posts have been locked successfully.',
+	'POSTS_MERGED_SUCCESS'		=> 'The selected posts have been merged.',
+	'POSTS_UNLOCKED_SUCCESS'	=> 'The selected posts have been unlocked successfully.',
+	'POSTS_PER_PAGE'			=> 'Posts per page',
+	'POSTS_PER_PAGE_EXPLAIN'	=> '(Set to 0 to view all posts.)',
+	'POST_APPROVED_SUCCESS'		=> 'The selected post has been approved.',
+	'POST_DELETED_SUCCESS'		=> 'The selected post has been successfully removed from the database.',
+	'POST_DISAPPROVED_SUCCESS'	=> 'The selected post has been disapproved.',
+	'POST_LOCKED_SUCCESS'		=> 'Post locked successfully.',
+	'POST_NOT_EXIST'			=> 'The post you requested does not exist.',
+	'POST_REPORTED_SUCCESS'		=> 'This post has been successfully reported.',
+	'POST_UNLOCKED_SUCCESS'		=> 'Post unlocked successfully.',
+
+	'READ_USERNOTES'			=> 'User notes',
+	'READ_WARNINGS'				=> 'User warnings',
+	'REPORTER'					=> 'Reporter',
+	'REPORTED'					=> 'Reported',
+	'REPORTED_BY'				=> 'Reported by',
+	'REPORTED_ON_DATE'			=> 'on',
+	'REPORTS_CLOSED_SUCCESS'	=> 'The selected reports have been closed successfully.',
+	'REPORTS_DELETED_SUCCESS'	=> 'The selected reports have been deleted successfully.',
+	'REPORTS_TOTAL'				=> 'In total there are <strong>%d</strong> reports to review.',
+	'REPORTS_ZERO_TOTAL'		=> 'There are no reports to review.',
+	'REPORT_CLOSED'				=> 'This report has already been closed.',
+	'REPORT_CLOSED_SUCCESS'		=> 'The selected report has been closed successfully.',
+	'REPORT_DELETED_SUCCESS'	=> 'The selected report has been deleted successfully.',
+	'REPORT_DETAILS'			=> 'Report details',
+	'REPORT_MESSAGE'			=> 'Report this message',
+	'REPORT_MESSAGE_EXPLAIN'	=> 'Use this form to report the selected private message. Reporting should generally be used only if the message breaks forum rules. <strong>Reporting a private message will make its contents visible to all moderators.</strong>',
+	'REPORT_NOTIFY'				=> 'Notify me',
+	'REPORT_NOTIFY_EXPLAIN'		=> 'Informs you when your report is dealt with.',
+	'REPORT_POST_EXPLAIN'		=> 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
+	'REPORT_REASON'				=> 'Report reason',
+	'REPORT_TIME'				=> 'Report time',
+	'REPORT_TOTAL'				=> 'In total there is <strong>1</strong> report to review.',
+	'RESYNC'					=> 'Resync',
+	'RETURN_MESSAGE'			=> '%sReturn to the message%s',
+	'RETURN_NEW_FORUM'			=> '%sGo to the new forum%s',
+	'RETURN_NEW_TOPIC'			=> '%sGo to the new topic%s',
+	'RETURN_PM'					=> '%sReturn to the private message%s',
+	'RETURN_POST'				=> '%sReturn to the post%s',
+	'RETURN_QUEUE'				=> '%sReturn to the queue%s',
+	'RETURN_REPORTS'			=> '%sReturn to the reports%s',
+	'RETURN_TOPIC_SIMPLE'		=> '%sReturn to the topic%s',
+
+	'SEARCH_POSTS_BY_USER'				=> 'Search posts by',
+	'SELECT_ACTION'						=> 'Select desired action',
+	'SELECT_FORUM_GLOBAL_ANNOUNCEMENT'	=> 'Please select the forum you wish this global announcement to be displayed.',
+	'SELECT_FORUM_GLOBAL_ANNOUNCEMENTS'	=> 'One or more of the selected topics are global announcements. Please select the forum you wish these to be displayed.',
+	'SELECT_MERGE'						=> 'Select for merge',
+	'SELECT_TOPICS_FROM'				=> 'Select topics from',
+	'SELECT_TOPIC'						=> 'Select topic',
+	'SELECT_USER'						=> 'Select user',
+	'SORT_ACTION'						=> 'Log action',
+	'SORT_DATE'							=> 'Date',
+	'SORT_IP'							=> 'IP address',
+	'SORT_WARNINGS'						=> 'Warnings',
+	'SPLIT_AFTER'						=> 'Split topic from selected post onwards',
+	'SPLIT_FORUM'						=> 'Forum for new topic',
+	'SPLIT_POSTS'						=> 'Split selected posts',
+	'SPLIT_SUBJECT'						=> 'New topic title',
+	'SPLIT_TOPIC_ALL'					=> 'Split topic from selected posts',
+	'SPLIT_TOPIC_ALL_CONFIRM'			=> 'Are you sure you want to split this topic?',
+	'SPLIT_TOPIC_BEYOND'				=> 'Split topic at selected post',
+	'SPLIT_TOPIC_BEYOND_CONFIRM'		=> 'Are you sure you want to split this topic at the selected post?',
+	'SPLIT_TOPIC_EXPLAIN'				=> 'Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post.',
+
+	'THIS_POST_IP'				=> 'IP for this post',
+	'TOPICS_APPROVED_SUCCESS'	=> 'The selected topics have been approved.',
+	'TOPICS_DELETED_SUCCESS'	=> 'The selected topics have been successfully removed from the database.',
+	'TOPICS_DISAPPROVED_SUCCESS'=> 'The selected topics have been disapproved.',
+	'TOPICS_FORKED_SUCCESS'		=> 'The selected topics have been copied successfully.',
+	'TOPICS_LOCKED_SUCCESS'		=> 'The selected topics have been locked.',
+	'TOPICS_MOVED_SUCCESS'		=> 'The selected topics have been moved successfully.',
+	'TOPICS_RESYNC_SUCCESS'		=> 'The selected topics have been resynchronised.',
+	'TOPICS_TYPE_CHANGED'		=> 'Topic types changed successfully.',
+	'TOPICS_UNLOCKED_SUCCESS'	=> 'The selected topics have been unlocked.',
+	'TOPIC_APPROVED_SUCCESS'	=> 'The selected topic has been approved.',
+	'TOPIC_DELETED_SUCCESS'		=> 'The selected topic has been successfully removed from the database.',
+	'TOPIC_DISAPPROVED_SUCCESS'	=> 'The selected topic has been disapproved.',
+	'TOPIC_FORKED_SUCCESS'		=> 'The selected topic has been copied successfully.',
+	'TOPIC_LOCKED_SUCCESS'		=> 'The selected topic has been locked.',
+	'TOPIC_MOVED_SUCCESS'		=> 'The selected topic has been moved successfully.',
+	'TOPIC_NOT_EXIST'			=> 'The topic you selected does not exist.',
+	'TOPIC_RESYNC_SUCCESS'		=> 'The selected topic has been resynchronised.',
+	'TOPIC_SPLIT_SUCCESS'		=> 'The selected topic has been split successfully.',
+	'TOPIC_TIME'				=> 'Topic time',
+	'TOPIC_TYPE_CHANGED'		=> 'Topic type changed successfully.',
+	'TOPIC_UNLOCKED_SUCCESS'	=> 'The selected topic has been unlocked.',
+	'TOTAL_WARNINGS'			=> 'Total Warnings',
+
+	'UNAPPROVED_POSTS_TOTAL'		=> 'In total there are <strong>%d</strong> posts waiting for approval.',
+	'UNAPPROVED_POSTS_ZERO_TOTAL'	=> 'There are no posts waiting for approval.',
+	'UNAPPROVED_POST_TOTAL'			=> 'In total there is <strong>1</strong> post waiting for approval.',
+	'UNLOCK'						=> 'Unlock',
+	'UNLOCK_POST'					=> 'Unlock post',
+	'UNLOCK_POST_EXPLAIN'			=> 'Allow editing',
+	'UNLOCK_POST_POST'				=> 'Unlock post',
+	'UNLOCK_POST_POST_CONFIRM'		=> 'Are you sure you want to allow editing this post?',
+	'UNLOCK_POST_POSTS'				=> 'Unlock selected posts',
+	'UNLOCK_POST_POSTS_CONFIRM'		=> 'Are you sure you want to allow editing the selected posts?',
+	'UNLOCK_TOPIC'					=> 'Unlock topic',
+	'UNLOCK_TOPIC_CONFIRM'			=> 'Are you sure you want to unlock this topic?',
+	'UNLOCK_TOPICS'					=> 'Unlock selected topics',
+	'UNLOCK_TOPICS_CONFIRM'			=> 'Are you sure you want to unlock all selected topics?',
+	'USER_CANNOT_POST'				=> 'You cannot post in this forum.',
+	'USER_CANNOT_REPORT'			=> 'You cannot report posts in this forum.',
+	'USER_FEEDBACK_ADDED'			=> 'User feedback added successfully.',
+	'USER_WARNING_ADDED'			=> 'User warned successfully.',
+
+	'VIEW_DETAILS'			=> 'View details',
+	'VIEW_PM'				=> 'View private message',
+	'VIEW_POST'				=> 'View post',
+
+	'WARNED_USERS'			=> 'Warned users',
+	'WARNED_USERS_EXPLAIN'	=> 'This is a list of users with unexpired warnings issued to them.',
+	'WARNING_PM_BODY'		=> 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]',
+	'WARNING_PM_SUBJECT'	=> 'Board warning issued',
+	'WARNING_POST_DEFAULT'	=> 'This is a warning regarding the following post made by you: %s .',
+	'WARNINGS_ZERO_TOTAL'	=> 'No warnings exist.',
+
+	'YOU_SELECTED_TOPIC'	=> 'You selected topic number %d: %s.',
+
+	'report_reasons'		=> array(
+		'TITLE'	=> array(
+			'WAREZ'		=> 'Warez',
+			'SPAM'		=> 'Spam',
+			'OFF_TOPIC'	=> 'Off-topic',
+			'OTHER'		=> 'Other',
+		),
+		'DESCRIPTION' => array(
+			'WAREZ'		=> 'The message contains links to illegal or pirated software.',
+			'SPAM'		=> 'The reported message has the only purpose to advertise for a website or another product.',
+			'OFF_TOPIC'	=> 'The reported message is off topic.',
+			'OTHER'		=> 'The reported message does not fit into any other category, please use the further information field.',
+		)
+	),
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
new file mode 100644
index 0000000000..e7a9c6b88d
--- /dev/null
+++ b/phpBB/language/en/memberlist.php
@@ -0,0 +1,150 @@
+<?php
+/**
+*
+* memberlist [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ABOUT_USER'			=> 'Profile',
+	'ACTIVE_IN_FORUM'		=> 'Most active forum',
+	'ACTIVE_IN_TOPIC'		=> 'Most active topic',
+	'ADD_FOE'				=> 'Add foe',
+	'ADD_FRIEND'			=> 'Add friend',
+	'AFTER'					=> 'After',
+
+	'ALL'					=> 'All',
+
+	'BEFORE'				=> 'Before',
+
+	'CC_EMAIL'				=> 'Send a copy of this e-mail to yourself.',
+	'CONTACT_USER'			=> 'Contact',
+
+	'DEST_LANG'				=> 'Language',
+	'DEST_LANG_EXPLAIN'		=> 'Select an appropriate language (if available) for the recipient of this message.',
+
+	'EMAIL_BODY_EXPLAIN'	=> 'This message will be sent as plain text, do not include any HTML or BBCode. The return address for this message will be set to your e-mail address.',
+	'EMAIL_DISABLED'		=> 'Sorry but all e-mail related functions have been disabled.',
+	'EMAIL_SENT'			=> 'The e-mail has been sent.',
+	'EMAIL_TOPIC_EXPLAIN'	=> 'This message will be sent as plain text, do not include any HTML or BBCode. Please note that the topic information is already included in the message. The return address for this message will be set to your e-mail address.',
+	'EMPTY_ADDRESS_EMAIL'	=> 'You must provide a valid e-mail address for the recipient.',
+	'EMPTY_MESSAGE_EMAIL'	=> 'You must enter a message to be emailed.',
+	'EMPTY_MESSAGE_IM'		=> 'You must enter a message to be send.',
+	'EMPTY_NAME_EMAIL'		=> 'You must enter the real name of the recipient.',
+	'EMPTY_SUBJECT_EMAIL'	=> 'You must specify a subject for the e-mail.',
+	'EQUAL_TO'				=> 'Equal to',
+
+	'FIND_USERNAME_EXPLAIN'	=> 'Use this form to search for specific members. You do not need to fill out all fields. To match partial data use * as a wildcard. When entering dates use the format <kbd>YYYY-MM-DD</kbd>, e.g. <samp>2004-02-29</samp>. Use the mark checkboxes to select one or more usernames (several usernames may be accepted depending on the form itself) and click the Select Marked button to return to the previous form.',
+	'FLOOD_EMAIL_LIMIT'		=> 'You cannot send another e-mail at this time. Please try again later.',
+
+	'GROUP_LEADER'			=> 'Group leader',
+
+	'HIDE_MEMBER_SEARCH'	=> 'Hide member search',
+
+	'IM_ADD_CONTACT'		=> 'Add Contact',
+	'IM_AIM'				=> 'Please note that you need AOL Instant Messenger installed to use this.',
+	'IM_AIM_EXPRESS'		=> 'AIM Express',
+	'IM_DOWNLOAD_APP'		=> 'Download application',
+	'IM_ICQ'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
+	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
+	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
+	'IM_MESSAGE'			=> 'Your message',
+	'IM_MSNM'				=> 'Please note that you need Windows Messenger installed to use this.',
+	'IM_MSNM_BROWSER'		=> 'Your browser does not support this.',
+	'IM_MSNM_CONNECT'		=> 'MSNM is not connected.\nYou have to connect to MSNM to continue.',
+	'IM_NAME'				=> 'Your Name',
+	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
+	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
+	'IM_RECIPIENT'			=> 'Recipient',
+	'IM_SEND'				=> 'Send message',
+	'IM_SEND_MESSAGE'		=> 'Send message',
+	'IM_SENT_JABBER'		=> 'Your message to %1$s has been sent successfully.',
+	'IM_USER'				=> 'Send an instant message',
+
+	'LAST_ACTIVE'				=> 'Last active',
+	'LESS_THAN'					=> 'Less than',
+	'LIST_USER'					=> '1 user',
+	'LIST_USERS'				=> '%d users',
+	'LOGIN_EXPLAIN_LEADERS'		=> 'The board requires you to be registered and logged in to view the team listing.',
+	'LOGIN_EXPLAIN_MEMBERLIST'	=> 'The board requires you to be registered and logged in to access the memberlist.',
+	'LOGIN_EXPLAIN_SEARCHUSER'	=> 'The board requires you to be registered and logged in to search users.',
+	'LOGIN_EXPLAIN_VIEWPROFILE'	=> 'The board requires you to be registered and logged in to view profiles.',
+
+	'MORE_THAN'				=> 'More than',
+
+	'NO_EMAIL'				=> 'You are not permitted to send e-mail to this user.',
+	'NO_VIEW_USERS'			=> 'You are not authorised to view the member list or profiles.',
+
+	'ORDER'					=> 'Order',
+	'OTHER'					=> 'Other',
+
+	'POST_IP'				=> 'Posted from IP/domain',
+
+	'RANK'					=> 'Rank',
+	'REAL_NAME'				=> 'Recipient name',
+	'RECIPIENT'				=> 'Recipient',
+	'REMOVE_FOE'			=> 'Remove foe',
+	'REMOVE_FRIEND'			=> 'Remove friend',
+
+	'SEARCH_USER_POSTS'		=> 'Search user’s posts',
+	'SELECT_MARKED'			=> 'Select marked',
+	'SELECT_SORT_METHOD'	=> 'Select sort method',
+	'SEND_AIM_MESSAGE'		=> 'Send AIM message',
+	'SEND_ICQ_MESSAGE'		=> 'Send ICQ message',
+	'SEND_IM'				=> 'Instant messaging',
+	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
+	'SEND_MESSAGE'			=> 'Message',
+	'SEND_MSNM_MESSAGE'		=> 'Send MSNM/WLM message',
+	'SEND_YIM_MESSAGE'		=> 'Send YIM message',
+	'SORT_EMAIL'			=> 'E-mail',
+	'SORT_LAST_ACTIVE'		=> 'Last active',
+	'SORT_POST_COUNT'		=> 'Post count',
+
+	'USERNAME_BEGINS_WITH'	=> 'Username begins with',
+	'USER_ADMIN'			=> 'Administrate user',
+	'USER_BAN'				=> 'Banning',
+	'USER_FORUM'			=> 'User statistics',
+	'USER_LAST_REMINDED'	=> array(
+		0		=> 'No reminder sent at this time',
+		1		=> '%1$d reminder sent<br />» %2$s',
+	),
+	'USER_ONLINE'			=> 'Online',
+	'USER_PRESENCE'			=> 'Board presence',
+
+	'VIEWING_PROFILE'		=> 'Viewing profile - %s',
+	'VISITED'				=> 'Last visited',
+
+	'WWW'					=> 'Website',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/mods/index.htm b/phpBB/language/en/mods/index.htm
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
new file mode 100644
index 0000000000..8016a233fd
--- /dev/null
+++ b/phpBB/language/en/posting.php
@@ -0,0 +1,225 @@
+<?php
+/**
+*
+* posting [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ADD_ATTACHMENT'			=> 'Upload attachment',
+	'ADD_ATTACHMENT_EXPLAIN'	=> 'If you wish to attach one or more files enter the details below.',
+	'ADD_FILE'					=> 'Add the file',
+	'ADD_POLL'					=> 'Poll creation',
+	'ADD_POLL_EXPLAIN'			=> 'If you do not want to add a poll to your topic leave the fields blank.',
+	'ALREADY_DELETED'			=> 'Sorry but this message is already deleted.',
+	'ATTACH_QUOTA_REACHED'		=> 'Sorry, the board attachment quota has been reached.',
+	'ATTACH_SIG'				=> 'Attach a signature (signatures can be altered via the UCP)',
+
+	'BBCODE_A_HELP'				=> 'Inline uploaded attachment: [attachment=]filename.ext[/attachment]',
+	'BBCODE_B_HELP'				=> 'Bold text: [b]text[/b]',
+	'BBCODE_C_HELP'				=> 'Code display: [code]code[/code]',
+	'BBCODE_E_HELP'				=> 'List: Add list element',
+	'BBCODE_F_HELP'				=> 'Font size: [size=85]small text[/size]',
+	'BBCODE_IS_OFF'				=> '%sBBCode%s is <em>OFF</em>',
+	'BBCODE_IS_ON'				=> '%sBBCode%s is <em>ON</em>',
+	'BBCODE_I_HELP'				=> 'Italic text: [i]text[/i]',
+	'BBCODE_L_HELP'				=> 'List: [list]text[/list]',
+	'BBCODE_LISTITEM_HELP'		=> 'List item: [*]text[/*]',
+	'BBCODE_O_HELP'				=> 'Ordered list: [list=]text[/list]',
+	'BBCODE_P_HELP'				=> 'Insert image: [img]http://image_url[/img]',
+	'BBCODE_Q_HELP'				=> 'Quote text: [quote]text[/quote]',
+	'BBCODE_S_HELP'				=> 'Font colour: [color=red]text[/color]  Tip: you can also use color=#FF0000',
+	'BBCODE_U_HELP'				=> 'Underline text: [u]text[/u]',
+	'BBCODE_W_HELP'				=> 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]',
+	'BBCODE_D_HELP'				=> 'Flash: [flash=width,height]http://url[/flash]',
+	'BUMP_ERROR'				=> 'You cannot bump this topic so soon after the last post.',
+
+	'CANNOT_DELETE_REPLIED'		=> 'Sorry but you may only delete posts which have not been replied to.',
+	'CANNOT_EDIT_POST_LOCKED'	=> 'This post has been locked. You can no longer edit that post.',
+	'CANNOT_EDIT_TIME'			=> 'You can no longer edit or delete that post.',
+	'CANNOT_POST_ANNOUNCE'		=> 'Sorry but you cannot post announcements.',
+	'CANNOT_POST_STICKY'		=> 'Sorry but you cannot post sticky topics.',
+	'CHANGE_TOPIC_TO'			=> 'Change topic type to',
+	'CLOSE_TAGS'				=> 'Close tags',
+	'CURRENT_TOPIC'				=> 'Current topic',
+
+	'DELETE_FILE'				=> 'Delete file',
+	'DELETE_MESSAGE'			=> 'Delete message',
+	'DELETE_MESSAGE_CONFIRM'	=> 'Are you sure you want to delete this message?',
+	'DELETE_OWN_POSTS'			=> 'Sorry but you can only delete your own posts.',
+	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
+	'DELETE_POST_WARN'			=> 'Once deleted the post cannot be recovered',
+	'DISABLE_BBCODE'			=> 'Disable BBCode',
+	'DISABLE_MAGIC_URL'			=> 'Do not automatically parse URLs',
+	'DISABLE_SMILIES'			=> 'Disable smilies',
+	'DISALLOWED_CONTENT'		=> 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
+	'DISALLOWED_EXTENSION'		=> 'The extension %s is not allowed.',
+	'DRAFT_LOADED'				=> 'Draft loaded into posting area, you may want to finish your post now.<br />Your draft will be deleted after submitting this post.',
+	'DRAFT_LOADED_PM'			=> 'Draft loaded into message area, you may want to finish your private message now.<br />Your draft will be deleted after submitting this private message.',
+	'DRAFT_SAVED'				=> 'Draft successfully saved.',
+	'DRAFT_TITLE'				=> 'Draft title',
+
+	'EDIT_REASON'				=> 'Reason for editing this post',
+	'EMPTY_FILEUPLOAD'			=> 'The uploaded file is empty.',
+	'EMPTY_MESSAGE'				=> 'You must enter a message when posting.',
+	'EMPTY_REMOTE_DATA'			=> 'File could not be uploaded, please try uploading the file manually.',
+
+	'FLASH_IS_OFF'				=> '[flash] is <em>OFF</em>',
+	'FLASH_IS_ON'				=> '[flash] is <em>ON</em>',
+	'FLOOD_ERROR'				=> 'You cannot make another post so soon after your last.',
+	'FONT_COLOR'				=> 'Font colour',
+	'FONT_COLOR_HIDE'			=> 'Hide font colour',
+	'FONT_HUGE'					=> 'Huge',
+	'FONT_LARGE'				=> 'Large',
+	'FONT_NORMAL'				=> 'Normal',
+	'FONT_SIZE'					=> 'Font size',
+	'FONT_SMALL'				=> 'Small',
+	'FONT_TINY'					=> 'Tiny',
+
+	'GENERAL_UPLOAD_ERROR'		=> 'Could not upload attachment to %s.',
+
+	'IMAGES_ARE_OFF'			=> '[img] is <em>OFF</em>',
+	'IMAGES_ARE_ON'				=> '[img] is <em>ON</em>',
+	'INVALID_FILENAME'			=> '%s is an invalid filename.',
+
+	'LOAD'						=> 'Load',
+	'LOAD_DRAFT'				=> 'Load draft',
+	'LOAD_DRAFT_EXPLAIN'		=> 'Here you are able to select the draft you want to continue writing. Your current post will be cancelled, all current post contents will be deleted. View, edit and delete drafts within your User Control Panel.',
+	'LOGIN_EXPLAIN_BUMP'		=> 'You need to login in order to bump topics within this forum.',
+	'LOGIN_EXPLAIN_DELETE'		=> 'You need to login in order to delete posts within this forum.',
+	'LOGIN_EXPLAIN_POST'		=> 'You need to login in order to post within this forum.',
+	'LOGIN_EXPLAIN_QUOTE'		=> 'You need to login in order to quote posts within this forum.',
+	'LOGIN_EXPLAIN_REPLY'		=> 'You need to login in order to reply to topics within this forum.',
+
+	'MAX_FONT_SIZE_EXCEEDED'	=> 'You may only use fonts up to size %1$d.',
+	'MAX_FLASH_HEIGHT_EXCEEDED'	=> 'Your flash files may only be up to %1$d pixels high.',
+	'MAX_FLASH_WIDTH_EXCEEDED'	=> 'Your flash files may only be up to %1$d pixels wide.',
+	'MAX_IMG_HEIGHT_EXCEEDED'	=> 'Your images may only be up to %1$d pixels high.',
+	'MAX_IMG_WIDTH_EXCEEDED'	=> 'Your images may only be up to %1$d pixels wide.',
+
+	'MESSAGE_BODY_EXPLAIN'		=> 'Enter your message here, it may contain no more than <strong>%d</strong> characters.',
+	'MESSAGE_DELETED'			=> 'This message has been deleted successfully.',
+	'MORE_SMILIES'				=> 'View more smilies',
+
+	'NOTIFY_REPLY'				=> 'Notify me when a reply is posted',
+	'NOT_UPLOADED'				=> 'File could not be uploaded.',
+	'NO_DELETE_POLL_OPTIONS'	=> 'You cannot delete existing poll options.',
+	'NO_PM_ICON'				=> 'No PM icon',
+	'NO_POLL_TITLE'				=> 'You have to enter a poll title.',
+	'NO_POST'					=> 'The requested post does not exist.',
+	'NO_POST_MODE'				=> 'No post mode specified.',
+
+	'PARTIAL_UPLOAD'			=> 'The uploaded file was only partially uploaded.',
+	'PHP_SIZE_NA'				=> 'The attachment’s file size is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
+	'PHP_SIZE_OVERRUN'			=> 'The attachment’s file size is too large, the maximum upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
+	'PLACE_INLINE'				=> 'Place inline',
+	'POLL_DELETE'				=> 'Delete poll',
+	'POLL_FOR'					=> 'Run poll for',
+	'POLL_FOR_EXPLAIN'			=> 'Enter 0 or leave blank for a never ending poll.',
+	'POLL_MAX_OPTIONS'			=> 'Options per user',
+	'POLL_MAX_OPTIONS_EXPLAIN'	=> 'This is the number of options each user may select when voting.',
+	'POLL_OPTIONS'				=> 'Poll options',
+	'POLL_OPTIONS_EXPLAIN'		=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options.',
+	'POLL_OPTIONS_EDIT_EXPLAIN'	=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options. If you remove or add options all previous votes will be reset.',
+	'POLL_QUESTION'				=> 'Poll question',
+	'POLL_TITLE_TOO_LONG'		=> 'The poll title must contain fewer than 100 characters.',
+	'POLL_TITLE_COMP_TOO_LONG'	=> 'The parsed size of your poll title is too large, consider removing BBCodes or smilies.',
+	'POLL_VOTE_CHANGE'			=> 'Allow re-voting',
+	'POLL_VOTE_CHANGE_EXPLAIN'	=> 'If enabled users are able to change their vote.',
+	'POSTED_ATTACHMENTS'		=> 'Posted attachments',
+	'POST_APPROVAL_NOTIFY'		=> 'You will be notified when your post has been approved.',
+	'POST_CONFIRMATION'			=> 'Confirmation of post',
+	'POST_CONFIRM_EXPLAIN'		=> 'To prevent automated posts the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
+	'POST_DELETED'				=> 'This message has been deleted successfully.',
+	'POST_EDITED'				=> 'This message has been edited successfully.',
+	'POST_EDITED_MOD'			=> 'This message has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.',
+	'POST_GLOBAL'				=> 'Global',
+	'POST_ICON'					=> 'Post icon',
+	'POST_NORMAL'				=> 'Normal',
+	'POST_REVIEW'				=> 'Post review',
+	'POST_REVIEW_EDIT'			=> 'Post review',
+	'POST_REVIEW_EDIT_EXPLAIN'	=> 'This post has been altered by another user while you were editing it. You may wish to review the current version of this post and adjust your edits.',
+	'POST_REVIEW_EXPLAIN'		=> 'At least one new post has been made to this topic. You may wish to review your post in light of this.',
+	'POST_STORED'				=> 'This message has been posted successfully.',
+	'POST_STORED_MOD'			=> 'This message has been submitted successfully, but it will need to be approved by a moderator before it is publicly viewable.',
+	'POST_TOPIC_AS'				=> 'Post topic as',
+	'PROGRESS_BAR'				=> 'Progress bar',
+
+	'QUOTE_DEPTH_EXCEEDED'		=> 'You may embed only %1$d quotes within each other.',
+
+	'SAVE'						=> 'Save',
+	'SAVE_DATE'					=> 'Saved at',
+	'SAVE_DRAFT'				=> 'Save draft',
+	'SAVE_DRAFT_CONFIRM'		=> 'Please note that saved drafts only include the subject and the message, any other element will be removed. Do you want to save your draft now?',
+	'SMILIES'					=> 'Smilies',
+	'SMILIES_ARE_OFF'			=> 'Smilies are <em>OFF</em>',
+	'SMILIES_ARE_ON'			=> 'Smilies are <em>ON</em>',
+	'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement time limit',
+	'STICK_TOPIC_FOR'			=> 'Stick topic for',
+	'STICK_TOPIC_FOR_EXPLAIN'	=> 'Enter 0 or leave blank for a never ending Sticky/Announcement. Please note that this number is relative to the date of the post.',
+	'STYLES_TIP'				=> 'Tip: Styles can be applied quickly to selected text.',
+
+	'TOO_FEW_CHARS'				=> 'Your message contains too few characters.',
+	'TOO_FEW_CHARS_LIMIT'		=> 'Your message contains %1$d characters. The minimum number of characters you need to enter is %2$d.',
+	'TOO_FEW_POLL_OPTIONS'		=> 'You must enter at least two poll options.',
+	'TOO_MANY_ATTACHMENTS'		=> 'Cannot add another attachment, %d is the maximum.',
+	'TOO_MANY_CHARS'			=> 'Your message contains too many characters.',
+	'TOO_MANY_CHARS_POST'		=> 'Your message contains %1$d characters. The maximum number of allowed characters is %2$d.',
+	'TOO_MANY_CHARS_SIG'		=> 'Your signature contains %1$d characters. The maximum number of allowed characters is %2$d.',
+	'TOO_MANY_POLL_OPTIONS'		=> 'You have tried to enter too many poll options.',
+	'TOO_MANY_SMILIES'			=> 'Your message contains too many smilies. The maximum number of smilies allowed is %d.',
+	'TOO_MANY_URLS'				=> 'Your message contains too many URLs. The maximum number of URLs allowed is %d.',
+	'TOO_MANY_USER_OPTIONS'		=> 'You cannot specify more options per user than existing poll options.',
+	'TOPIC_BUMPED'				=> 'Topic has been bumped successfully.',
+
+	'UNAUTHORISED_BBCODE'		=> 'You cannot use certain BBCodes: %s.',
+	'UNGLOBALISE_EXPLAIN'		=> 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.',
+	'UPDATE_COMMENT'			=> 'Update comment',
+	'URL_INVALID'				=> 'The URL you specified is invalid.',
+	'URL_NOT_FOUND'				=> 'The file specified could not be found.',
+	'URL_IS_OFF'				=> '[url] is <em>OFF</em>',
+	'URL_IS_ON'					=> '[url] is <em>ON</em>',
+	'USER_CANNOT_BUMP'			=> 'You cannot bump topics in this forum.',
+	'USER_CANNOT_DELETE'		=> 'You cannot delete posts in this forum.',
+	'USER_CANNOT_EDIT'			=> 'You cannot edit posts in this forum.',
+	'USER_CANNOT_REPLY'			=> 'You cannot reply in this forum.',
+	'USER_CANNOT_FORUM_POST'	=> 'You are not able to do posting operations on this forum due to the forum type not supporting it.',
+
+	'VIEW_MESSAGE'				=> '%sView your submitted message%s',
+	'VIEW_PRIVATE_MESSAGE'		=> '%sView your submitted private message%s',
+
+	'WRONG_FILESIZE'			=> 'The file is too big, maximum allowed size is %1d %2s.',
+	'WRONG_SIZE'				=> 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high. The submitted image is %5$d pixels wide and %6$d pixels high.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
new file mode 100644
index 0000000000..be92391a4e
--- /dev/null
+++ b/phpBB/language/en/search.php
@@ -0,0 +1,104 @@
+<?php
+/**
+*
+* search [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ALL_AVAILABLE'			=> 'All available',
+	'ALL_RESULTS'			=> 'All results',
+
+	'DISPLAY_RESULTS'		=> 'Display results as',
+
+	'FOUND_SEARCH_MATCH'		=> 'Search found %d match',
+	'FOUND_SEARCH_MATCHES'		=> 'Search found %d matches',
+	'FOUND_MORE_SEARCH_MATCHES'	=> 'Search found more than %d matches',
+
+	'GLOBAL'				=> 'Global announcement',
+
+	'IGNORED_TERMS'			=> 'ignored',
+	'IGNORED_TERMS_EXPLAIN'	=> 'The following words in your search query were ignored because they are too common words: <strong>%s</strong>.',
+
+	'JUMP_TO_POST'			=> 'Jump to post',
+
+	'LOGIN_EXPLAIN_EGOSEARCH'	=> 'The board requires you to be registered and logged in to view your own posts.',
+	'LOGIN_EXPLAIN_UNREADSEARCH'=> 'The board requires you to be registered and logged in to view your unread posts.',
+
+	'MAX_NUM_SEARCH_KEYWORDS_REFINE'	=> 'You specified too many words to search for. Please do not enter more than %1$d words.',
+
+	'NO_KEYWORDS'			=> 'You must specify at least one word to search for. Each word must consist of at least %d characters and must not contain more than %d characters excluding wildcards.',
+	'NO_RECENT_SEARCHES'	=> 'No searches have been carried out recently.',
+	'NO_SEARCH'				=> 'Sorry but you are not permitted to use the search system.',
+	'NO_SEARCH_RESULTS'		=> 'No suitable matches were found.',
+	'NO_SEARCH_TIME'		=> 'Sorry but you cannot use search at this time. Please try again in a few minutes.',
+	'WORD_IN_NO_POST'		=> 'No posts were found because the word <strong>%s</strong> is not contained in any post.',
+	'WORDS_IN_NO_POST'		=> 'No posts were found because the words <strong>%s</strong> are not contained in any post.',
+
+	'POST_CHARACTERS'		=> 'characters of posts',
+
+	'RECENT_SEARCHES'		=> 'Recent searches',
+	'RESULT_DAYS'			=> 'Limit results to previous',
+	'RESULT_SORT'			=> 'Sort results by',
+	'RETURN_FIRST'			=> 'Return first',
+	'RETURN_TO_SEARCH_ADV'	=> 'Return to advanced search',
+
+	'SEARCHED_FOR'				=> 'Search term used',
+	'SEARCHED_TOPIC'			=> 'Searched topic',
+	'SEARCH_ALL_TERMS'			=> 'Search for all terms or use query as entered',
+	'SEARCH_ANY_TERMS'			=> 'Search for any terms',
+	'SEARCH_AUTHOR'				=> 'Search for author',
+	'SEARCH_AUTHOR_EXPLAIN'		=> 'Use * as a wildcard for partial matches.',
+	'SEARCH_FIRST_POST'			=> 'First post of topics only',
+	'SEARCH_FORUMS'				=> 'Search in forums',
+	'SEARCH_FORUMS_EXPLAIN'		=> 'Select the forum or forums you wish to search in. Subforums are searched automatically if you do not disable “search subforums“ below.',
+	'SEARCH_IN_RESULTS'			=> 'Search these results',
+	'SEARCH_KEYWORDS_EXPLAIN'	=> 'Place <strong>+</strong> in front of a word which must be found and <strong>-</strong> in front of a word which must not be found. Put a list of words separated by <strong>|</strong> into brackets if only one of the words must be found. Use * as a wildcard for partial matches.',
+	'SEARCH_MSG_ONLY'			=> 'Message text only',
+	'SEARCH_OPTIONS'			=> 'Search options',
+	'SEARCH_QUERY'				=> 'Search query',
+	'SEARCH_SUBFORUMS'			=> 'Search subforums',
+	'SEARCH_TITLE_MSG'			=> 'Post subjects and message text',
+	'SEARCH_TITLE_ONLY'			=> 'Topic titles only',
+	'SEARCH_WITHIN'				=> 'Search within',
+	'SORT_ASCENDING'			=> 'Ascending',
+	'SORT_AUTHOR'				=> 'Author',
+	'SORT_DESCENDING'			=> 'Descending',
+	'SORT_FORUM'				=> 'Forum',
+	'SORT_POST_SUBJECT'			=> 'Post subject',
+	'SORT_TIME'					=> 'Post time',
+
+	'TOO_FEW_AUTHOR_CHARS'	=> 'You must specify at least %d characters of the authors name.',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php
new file mode 100644
index 0000000000..2dfdc0df13
--- /dev/null
+++ b/phpBB/language/en/search_ignore_words.php
@@ -0,0 +1,272 @@
+<?php
+/**
+*
+* search_ignore_words [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+$words = array(
+	'a',
+	'about',
+	'after',
+	'ago',
+	'all',
+	'almost',
+	'along',
+	'alot',
+	'also',
+	'am',
+	'an',
+	'and',
+	'answer',
+	'any',
+	'anybody',
+	'anybodys',
+	'anywhere',
+	'are',
+	'arent',
+	'around',
+	'as',
+	'ask',
+	'askd',
+	'at',
+	'bad',
+	'be',
+	'because',
+	'been',
+	'before',
+	'being',
+	'best',
+	'better',
+	'between',
+	'big',
+	'btw',
+	'but',
+	'by',
+	'can',
+	'cant',
+	'come',
+	'could',
+	'couldnt',
+	'day',
+	'days',
+	'days',
+	'did',
+	'didnt',
+	'do',
+	'does',
+	'doesnt',
+	'dont',
+	'down',
+	'each',
+	'etc',
+	'either',
+	'else',
+	'even',
+	'ever',
+	'every',
+	'everybody',
+	'everybodys',
+	'everyone',
+	'far',
+	'find',
+	'for',
+	'found',
+	'from',
+	'get',
+	'go',
+	'going',
+	'gone',
+	'good',
+	'got',
+	'gotten',
+	'had',
+	'has',
+	'have',
+	'havent',
+	'having',
+	'her',
+	'here',
+	'hers',
+	'him',
+	'his',
+	'home',
+	'how',
+	'hows',
+	'href',
+	'I',
+	'Ive',
+	'if',
+	'in',
+	'ini',
+	'into',
+	'is',
+	'isnt',
+	'it',
+	'its',
+	'its',
+	'just',
+	'know',
+	'large',
+	'less',
+	'like',
+	'liked',
+	'little',
+	'looking',
+	'look',
+	'looked',
+	'looking',
+	'lot',
+	'maybe',
+	'many',
+	'me',
+	'more',
+	'most',
+	'much',
+	'must',
+	'mustnt',
+	'my',
+	'near',
+	'need',
+	'never',
+	'new',
+	'news',
+	'no',
+	'none',
+	'not',
+	'nothing',
+	'now',
+	'of',
+	'off',
+	'often',
+	'old',
+	'on',
+	'once',
+	'only',
+	'oops',
+	'or',
+	'other',
+	'our',
+	'ours',
+	'out',
+	'over',
+	'page',
+	'please',
+	'put',
+	'question',
+	'questions',
+	'questioned',
+	'quote',
+	'rather',
+	'really',
+	'recent',
+	'said',
+	'saw',
+	'say',
+	'says',
+	'she',
+	'see',
+	'sees',
+	'should',
+	'sites',
+	'small',
+	'so',
+	'some',
+	'something',
+	'sometime',
+	'somewhere',
+	'soon',
+	'take',
+	'than',
+	'true',
+	'thank',
+	'that',
+	'thatd',
+	'thats',
+	'the',
+	'their',
+	'theirs',
+	'theres',
+	'theirs',
+	'them',
+	'then',
+	'there',
+	'these',
+	'they',
+	'theyll',
+	'theyd',
+	'theyre',
+	'this',
+	'those',
+	'though',
+	'through',
+	'thus',
+	'time',
+	'times',
+	'to',
+	'too',
+	'under',
+	'until',
+	'untrue',
+	'up',
+	'upon',
+	'use',
+	'users',
+	'version',
+	'very',
+	'via',
+	'want',
+	'was',
+	'way',
+	'we',
+	'well',
+	'went',
+	'were',
+	'werent',
+	'what',
+	'when',
+	'where',
+	'which',
+	'who',
+	'whom',
+	'whose',
+	'why',
+	'wide',
+	'will',
+	'with',
+	'within',
+	'without',
+	'wont',
+	'world',
+	'worse',
+	'worst',
+	'would',
+	'wrote',
+	'www',
+	'yes',
+	'yet',
+	'you',
+	'youd',
+	'youll',
+	'your',
+	'youre',
+	'yours',
+	'AFAIK',
+	'IIRC',
+	'LOL',
+	'ROTF',
+	'ROTFLMAO',
+	'YMMV',
+);
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php
new file mode 100644
index 0000000000..b85c39e5d5
--- /dev/null
+++ b/phpBB/language/en/search_synonyms.php
@@ -0,0 +1,191 @@
+<?php
+/**
+*
+* search_synonyms [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+$synonyms = array(
+	'abcense'			=> 'absence',
+	'abridgement'		=> 'abridgment',
+	'accomodate'		=> 'accommodate',
+	'acknowledgment'	=> 'acknowledgement',
+	'airplane'			=> 'aeroplane',
+	'allright'			=> 'alright ',
+	'andy'				=> 'andrew',
+	'anemia'			=> 'anaemia',
+	'anemic'			=> 'anaemic',
+	'anesthesia'		=> 'anaesthesia',
+	'appologize'		=> 'appologise',
+	'archean'			=> 'archaean',
+	'archeology'		=> 'archaeology',
+	'archeozoic'		=> 'archaeozoic',
+	'armor'				=> 'armour',
+	'artic'				=> 'arctic',
+	'attachment'		=> 'attachement',
+	'attendence'		=> 'attendance',
+
+	'barbecue'	=> 'barbeque',
+	'behavior'	=> 'behaviour',
+	'biassed'	=> 'biased',
+	'biol'		=> 'biology',
+	'buletin'	=> 'bulletin',
+
+	'calender'	=> 'calendar',
+	'canceled'	=> 'cancelled',
+	'car'		=> 'automobile',
+	'catalog'	=> 'catalogue',
+	'cenozoic'	=> 'caenozoic',
+	'center'	=> 'centre',
+	'check'		=> 'cheque',
+	'color'		=> 'colour',
+	'comission'	=> 'commission',
+	'comittee'	=> 'committee',
+	'commitee'	=> 'committee',
+	'conceed'	=> 'concede',
+	'creating'	=> 'createing',
+	'curiculum'	=> 'curriculum',
+
+	'defense'		=> 'defence',
+	'develope'		=> 'develop',
+	'discription'	=> 'description',
+	'dulness'		=> 'dullness',
+
+	'encyclopedia'	=> 'encyclopaedia',
+	'enroll'		=> 'enrol',
+	'esthetic'		=> 'aesthetic',
+	'etiology'		=> 'aetiology',
+	'exhorbitant'	=> 'exorbitant',
+	'exhuberant'	=> 'exuberant',
+	'existance'		=> 'existence',
+
+	'favorite'		=> 'favourite',
+	'fetus'			=> 'foetus',
+	'ficticious'	=> 'fictitious',
+	'flavor'		=> 'flavour',
+	'flourescent'	=> 'fluorescent',
+	'foriegn'		=> 'foreign',
+	'fourty'		=> 'forty',
+
+	'gage'			=> 'guage',
+	'geneology'		=> 'genealogy',
+	'grammer'		=> 'grammar',
+	'gray'			=> 'grey',
+	'guerilla'		=> 'guerrilla',
+	'gynecology'	=> 'gynaecology',
+
+	'harbor'		=> 'harbour',
+	'heighth'		=> 'height',
+	'hemaglobin'	=> 'haemaglobin',
+	'hematin'		=> 'haematin',
+	'hematite'		=> 'haematite',
+	'hematology'	=> 'haematology',
+	'honor'			=> 'honour',
+
+	'innoculate'	=> 'inoculate',
+	'installment'	=> 'instalment',
+	'irrelevent'	=> 'irrelevant',
+	'irrevelant'	=> 'irrelevant',
+
+	'jeweler'	=> 'jeweller',
+	'judgement'	=> 'judgment',
+
+	'labeled'	=> 'labelled',
+	'labor'		=> 'labour',
+	'laborer'	=> 'labourer',
+	'laborers'	=> 'labourers',
+	'laboring'	=> 'labouring',
+	'licence'	=> 'license',
+	'liesure'	=> 'leisure',
+	'liquify'	=> 'liquefy',
+
+	'maintainance'	=> 'maintenance',
+	'maintenence'	=> 'maintenance',
+	'medieval'		=> 'mediaeval',
+	'meter'			=> 'metre',
+	'milage'		=> 'mileage',
+	'millipede'		=> 'millepede',
+	'miscelaneous'	=> 'miscellaneous',
+	'morgage'		=> 'mortgage',
+
+	'noticable'	=> 'noticeable',
+
+	'occurence'	=> 'occurrence',
+	'offense'	=> 'offence',
+	'ommision'	=> 'omission',
+	'ommission'	=> 'omission',
+	'optimize'	=> 'optimise',
+	'organize'	=> 'organise',
+
+	'pajamas'			=> 'pyjamas',
+	'paleography'		=> 'palaeography',
+	'paleolithic'		=> 'palaeolithic',
+	'paleontological'	=> 'palaeontological',
+	'paleontologist'	=> 'palaeontologist',
+	'paleontology'		=> 'palaeontology',
+	'paleozoic'			=> 'palaeozoic',
+	'pamplet'			=> 'pamphlet',
+	'paralell'			=> 'parallel',
+	'parl'				=> 'parliament',
+	'parlt'				=> 'parliament',
+	'pediatric'			=> 'paediatric',
+	'pediatrician'		=> 'paediatrician',
+	'pediatrics'		=> 'paediatrics',
+	'pedodontia'		=> 'paedodontia',
+	'pedodontics'		=> 'paedodontics',
+	'personel'			=> 'personnel',
+	'practise'			=> 'practice',
+	'program'			=> 'programme',
+	'psych'				=> 'psychology',
+
+	'questionaire'	=> 'questionnaire',
+
+	'rarify'		=> 'rarefy',
+	'reccomend'		=> 'recommend',
+	'recieve'		=> 'receive',
+	'resistence'	=> 'resistance',
+	'restaraunt'	=> 'restaurant',
+
+	'savior'			=> 'saviour',
+	'sep'				=> 'september',
+	'seperate'			=> 'separate',
+	'sept'				=> 'september',
+	'sieze'				=> 'seize',
+	'summarize'			=> 'summarise',
+	'summerize'			=> 'summarise',
+	'superceed'			=> 'supercede',
+	'superintendant'	=> 'superintendent',
+	'supersede'			=> 'supercede',
+	'suprise'			=> 'surprise',
+	'surprize'			=> 'surprise',
+	'synchronise'		=> 'synchronize',
+
+	'temperary'		=> 'temporary',
+	'theater'		=> 'theatre',
+	'threshhold'	=> 'threshold',
+	'transfered'	=> 'transferred',
+	'truely'		=> 'truly',
+	'truley'		=> 'truly',
+
+	'useable'	=> 'usable',
+
+	'valor'	=> 'valour',
+	'vigor'	=> 'vigour',
+	'vol'	=> 'volume',
+
+	'whack'		=> 'wack',
+	'withold'	=> 'withhold',
+
+	'yeild'	=> 'yield',
+);
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
new file mode 100644
index 0000000000..4b79a4b6ca
--- /dev/null
+++ b/phpBB/language/en/ucp.php
@@ -0,0 +1,555 @@
+<?php
+/**
+*
+* ucp [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+
+// Privacy policy and T&C
+$lang = array_merge($lang, array(
+	'TERMS_OF_USE_CONTENT'	=> 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended.<br />
+	<br />
+	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://opensource.org/licenses/gpl-license.php">General Public License</a>” (hereinafter “GPL”) and can be downloaded from <a href="http://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet based discussions, the phpBB Group are not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="http://www.phpbb.com/">http://www.phpbb.com/</a>.<br />
+	<br />
+	You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised.
+	',
+
+	'PRIVACY_POLICY'		=> 'This policy explains in detail how “%1$s” along with its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) use any information collected during any session of usage by you (hereinafter “your information”).<br />
+	<br />
+	Your information is collected via two ways. Firstly, by browsing “%1$s” will cause the phpBB software to create a number of cookies, which are small text files that are downloaded on to your computer’s web browser temporary files. The first two cookies just contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), automatically assigned to you by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s” and is used to store which topics have been read, thereby improving your user experience.<br />
+	<br />
+	We may also create cookies external to the phpBB software whilst browsing “%1$s”, though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”) and posts submitted by you after registration and whilst logged in (hereinafter “your posts”).<br />
+	<br />
+	Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid e-mail address (hereinafter “your e-mail”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password, and your e-mail address required by “%1$s” during the registration process is either mandatory or optional, at the discretion of “%1$s”. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated e-mails from the phpBB software.<br />
+	<br />
+	Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your e-mail, then the phpBB software will generate a new password to reclaim your account.<br />
+	',
+));
+
+// Common language entries
+$lang = array_merge($lang, array(
+	'ACCOUNT_ACTIVE'				=> 'Your account has now been activated. Thank you for registering.',
+	'ACCOUNT_ACTIVE_ADMIN'			=> 'The account has now been activated.',
+	'ACCOUNT_ACTIVE_PROFILE'		=> 'Your account has now been successfully reactivated.',
+	'ACCOUNT_ADDED'					=> 'Thank you for registering, your account has been created. You may now login with your username and password.',
+	'ACCOUNT_COPPA'					=> 'Your account has been created but has to be approved, please check your e-mail for details.',
+	'ACCOUNT_EMAIL_CHANGED'			=> 'Your account has been updated. However, this board requires account reactivation on e-mail changes. An activation key has been sent to the new e-mail address you provided. Please check your e-mail for further information.',
+	'ACCOUNT_EMAIL_CHANGED_ADMIN'	=> 'Your account has been updated. However, this board requires account reactivation by the administrators on e-mail changes. An e-mail has been sent to them and you will be informed when your account has been reactivated.',
+	'ACCOUNT_INACTIVE'				=> 'Your account has been created. However, this board requires account activation, an activation key has been sent to the e-mail address you provided. Please check your e-mail for further information.',
+	'ACCOUNT_INACTIVE_ADMIN'		=> 'Your account has been created. However, this board requires account activation by the administrator group. An e-mail has been sent to them and you will be informed when your account has been activated.',
+	'ACTIVATION_EMAIL_SENT'			=> 'The activation e-mail has been sent to your e-mail address.',
+	'ACTIVATION_EMAIL_SENT_ADMIN'	=> 'The activation e-mail has been sent to the administrators e-mail addresses.',
+	'ADD'							=> 'Add',
+	'ADD_BCC'						=> 'Add [BCC]',
+	'ADD_FOES'						=> 'Add new foes',
+	'ADD_FOES_EXPLAIN'				=> 'You may enter several usernames each on a different line.',
+	'ADD_FOLDER'					=> 'Add folder',
+	'ADD_FRIENDS'					=> 'Add new friends',
+	'ADD_FRIENDS_EXPLAIN'			=> 'You may enter several usernames each on a different line.',
+	'ADD_NEW_RULE'					=> 'Add new rule',
+	'ADD_RULE'						=> 'Add rule',
+	'ADD_TO'						=> 'Add [To]',
+	'ADD_USERS_UCP_EXPLAIN'			=> 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Please enter each username on a separate line.',
+	'ADMIN_EMAIL'					=> 'Administrators can e-mail me information',
+	'AGREE'							=> 'I agree to these terms',
+	'ALLOW_PM'						=> 'Allow users to send you private messages',
+	'ALLOW_PM_EXPLAIN'				=> 'Note that administrators and moderators will always be able to send you messages.',
+	'ALREADY_ACTIVATED'				=> 'You have already activated your account.',
+	'ATTACHMENTS_EXPLAIN'			=> 'This is a list of attachments you have made in posts to this board.',
+	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
+	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
+	'AVATAR_CATEGORY'				=> 'Category',
+	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$.2f KiB.',
+	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
+	'AVATAR_GALLERY'				=> 'Local gallery',
+	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',
+	'AVATAR_NOT_ALLOWED'			=> 'Your avatar cannot be displayed because avatars have been disallowed.',
+	'AVATAR_PAGE'					=> 'Page',
+	'AVATAR_TYPE_NOT_ALLOWED'		=> 'Your current avatar cannot be displayed because its type has been disallowed.',
+
+	'BACK_TO_DRAFTS'			=> 'Back to saved drafts',
+	'BACK_TO_LOGIN'				=> 'Back to login screen',
+	'BIRTHDAY'					=> 'Birthday',
+	'BIRTHDAY_EXPLAIN'			=> 'Setting a year will list your age when it is your birthday.',
+	'BOARD_DATE_FORMAT'			=> 'My date format',
+	'BOARD_DATE_FORMAT_EXPLAIN'	=> 'The syntax used is identical to the PHP <a href="http://www.php.net/date">date()</a> function.',
+	'BOARD_DST'					=> 'Summer Time/<abbr title="Daylight Saving Time">DST</abbr> is in effect',
+	'BOARD_LANGUAGE'			=> 'My language',
+	'BOARD_STYLE'				=> 'My board style',
+	'BOARD_TIMEZONE'			=> 'My timezone',
+	'BOOKMARKS'					=> 'Bookmarks',
+	'BOOKMARKS_EXPLAIN'			=> 'You can bookmark topics for future reference. Select the checkbox for any bookmark you wish to delete, then press the <em>Remove marked bookmarks</em> button.',
+	'BOOKMARKS_DISABLED'		=> 'Bookmarks are disabled on this board.',
+	'BOOKMARKS_REMOVED'			=> 'Bookmarks removed successfully.',
+
+	'CANNOT_EDIT_MESSAGE_TIME'	=> 'You can no longer edit or delete that message.',
+	'CANNOT_MOVE_TO_SAME_FOLDER'=> 'Messages cannot be moved to the folder you want to remove.',
+	'CANNOT_MOVE_FROM_SPECIAL'	=> 'Messages cannot be moved from the outbox.',
+	'CANNOT_RENAME_FOLDER'		=> 'This folder cannot be renamed.',
+	'CANNOT_REMOVE_FOLDER'		=> 'This folder cannot be removed.',
+	'CHANGE_DEFAULT_GROUP'		=> 'Change default group',
+	'CHANGE_PASSWORD'			=> 'Change password',
+	'CLICK_RETURN_FOLDER'		=> '%1$sReturn to your “%3$s” folder%2$s',
+	'CONFIRMATION'				=> 'Confirmation of registration',
+	'CONFIRM_CHANGES'			=> 'Confirm changes',
+	'CONFIRM_EMAIL'				=> 'Confirm e-mail address',
+	'CONFIRM_EMAIL_EXPLAIN'		=> 'You only need to specify this if you are changing your e-mail address.',
+	'CONFIRM_EXPLAIN'			=> 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
+	'VC_REFRESH'				=> 'Refresh confirmation code',
+	'VC_REFRESH_EXPLAIN'		=> 'If you cannot read the code you can request a new one by clicking the button.',
+
+	'CONFIRM_PASSWORD'			=> 'Confirm password',
+	'CONFIRM_PASSWORD_EXPLAIN'	=> 'You only need to confirm your password if you changed it above.',
+	'COPPA_BIRTHDAY'			=> 'To continue with the registration procedure please tell us when you were born.',
+	'COPPA_COMPLIANCE'			=> 'COPPA compliance',
+	'COPPA_EXPLAIN'				=> 'Please note that clicking submit will create your account. However it cannot be activated until a parent or guardian approves your registration. You will be emailed a copy of the necessary form with details of where to send it.',
+	'CREATE_FOLDER'				=> 'Add folder…',
+	'CURRENT_IMAGE'				=> 'Current image',
+	'CURRENT_PASSWORD'			=> 'Current password',
+	'CURRENT_PASSWORD_EXPLAIN'	=> 'You must confirm your current password if you wish to change it, alter your e-mail address or username.',
+	'CUR_PASSWORD_ERROR'		=> 'The current password you entered is incorrect.',
+	'CUSTOM_DATEFORMAT'			=> 'Custom…',
+
+	'DEFAULT_ACTION'			=> 'Default action',
+	'DEFAULT_ACTION_EXPLAIN'	=> 'This action will be triggered if none of the above is applicable.',
+	'DEFAULT_ADD_SIG'			=> 'Attach my signature by default',
+	'DEFAULT_BBCODE'			=> 'Enable BBCode by default',
+	'DEFAULT_NOTIFY'			=> 'Notify me upon replies by default',
+	'DEFAULT_SMILIES'			=> 'Enable smilies by default',
+	'DEFINED_RULES'				=> 'Defined rules',
+	'DELETED_TOPIC'				=> 'Topic has been removed.',
+	'DELETE_ATTACHMENT'			=> 'Delete attachment',
+	'DELETE_ATTACHMENTS'		=> 'Delete attachments',
+	'DELETE_ATTACHMENT_CONFIRM'	=> 'Are you sure you want to delete this attachment?',
+	'DELETE_ATTACHMENTS_CONFIRM'=> 'Are you sure you want to delete these attachments?',
+	'DELETE_AVATAR'				=> 'Delete image',
+	'DELETE_COOKIES_CONFIRM'	=> 'Are you sure you want to delete all cookies set by this board?',
+	'DELETE_MARKED_PM'			=> 'Delete marked messages',
+	'DELETE_MARKED_PM_CONFIRM'	=> 'Are you sure you want to delete all marked messages?',
+	'DELETE_OLDEST_MESSAGES'	=> 'Delete oldest messages',
+	'DELETE_MESSAGE'			=> 'Delete message',
+	'DELETE_MESSAGE_CONFIRM'	=> 'Are you sure you want to delete this private message?',
+	'DELETE_MESSAGES_IN_FOLDER'	=> 'Delete all messages within removed folder',
+	'DELETE_RULE'				=> 'Delete rule',
+	'DELETE_RULE_CONFIRM'		=> 'Are you sure you want to delete this rule?',
+	'DEMOTE_SELECTED'			=> 'Demote selected',
+	'DISABLE_CENSORS'			=> 'Enable word censoring',
+	'DISPLAY_GALLERY'			=> 'Display gallery',
+	'DOMAIN_NO_MX_RECORD_EMAIL'	=> 'The entered e-mail domain has no valid MX record.',
+	'DOWNLOADS'					=> 'Downloads',
+	'DRAFTS_DELETED'			=> 'All selected drafts were successfully deleted.',
+	'DRAFTS_EXPLAIN'			=> 'Here you can view, edit and delete your saved drafts.',
+	'DRAFT_UPDATED'				=> 'Draft successfully updated.',
+
+	'EDIT_DRAFT_EXPLAIN'		=> 'Here you are able to edit your draft. Drafts do not contain attachment and poll information.',
+	'EMAIL_BANNED_EMAIL'		=> 'The e-mail address you entered is not allowed to be used.',
+	'EMAIL_INVALID_EMAIL'		=> 'The e-mail address you entered is invalid.',
+	'EMAIL_REMIND'				=> 'This must be the e-mail address associated with your account. If you have not changed this via your user control panel then it is the e-mail address you registered your account with.',
+	'EMAIL_TAKEN_EMAIL'			=> 'The entered e-mail address is already in use.',
+	'EMPTY_DRAFT'				=> 'You must enter a message to submit your changes.',
+	'EMPTY_DRAFT_TITLE'			=> 'You must enter a draft title.',
+	'EXPORT_AS_XML'				=> 'Export as XML',
+	'EXPORT_AS_CSV'				=> 'Export as CSV',
+	'EXPORT_AS_CSV_EXCEL'		=> 'Export as CSV (Excel)',
+	'EXPORT_AS_TXT'				=> 'Export as TXT',
+	'EXPORT_AS_MSG'				=> 'Export as MSG',
+	'EXPORT_FOLDER'				=> 'Export this view',
+
+	'FIELD_REQUIRED'					=> 'The field “%s” must be completed.',
+	'FIELD_TOO_SHORT'					=> 'The field “%1$s” is too short, a minimum of %2$d characters is required.',
+	'FIELD_TOO_LONG'					=> 'The field “%1$s” is too long, a maximum of %2$d characters is allowed.',
+	'FIELD_TOO_SMALL'					=> 'The value of “%1$s” is too small, a minimum value of %2$d is required.',
+	'FIELD_TOO_LARGE'					=> 'The value of “%1$s” is too large, a maximum value of %2$d is allowed.',
+	'FIELD_INVALID_CHARS_NUMBERS_ONLY'	=> 'The field “%s” has invalid characters, only numbers are allowed.',
+	'FIELD_INVALID_CHARS_ALPHA_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric characters are allowed.',
+	'FIELD_INVALID_CHARS_SPACERS_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
+	'FIELD_INVALID_DATE'				=> 'The field “%s” has an invalid date.',
+
+	'FOE_MESSAGE'				=> 'Message from foe',
+	'FOES_EXPLAIN'				=> 'Foes are users which will be ignored by default. Posts by these users will not be fully visible. Personal messages from foes are still permitted. Please note that you cannot ignore moderators or administrators.',
+	'FOES_UPDATED'				=> 'Your foes list has been updated successfully.',
+	'FOLDER_ADDED'				=> 'Folder successfully added.',
+	'FOLDER_MESSAGE_STATUS'		=> '%1$d from %2$d messages stored',
+	'FOLDER_NAME_EMPTY'			=> 'You must enter a name for this folder.',
+	'FOLDER_NAME_EXIST'			=> 'Folder <strong>%s</strong> already exists.',
+	'FOLDER_OPTIONS'			=> 'Folder options',
+	'FOLDER_RENAMED'			=> 'Folder successfully renamed.',
+	'FOLDER_REMOVED'			=> 'Folder successfully removed.',
+	'FOLDER_STATUS_MSG'			=> 'Folder is %1$d%% full (%2$d from %3$d messages stored)',
+	'FORWARD_PM'				=> 'Forward PM',
+	'FORCE_PASSWORD_EXPLAIN'	=> 'Before you may continue browsing the board you are required to change your password.',
+	'FRIEND_MESSAGE'			=> 'Message from friend',
+	'FRIENDS'					=> 'Friends',
+	'FRIENDS_EXPLAIN'			=> 'Friends enable you quick access to members you communicate with frequently. If the template has relevant support any posts made by a friend may be highlighted.',
+	'FRIENDS_OFFLINE'			=> 'Offline',
+	'FRIENDS_ONLINE'			=> 'Online',
+	'FRIENDS_UPDATED'			=> 'Your friends list has been updated successfully.',
+	'FULL_FOLDER_OPTION_CHANGED'=> 'The action to take when a folder is full has been changed successfully.',
+	'FWD_ORIGINAL_MESSAGE'		=> '-------- Original Message --------',
+	'FWD_SUBJECT'				=> 'Subject: %s',
+	'FWD_DATE'					=> 'Date: %s',
+	'FWD_FROM'					=> 'From: %s',
+	'FWD_TO'					=> 'To: %s',
+
+	'GLOBAL_ANNOUNCEMENT'		=> 'Global announcement',
+
+	'HIDE_ONLINE'				=> 'Hide my online status',
+	'HIDE_ONLINE_EXPLAIN'		=> 'Changing this setting won’t become effective until your next visit to the board.',
+	'HOLD_NEW_MESSAGES'			=> 'Do not accept new messages (New messages will be held back until enough space is available)',
+	'HOLD_NEW_MESSAGES_SHORT'	=> 'New messages will be held back',
+
+	'IF_FOLDER_FULL'			=> 'If folder is full',
+	'IMPORTANT_NEWS'			=> 'Important announcements',
+	'INVALID_USER_BIRTHDAY'			=> 'The entered birthday is not a valid date.',
+	'INVALID_CHARS_USERNAME'	=> 'The username contains forbidden characters.',
+	'INVALID_CHARS_NEW_PASSWORD'=> 'The password does not contain the required characters.',
+	'ITEMS_REQUIRED'			=> 'The items marked with * are required profile fields and need to be filled out.',
+
+	'JOIN_SELECTED'				=> 'Join selected',
+
+	'LANGUAGE'					=> 'Language',
+	'LINK_REMOTE_AVATAR'		=> 'Link off-site',
+	'LINK_REMOTE_AVATAR_EXPLAIN'=> 'Enter the URL of the location containing the avatar image you wish to link to.',
+	'LINK_REMOTE_SIZE'			=> 'Avatar dimensions',
+	'LINK_REMOTE_SIZE_EXPLAIN'	=> 'Specify the width and height of the avatar, leave blank to attempt automatic verification.',
+	'LOGIN_EXPLAIN_UCP'			=> 'Please login in order to access the User Control Panel.',
+	'LOGIN_REDIRECT'			=> 'You have been successfully logged in.',
+	'LOGOUT_FAILED'				=> 'You were not logged out, as the request did not match your session. Please contact the board administrator if you continue to experience problems.',
+	'LOGOUT_REDIRECT'			=> 'You have been successfully logged out.',
+
+	'MARK_IMPORTANT'				=> 'Mark/Unmark as important',
+	'MARKED_MESSAGE'				=> 'Marked message',
+	'MAX_FOLDER_REACHED'			=> 'Maximum number of allowed user defined folders reached.',
+	'MESSAGE_BY_AUTHOR'				=> 'by',
+	'MESSAGE_COLOURS'				=> 'Message colours',
+	'MESSAGE_DELETED'				=> 'Message successfully deleted.',
+	'MESSAGE_HISTORY'				=> 'Message history',
+	'MESSAGE_REMOVED_FROM_OUTBOX'	=> 'This message has been removed by its author before it was delivered.',
+	'MESSAGE_SENT_ON'				=> 'on',
+	'MESSAGE_STORED'				=> 'This message has been sent successfully.',
+	'MESSAGE_TO'					=> 'To',
+	'MESSAGES_DELETED'				=> 'Messages successfully deleted',
+	'MOVE_DELETED_MESSAGES_TO'		=> 'Move messages from removed folder to',
+	'MOVE_DOWN'						=> 'Move down',
+	'MOVE_MARKED_TO_FOLDER'			=> 'Move marked to %s',
+	'MOVE_PM_ERROR'					=> 'An error occurred while moving the messages to the new folder, only %1d from %2d messages were moved.',
+	'MOVE_TO_FOLDER'				=> 'Move to folder',
+	'MOVE_UP'						=> 'Move up',
+
+	'NEW_EMAIL_ERROR'				=> 'The e-mail addresses you entered do not match.',
+	'NEW_FOLDER_NAME'				=> 'New folder name',
+	'NEW_PASSWORD'					=> 'New password',
+	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
+	'NOTIFY_METHOD'					=> 'Notification method',
+	'NOTIFY_METHOD_BOTH'			=> 'Both',
+	'NOTIFY_METHOD_EMAIL'			=> 'E-mail only',
+	'NOTIFY_METHOD_EXPLAIN'			=> 'Method for sending messages sent via this board.',
+	'NOTIFY_METHOD_IM'				=> 'Jabber only',
+	'NOTIFY_ON_PM'					=> 'Notify me on new private messages',
+	'NOT_ADDED_FRIENDS_ANONYMOUS'	=> 'You cannot add the anonymous user to your friends list.',
+	'NOT_ADDED_FRIENDS_BOTS'		=> 'You cannot add bots to your friends list.',
+	'NOT_ADDED_FRIENDS_FOES'		=> 'You cannot add users to your friends list who are on your foes list.',
+	'NOT_ADDED_FRIENDS_SELF'		=> 'You cannot add yourself to the friends list.',
+	'NOT_ADDED_FOES_MOD_ADMIN'		=> 'You cannot add administrators and moderators to your foes list.',
+	'NOT_ADDED_FOES_ANONYMOUS'		=> 'You cannot add the anonymous user to your foes list.',
+	'NOT_ADDED_FOES_BOTS'			=> 'You cannot add bots to your foes list.',
+	'NOT_ADDED_FOES_FRIENDS'		=> 'You cannot add users to your foes list who are on your friends list.',
+	'NOT_ADDED_FOES_SELF'			=> 'You cannot add yourself to the foes list.',
+	'NOT_AGREE'						=> 'I do not agree to these terms',
+	'NOT_ENOUGH_SPACE_FOLDER'		=> 'The destination folder “%s” seems to be full. The requested action has not been taken.',
+	'NOT_MOVED_MESSAGE'				=> 'You have 1 private message currently on hold because of full folder.',
+	'NOT_MOVED_MESSAGES'			=> 'You have %d private messages currently on hold because of full folder.',
+	'NO_ACTION_MODE'				=> 'No message action specified.',
+	'NO_AUTHOR'						=> 'No author defined for this message',
+	'NO_AVATAR_CATEGORY'			=> 'None',
+
+	'NO_AUTH_DELETE_MESSAGE'		=> 'You are not authorised to delete private messages.',
+	'NO_AUTH_EDIT_MESSAGE'			=> 'You are not authorised to edit private messages.',
+	'NO_AUTH_FORWARD_MESSAGE'		=> 'You are not authorised to forward private messages.',
+	'NO_AUTH_GROUP_MESSAGE'			=> 'You are not authorised to send private messages to groups.',
+	'NO_AUTH_PASSWORD_REMINDER'		=> 'You are not authorised to request a new password.',
+	'NO_AUTH_READ_HOLD_MESSAGE'		=> 'You are not authorised to read private messages that are on hold.',
+	'NO_AUTH_READ_MESSAGE'			=> 'You are not authorised to read private messages.',
+	'NO_AUTH_READ_REMOVED_MESSAGE'	=> 'You are not able to read this message because it was removed by the author.',
+	'NO_AUTH_SEND_MESSAGE'			=> 'You are not authorised to send private messages.',
+	'NO_AUTH_SIGNATURE'				=> 'You are not authorised to define a signature.',
+
+	'NO_BCC_RECIPIENT'			=> 'None',
+	'NO_BOOKMARKS'				=> 'You have no bookmarks.',
+	'NO_BOOKMARKS_SELECTED'		=> 'You have selected no bookmarks.',
+	'NO_EDIT_READ_MESSAGE'		=> 'Private message cannot be edited because it has already been read.',
+	'NO_EMAIL_USER'				=> 'The e-mail/username information submitted could not be found.',
+	'NO_FOES'					=> 'No foes currently defined',
+	'NO_FRIENDS'				=> 'No friends currently defined',
+	'NO_FRIENDS_OFFLINE'		=> 'No friends offline',
+	'NO_FRIENDS_ONLINE'			=> 'No friends online',
+	'NO_GROUP_SELECTED'			=> 'No group specified.',
+	'NO_IMPORTANT_NEWS'			=> 'No important announcements present.',
+	'NO_MESSAGE'				=> 'Private message could not be found.',
+	'NO_NEW_FOLDER_NAME'		=> 'You have to specify a new folder name.',
+	'NO_NEWER_PM'				=> 'No newer messages.',
+	'NO_OLDER_PM'				=> 'No older messages.',
+	'NO_PASSWORD_SUPPLIED'		=> 'You cannot login without a password.',
+	'NO_RECIPIENT'				=> 'No recipient defined.',
+	'NO_RULES_DEFINED'			=> 'No rules defined.',
+	'NO_SAVED_DRAFTS'			=> 'No drafts saved.',
+	'NO_TO_RECIPIENT'			=> 'None',
+	'NO_WATCHED_FORUMS'			=> 'You are not subscribed to any forums.',
+	'NO_WATCHED_SELECTED'		=> 'You have not selected any subscribed topics or forums.',
+	'NO_WATCHED_TOPICS'			=> 'You are not subscribed to any topics.',
+
+	'PASS_TYPE_ALPHA_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case and must contain numbers.',
+	'PASS_TYPE_ANY_EXPLAIN'		=> 'Must be between %1$d and %2$d characters.',
+	'PASS_TYPE_CASE_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long and must contain letters in mixed case.',
+	'PASS_TYPE_SYMBOL_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case, must contain numbers and must contain symbols.',
+	'PASSWORD'					=> 'Password',
+	'PASSWORD_ACTIVATED'		=> 'Your new password has been activated.',
+	'PASSWORD_UPDATED'			=> 'A new password was sent to your registered e-mail address.',
+	'PERMISSIONS_RESTORED'		=> 'Successfully restored original permissions.',
+	'PERMISSIONS_TRANSFERRED'	=> 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
+	'PM_DISABLED'				=> 'Private messaging has been disabled on this board.',
+	'PM_FROM'					=> 'From',
+	'PM_FROM_REMOVED_AUTHOR'	=> 'This message was sent by a user no longer registered.',
+	'PM_ICON'					=> 'PM icon',
+	'PM_INBOX'					=> 'Inbox',
+	'PM_NO_USERS'				=> 'The requested users to be added do not exist.',
+	'PM_OUTBOX'					=> 'Outbox',
+	'PM_SENTBOX'				=> 'Sent messages',
+	'PM_SUBJECT'				=> 'Message subject',
+	'PM_TO'						=> 'Send to',
+	'PM_USERS_REMOVED_NO_PM'	=> 'Some users couldn’t be added as they have disabled private message receipt.',
+	'POPUP_ON_PM'				=> 'Pop up window on new private message',
+	'POST_EDIT_PM'				=> 'Edit message',
+	'POST_FORWARD_PM'			=> 'Forward message',
+	'POST_NEW_PM'				=> 'Compose message',
+	'POST_PM_LOCKED'			=> 'Private messaging is locked.',
+	'POST_PM_POST'				=> 'Quote post',
+	'POST_QUOTE_PM'				=> 'Quote message',
+	'POST_REPLY_PM'				=> 'Reply to message',
+	'PRINT_PM'					=> 'Print view',
+	'PREFERENCES_UPDATED'		=> 'Your preferences have been updated.',
+	'PROFILE_INFO_NOTICE'		=> 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
+	'PROFILE_UPDATED'			=> 'Your profile has been updated.',
+
+	'RECIPIENT'							=> 'Recipient',
+	'RECIPIENTS'						=> 'Recipients',
+	'REGISTRATION'						=> 'Registration',
+	'RELEASE_MESSAGES'					=> '%sRelease all on-hold messages%s… they will be re-sorted into the appropriate folder if enough space is made available.',
+	'REMOVE_ADDRESS'					=> 'Remove address',
+	'REMOVE_SELECTED_BOOKMARKS'			=> 'Remove selected bookmarks',
+	'REMOVE_SELECTED_BOOKMARKS_CONFIRM'	=> 'Are you sure you want to delete all selected bookmarks?',
+	'REMOVE_BOOKMARK_MARKED'			=> 'Remove marked bookmarks',
+	'REMOVE_FOLDER'						=> 'Remove folder',
+	'REMOVE_FOLDER_CONFIRM'				=> 'Are you sure you want to remove this folder?',
+	'RENAME'							=> 'Rename',
+	'RENAME_FOLDER'						=> 'Rename folder',
+	'REPLIED_MESSAGE'					=> 'Replied to message',
+	'REPLY_TO_ALL'						=> 'Reply to sender and all recipients.',
+	'REPORT_PM'							=> 'Report private message',
+	'RESIGN_SELECTED'					=> 'Resign selected',
+	'RETURN_FOLDER'						=> '%1$sReturn to previous folder%2$s',
+	'RETURN_UCP'						=> '%sReturn to the User Control Panel%s',
+	'RULE_ADDED'						=> 'Rule successfully added.',
+	'RULE_ALREADY_DEFINED'				=> 'This rule was defined previously.',
+	'RULE_DELETED'						=> 'Rule successfully removed.',
+	'RULE_NOT_DEFINED'					=> 'Rule not correctly specified.',
+	'RULE_REMOVED_MESSAGE'				=> 'One private message had been removed due to private message filters.',
+	'RULE_REMOVED_MESSAGES'				=> '%d private messages were removed due to private message filters.',
+
+	'SAME_PASSWORD_ERROR'		=> 'The new password you entered is the same as your current password.',
+	'SEARCH_YOUR_POSTS'			=> 'Show your posts',
+	'SEND_PASSWORD'				=> 'Send password',
+	'SENT_AT'					=> 'Sent',			// Used before dates in private messages
+	'SHOW_EMAIL'				=> 'Users can contact me by e-mail',
+	'SIGNATURE_EXPLAIN'			=> 'This is a block of text that can be added to posts you make. There is a %d character limit.',
+	'SIGNATURE_PREVIEW'			=> 'Your signature will appear like this in posts',
+	'SIGNATURE_TOO_LONG'		=> 'Your signature is too long.',
+	'SORT'						=> 'Sort',
+	'SORT_COMMENT'				=> 'File comment',
+	'SORT_DOWNLOADS'			=> 'Downloads',
+	'SORT_EXTENSION'			=> 'Extension',
+	'SORT_FILENAME'				=> 'Filename',
+	'SORT_POST_TIME'			=> 'Post time',
+	'SORT_SIZE'					=> 'File size',
+
+	'TIMEZONE'					=> 'Timezone',
+	'TO'						=> 'To',
+	'TOO_MANY_RECIPIENTS'		=> 'You tried to send a private message to too many recipients.',
+	'TOO_MANY_REGISTERS'		=> 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',
+
+	'UCP'						=> 'User Control Panel',
+	'UCP_ACTIVATE'				=> 'Activate account',
+	'UCP_ADMIN_ACTIVATE'		=> 'Please note that you will need to enter a valid e-mail address before your account is activated. The administrator will review your account and if approved you will receive an e-mail at the address you specified.',
+	'UCP_AIM'					=> 'AOL Instant Messenger',
+	'UCP_ATTACHMENTS'			=> 'Attachments',
+	'UCP_COPPA_BEFORE'			=> 'Before %s',
+	'UCP_COPPA_ON_AFTER'		=> 'On or after %s',
+	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid e-mail address before your account is activated. You will receive an e-mail at the address you provide that contains an account activation link.',
+	'UCP_ICQ'					=> 'ICQ number',
+	'UCP_JABBER'				=> 'Jabber address',
+
+	'UCP_MAIN'					=> 'Overview',
+	'UCP_MAIN_ATTACHMENTS'		=> 'Manage attachments',
+	'UCP_MAIN_BOOKMARKS'		=> 'Manage bookmarks',
+	'UCP_MAIN_DRAFTS'			=> 'Manage drafts',
+	'UCP_MAIN_FRONT'			=> 'Front page',
+	'UCP_MAIN_SUBSCRIBED'		=> 'Manage subscriptions',
+
+	'UCP_MSNM'					=> 'WL/MSN Messenger',
+	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
+
+	'UCP_PREFS'					=> 'Board preferences',
+	'UCP_PREFS_PERSONAL'		=> 'Edit global settings',
+	'UCP_PREFS_POST'			=> 'Edit posting defaults',
+	'UCP_PREFS_VIEW'			=> 'Edit display options',
+
+	'UCP_PM'					=> 'Private messages',
+	'UCP_PM_COMPOSE'			=> 'Compose message',
+	'UCP_PM_DRAFTS'				=> 'Manage PM drafts',
+	'UCP_PM_OPTIONS'			=> 'Rules, folders &amp; settings',
+	'UCP_PM_POPUP'				=> 'Private messages',
+	'UCP_PM_POPUP_TITLE'		=> 'Private message popup',
+	'UCP_PM_UNREAD'				=> 'Unread messages',
+	'UCP_PM_VIEW'				=> 'View messages',
+
+	'UCP_PROFILE'				=> 'Profile',
+	'UCP_PROFILE_AVATAR'		=> 'Edit avatar',
+	'UCP_PROFILE_PROFILE_INFO'	=> 'Edit profile',
+	'UCP_PROFILE_REG_DETAILS'	=> 'Edit account settings',
+	'UCP_PROFILE_SIGNATURE'		=> 'Edit signature',
+
+	'UCP_USERGROUPS'			=> 'Usergroups',
+	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
+	'UCP_USERGROUPS_MANAGE'		=> 'Manage groups',
+
+	'UCP_REGISTER_DISABLE'			=> 'Creating a new account is currently not possible.',
+	'UCP_REMIND'					=> 'Send password',
+	'UCP_RESEND'					=> 'Send activation e-mail',
+	'UCP_WELCOME'					=> 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',
+	'UCP_YIM'						=> 'Yahoo Messenger',
+	'UCP_ZEBRA'						=> 'Friends &amp; Foes',
+	'UCP_ZEBRA_FOES'				=> 'Manage foes',
+	'UCP_ZEBRA_FRIENDS'				=> 'Manage friends',
+	'UNKNOWN_FOLDER'				=> 'Unknown folder',
+	'UNWATCH_MARKED'				=> 'Unwatch marked',
+	'UPLOAD_AVATAR_FILE'			=> 'Upload from your machine',
+	'UPLOAD_AVATAR_URL'				=> 'Upload from a URL',
+	'UPLOAD_AVATAR_URL_EXPLAIN'		=> 'Enter the URL of the location containing the image. The image will be copied to this site.',
+	'USERNAME_ALPHA_ONLY_EXPLAIN'	=> 'Username must be between %1$d and %2$d chars long and use only alphanumeric characters.',
+	'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.',
+	'USERNAME_ASCII_EXPLAIN'		=> 'Username must be between %1$d and %2$d chars long and use only ASCII characters, so no special symbols.',
+	'USERNAME_LETTER_NUM_EXPLAIN'	=> 'Username must be between %1$d and %2$d chars long and use only letter or number characters.',
+	'USERNAME_LETTER_NUM_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use letter, number, space or -+_[] characters.',
+	'USERNAME_CHARS_ANY_EXPLAIN'	=> 'Length must be between %1$d and %2$d characters.',
+	'USERNAME_TAKEN_USERNAME'		=> 'The username you entered is already in use, please select an alternative.',
+	'USERNAME_DISALLOWED_USERNAME'	=> 'The username you entered has been disallowed or contains a disallowed word. Please choose a different name.',
+	'USER_NOT_FOUND_OR_INACTIVE'	=> 'The usernames you specified could either not be found or are not activated users.',
+
+	'VIEW_AVATARS'				=> 'Display avatars',
+	'VIEW_EDIT'					=> 'View/Edit',
+	'VIEW_FLASH'				=> 'Display Flash animations',
+	'VIEW_IMAGES'				=> 'Display images within posts',
+	'VIEW_NEXT_HISTORY'			=> 'Next PM in history',
+	'VIEW_NEXT_PM'				=> 'Next PM',
+	'VIEW_PM'					=> 'View message',
+	'VIEW_PM_INFO'				=> 'Message details',
+	'VIEW_PM_MESSAGE'			=> '1 message',
+	'VIEW_PM_MESSAGES'			=> '%d messages',
+	'VIEW_PREVIOUS_HISTORY'		=> 'Previous PM in history',
+	'VIEW_PREVIOUS_PM'			=> 'Previous PM',
+	'VIEW_SIGS'					=> 'Display signatures',
+	'VIEW_SMILIES'				=> 'Display smilies as images',
+	'VIEW_TOPICS_DAYS'			=> 'Display topics from previous days',
+	'VIEW_TOPICS_DIR'			=> 'Display topic order direction',
+	'VIEW_TOPICS_KEY'			=> 'Display topics ordering by',
+	'VIEW_POSTS_DAYS'			=> 'Display posts from previous days',
+	'VIEW_POSTS_DIR'			=> 'Display post order direction',
+	'VIEW_POSTS_KEY'			=> 'Display posts ordering by',
+
+	'WATCHED_EXPLAIN'			=> 'Below is a list of forums and topics you are subscribed to. You will be notified of new posts in either. To unsubscribe mark the forum or topic and then press the <em>Unwatch marked</em> button.',
+	'WATCHED_FORUMS'			=> 'Watched forums',
+	'WATCHED_TOPICS'			=> 'Watched topics',
+	'WRONG_ACTIVATION'			=> 'The activation key you supplied does not match any in the database.',
+
+	'YOUR_DETAILS'				=> 'Your activity',
+	'YOUR_FOES'					=> 'Your foes',
+	'YOUR_FOES_EXPLAIN'			=> 'To remove usernames select them and click submit.',
+	'YOUR_FRIENDS'				=> 'Your friends',
+	'YOUR_FRIENDS_EXPLAIN'		=> 'To remove usernames select them and click submit.',
+	'YOUR_WARNINGS'				=> 'Your warning level',
+
+	'PM_ACTION' => array(
+		'PLACE_INTO_FOLDER'	=> 'Place into folder',
+		'MARK_AS_READ'		=> 'Mark as read',
+		'MARK_AS_IMPORTANT'	=> 'Mark message',
+		'DELETE_MESSAGE'	=> 'Delete message'
+	),
+	'PM_CHECK' => array(
+		'SUBJECT'	=> 'Subject',
+		'SENDER'	=> 'Sender',
+		'MESSAGE'	=> 'Message',
+		'STATUS'	=> 'Message status',
+		'TO'		=> 'Sent To'
+	),
+	'PM_RULE' => array(
+		'IS_LIKE'		=> 'is like',
+		'IS_NOT_LIKE'	=> 'is not like',
+		'IS'			=> 'is',
+		'IS_NOT'		=> 'is not',
+		'BEGINS_WITH'	=> 'begins with',
+		'ENDS_WITH'		=> 'ends with',
+		'IS_FRIEND'		=> 'is friend',
+		'IS_FOE'		=> 'is foe',
+		'IS_USER'		=> 'is user',
+		'IS_GROUP'		=> 'is in usergroup',
+		'ANSWERED'		=> 'answered',
+		'FORWARDED'		=> 'forwarded',
+		'TO_GROUP'		=> 'to my default usergroup',
+		'TO_ME'			=> 'to me'
+	),
+
+
+	'GROUPS_EXPLAIN'	=> 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you additional permissions to view content or increase your capabilities in other areas.',
+	'GROUP_LEADER'		=> 'Leaderships',
+	'GROUP_MEMBER'		=> 'Memberships',
+	'GROUP_PENDING'		=> 'Pending memberships',
+	'GROUP_NONMEMBER'	=> 'Non-memberships',
+	'GROUP_DETAILS'		=> 'Group details',
+
+	'NO_LEADER'		=> 'No group leaderships',
+	'NO_MEMBER'		=> 'No group memberships',
+	'NO_PENDING'	=> 'No pending memberships',
+	'NO_NONMEMBER'	=> 'No non-member groups',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
new file mode 100644
index 0000000000..546f91587d
--- /dev/null
+++ b/phpBB/language/en/viewforum.php
@@ -0,0 +1,66 @@
+<?php
+/**
+*
+* viewforum [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ACTIVE_TOPICS'			=> 'Active topics',
+	'ANNOUNCEMENTS'			=> 'Announcements',
+
+	'FORUM_PERMISSIONS'		=> 'Forum permissions',
+
+	'ICON_ANNOUNCEMENT'		=> 'Announcement',
+	'ICON_STICKY'			=> 'Sticky',
+
+	'LOGIN_NOTIFY_FORUM'	=> 'You have been notified about this forum, please login to view it.',
+
+	'MARK_TOPICS_READ'		=> 'Mark topics read',
+
+	'NEW_POSTS_HOT'			=> 'New posts [ Popular ]',
+	'NEW_POSTS_LOCKED'		=> 'New posts [ Locked ]',
+	'NO_NEW_POSTS_HOT'		=> 'No new posts [ Popular ]',
+	'NO_NEW_POSTS_LOCKED'	=> 'No new posts [ Locked ]',
+	'NO_READ_ACCESS'		=> 'You do not have the required permissions to read topics within this forum.',
+
+	'POST_FORUM_LOCKED'		=> 'Forum is locked',
+
+	'TOPICS_MARKED'			=> 'The topics for this forum have now been marked read.',
+
+	'VIEW_FORUM'			=> 'View forum',
+	'VIEW_FORUM_TOPIC'		=> '1 topic',
+	'VIEW_FORUM_TOPICS'		=> '%d topics',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
new file mode 100644
index 0000000000..3e1874f1ab
--- /dev/null
+++ b/phpBB/language/en/viewtopic.php
@@ -0,0 +1,117 @@
+<?php
+/**
+*
+* viewtopic [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 (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'ATTACHMENT'						=> 'Attachment',
+	'ATTACHMENT_FUNCTIONALITY_DISABLED'	=> 'The attachments feature has been disabled.',
+
+	'BOOKMARK_ADDED'		=> 'Bookmarked topic successfully.',
+	'BOOKMARK_ERR'			=> 'Bookmarking the topic failed. Please try again.',
+	'BOOKMARK_REMOVED'		=> 'Removed bookmarked topic successfully.',
+	'BOOKMARK_TOPIC'		=> 'Bookmark topic',
+	'BOOKMARK_TOPIC_REMOVE'	=> 'Remove from bookmarks',
+	'BUMPED_BY'				=> 'Last bumped by %1$s on %2$s.',
+	'BUMP_TOPIC'			=> 'Bump topic',
+
+	'CODE'					=> 'Code',
+	'COLLAPSE_QR'			=> 'Hide Quick Reply',
+
+	'DELETE_TOPIC'			=> 'Delete topic',
+	'DOWNLOAD_NOTICE'		=> 'You do not have the required permissions to view the files attached to this post.',
+
+	'EDITED_TIMES_TOTAL'	=> 'Last edited by %1$s on %2$s, edited %3$d times in total.',
+	'EDITED_TIME_TOTAL'		=> 'Last edited by %1$s on %2$s, edited %3$d time in total.',
+	'EMAIL_TOPIC'			=> 'E-mail friend',
+	'ERROR_NO_ATTACHMENT'	=> 'The selected attachment does not exist anymore.',
+
+	'FILE_NOT_FOUND_404'	=> 'The file <strong>%s</strong> does not exist.',
+	'FORK_TOPIC'			=> 'Copy topic',
+	'FULL_EDITOR'			=> 'Full Editor',
+	
+	'LINKAGE_FORBIDDEN'		=> 'You are not authorised to view, download or link from/to this site.',
+	'LOGIN_NOTIFY_TOPIC'	=> 'You have been notified about this topic, please login to view it.',
+	'LOGIN_VIEWTOPIC'		=> 'The board requires you to be registered and logged in to view this topic.',
+
+	'MAKE_ANNOUNCE'				=> 'Change to “Announcement”',
+	'MAKE_GLOBAL'				=> 'Change to “Global”',
+	'MAKE_NORMAL'				=> 'Change to “Standard Topic”',
+	'MAKE_STICKY'				=> 'Change to “Sticky”',
+	'MAX_OPTIONS_SELECT'		=> 'You may select up to <strong>%d</strong> options',
+	'MAX_OPTION_SELECT'			=> 'You may select <strong>1</strong> option',
+	'MISSING_INLINE_ATTACHMENT'	=> 'The attachment <strong>%s</strong> is no longer available',
+	'MOVE_TOPIC'				=> 'Move topic',
+
+	'NO_ATTACHMENT_SELECTED'=> 'You haven’t selected an attachment to download or view.',
+	'NO_NEWER_TOPICS'		=> 'There are no newer topics in this forum.',
+	'NO_OLDER_TOPICS'		=> 'There are no older topics in this forum.',
+	'NO_UNREAD_POSTS'		=> 'There are no new unread posts for this topic.',
+	'NO_VOTE_OPTION'		=> 'You must specify an option when voting.',
+	'NO_VOTES'				=> 'No votes',
+
+	'POLL_ENDED_AT'			=> 'Poll ended at %s',
+	'POLL_RUN_TILL'			=> 'Poll runs till %s',
+	'POLL_VOTED_OPTION'		=> 'You voted for this option',
+	'PRINT_TOPIC'			=> 'Print view',
+
+	'QUICK_MOD'				=> 'Quick-mod tools',
+	'QUICKREPLY'			=> 'Quick Reply',
+	'QUOTE'					=> 'Quote',
+
+	'REPLY_TO_TOPIC'		=> 'Reply to topic',
+	'RETURN_POST'			=> '%sReturn to the post%s',
+
+	'SHOW_QR'				=> 'Quick Reply',
+	'SUBMIT_VOTE'			=> 'Submit vote',
+
+	'TOTAL_VOTES'			=> 'Total votes',
+
+	'UNLOCK_TOPIC'			=> 'Unlock topic',
+
+	'VIEW_INFO'				=> 'Post details',
+	'VIEW_NEXT_TOPIC'		=> 'Next topic',
+	'VIEW_PREVIOUS_TOPIC'	=> 'Previous topic',
+	'VIEW_RESULTS'			=> 'View results',
+	'VIEW_TOPIC_POST'		=> '1 post',
+	'VIEW_TOPIC_POSTS'		=> '%d posts',
+	'VIEW_UNREAD_POST'		=> 'First unread post',
+	'VISIT_WEBSITE'			=> 'WWW',
+	'VOTE_SUBMITTED'		=> 'Your vote has been cast.',
+	'VOTE_CONVERTED'		=> 'Changing votes is not supported for converted polls.',
+
+));
+
+?>
\ No newline at end of file
-- 
cgit v1.2.1


From b68de2323d6444b4b3685a98bbcb9500a38e45cb Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 16 Dec 2009 15:48:23 +0000
Subject: merge changes from 3.0.x branch

git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/email/admin_welcome_activated.txt | 4 +++-
 phpBB/language/en/email/admin_welcome_inactive.txt  | 2 +-
 phpBB/language/en/help_faq.php                      | 2 +-
 phpBB/language/en/mcp.php                           | 2 ++
 phpBB/language/en/search_synonyms.php               | 2 +-
 phpBB/language/en/ucp.php                           | 1 +
 6 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/admin_welcome_activated.txt b/phpBB/language/en/email/admin_welcome_activated.txt
index c16a403f00..2397868323 100644
--- a/phpBB/language/en/email/admin_welcome_activated.txt
+++ b/phpBB/language/en/email/admin_welcome_activated.txt
@@ -2,6 +2,8 @@ Subject: Account activated
 
 Hello {USERNAME},
 
-Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous e-mail.
+Your account on "{SITENAME}" has now been activated, you may login using the username you received in a previous e-mail.
+
+Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
 {EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt
index af3ac9ca87..e0970d3ff3 100644
--- a/phpBB/language/en/email/admin_welcome_inactive.txt
+++ b/phpBB/language/en/email/admin_welcome_inactive.txt
@@ -10,7 +10,7 @@ Username: {USERNAME}
 Board URL: {U_BOARD}
 ----------------------------
 
-Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this had occured.
+Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this has occured.
 
 Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 88b2cc273d..596e0531df 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -96,7 +96,7 @@ $help = array(
 	),
 	array(
 		0 => 'How do I show an image below my username?',
-		1 => 'There are two images that may appear below a username when viewing posts. Depending on the used style, the first may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. The second, usually a larger image, is known as an avatar and is generally unique or personal to each user. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.'
+		1 => 'There are two images which may appear below a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user. It is up to the board administrators to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrators and ask them for their reasons.'
 	),
 	array(
 		0 => 'What is my rank and how do I change it?',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index ab03cdb0be..2e988e2d42 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -253,6 +253,8 @@ $lang = array_merge($lang, array(
 	'PM_REPORT_DELETED_SUCCESS'	=> 'The selected PM report has been deleted successfully.',
 	'PM_REPORTED_SUCCESS'		=> 'This private message has been successfully reported.',
 	'PM_REPORT_TOTAL'			=> 'In total there is <strong>1</strong> PM report to review.',
+	'PM_REPORTS_CLOSED_SUCCESS'	=> 'The selected PM reports have been closed successfully.',
+	'PM_REPORTS_DELETED_SUCCESS'=> 'The selected PM reports have been deleted successfully.',
 	'PM_REPORTS_TOTAL'			=> 'In total there are <strong>%d</strong> PM reports to review.',
 	'PM_REPORTS_ZERO_TOTAL'		=> 'There are no PM reports to review.',
 	'PM_REPORT_DETAILS'			=> 'Private message report details',
diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php
index b85c39e5d5..1618c292d3 100644
--- a/phpBB/language/en/search_synonyms.php
+++ b/phpBB/language/en/search_synonyms.php
@@ -26,7 +26,7 @@ $synonyms = array(
 	'anemia'			=> 'anaemia',
 	'anemic'			=> 'anaemic',
 	'anesthesia'		=> 'anaesthesia',
-	'appologize'		=> 'appologise',
+	'apologize'			=> 'apologise',
 	'archean'			=> 'archaean',
 	'archeology'		=> 'archaeology',
 	'archeozoic'		=> 'archaeozoic',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 4b79a4b6ca..02b8a282d9 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -460,6 +460,7 @@ $lang = array_merge($lang, array(
 	'UCP_ZEBRA'						=> 'Friends &amp; Foes',
 	'UCP_ZEBRA_FOES'				=> 'Manage foes',
 	'UCP_ZEBRA_FRIENDS'				=> 'Manage friends',
+	'UNDISCLOSED_RECIPIENT'			=> 'Undisclosed Recipient',
 	'UNKNOWN_FOLDER'				=> 'Unknown folder',
 	'UNWATCH_MARKED'				=> 'Unwatch marked',
 	'UPLOAD_AVATAR_FILE'			=> 'Upload from your machine',
-- 
cgit v1.2.1


From 30035b94f5928d6eea2548563b1a1f7767f0e308 Mon Sep 17 00:00:00 2001
From: Matt <maf675@gmail.com>
Date: Fri, 9 Apr 2010 14:46:58 -0700
Subject: [ticket/9532] Simplified page titles by removing meaningless text.

Removed View Forum, View Topic, added pagination to forum and topic page
titles, also moved the Site Name to the end of title for forum and topic
view pages.

PHPBB3-9532
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a3d47b5b59..e6c00c0385 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -416,6 +416,7 @@ $lang = array_merge($lang, array(
 	'OPTIONS'					=> 'Options',
 
 	'PAGE_OF'				=> 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
+	'PAGE_TITLE_NUMBER'		=> 'Page %s',
 	'PASSWORD'				=> 'Password',
 	'PIXEL'					=> 'px',
 	'PLAY_QUICKTIME_FILE'	=> 'Play Quicktime file',
-- 
cgit v1.2.1


From af5b9a96409d788733fcb1ff367e0c7fb0583702 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Tue, 9 Nov 2010 08:59:25 +0100
Subject: [ticket/9556] Drop php closing tags, add trailing newline

Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
---
 phpBB/language/en/acp/attachments.php       | 2 --
 phpBB/language/en/acp/ban.php               | 2 --
 phpBB/language/en/acp/board.php             | 2 --
 phpBB/language/en/acp/bots.php              | 2 --
 phpBB/language/en/acp/common.php            | 2 --
 phpBB/language/en/acp/database.php          | 2 --
 phpBB/language/en/acp/email.php             | 2 --
 phpBB/language/en/acp/forums.php            | 2 --
 phpBB/language/en/acp/groups.php            | 2 --
 phpBB/language/en/acp/language.php          | 2 --
 phpBB/language/en/acp/modules.php           | 2 --
 phpBB/language/en/acp/permissions.php       | 2 --
 phpBB/language/en/acp/permissions_phpbb.php | 2 --
 phpBB/language/en/acp/posting.php           | 2 --
 phpBB/language/en/acp/profile.php           | 2 --
 phpBB/language/en/acp/prune.php             | 2 --
 phpBB/language/en/acp/search.php            | 2 --
 phpBB/language/en/acp/styles.php            | 2 --
 phpBB/language/en/acp/users.php             | 2 --
 phpBB/language/en/captcha_qa.php            | 2 --
 phpBB/language/en/captcha_recaptcha.php     | 2 --
 phpBB/language/en/common.php                | 2 --
 phpBB/language/en/groups.php                | 2 --
 phpBB/language/en/help_bbcode.php           | 2 --
 phpBB/language/en/help_faq.php              | 2 --
 phpBB/language/en/install.php               | 2 --
 phpBB/language/en/mcp.php                   | 2 --
 phpBB/language/en/memberlist.php            | 2 --
 phpBB/language/en/posting.php               | 2 --
 phpBB/language/en/search.php                | 2 --
 phpBB/language/en/search_ignore_words.php   | 2 --
 phpBB/language/en/search_synonyms.php       | 1 -
 phpBB/language/en/ucp.php                   | 2 --
 phpBB/language/en/viewforum.php             | 2 --
 phpBB/language/en/viewtopic.php             | 2 --
 35 files changed, 69 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 1821b8c867..9ae250a95a 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -170,5 +170,3 @@ $lang = array_merge($lang, array(
 	'UPLOAD_ICON'					=> 'Upload icon',
 	'UPLOAD_NOT_DIR'				=> 'The upload location you specified does not appear to be a directory.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 099834d1e4..137224ba4f 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -78,5 +78,3 @@ $lang = array_merge($lang, array(
 	'USER_UNBAN'				=> 'Un-ban or un-exclude usernames',
 	'USER_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users are emphasised.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 753decd517..63c660206c 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -540,5 +540,3 @@ $lang = array_merge($lang, array(
 	'JAB_USERNAME'				=> 'Jabber username or JID',
 	'JAB_USERNAME_EXPLAIN'		=> 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php
index 3b63f2ea2e..c9d0a6bad2 100644
--- a/phpBB/language/en/acp/bots.php
+++ b/phpBB/language/en/acp/bots.php
@@ -69,5 +69,3 @@ $lang = array_merge($lang, array(
 	'NO_BOT'		=> 'Found no bot with the specified ID.',
 	'NO_BOT_GROUP'	=> 'Unable to find special bot group.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 2c549f8130..67f055b5cb 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -738,5 +738,3 @@ $lang = array_merge($lang, array(
 	'LOG_WORD_DELETE'		=> '<strong>Deleted word censor</strong><br />» %s',
 	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br />» %s',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
index ae8f76d6b7..1854e009b4 100644
--- a/phpBB/language/en/acp/database.php
+++ b/phpBB/language/en/acp/database.php
@@ -72,5 +72,3 @@ $lang = array_merge($lang, array(
 	'TABLE_SELECT'		=> 'Table select',
 	'TABLE_SELECT_ERROR'=> 'You must select at least one table.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index 4427bfff01..b8b299bee9 100644
--- a/phpBB/language/en/acp/email.php
+++ b/phpBB/language/en/acp/email.php
@@ -63,5 +63,3 @@ $lang = array_merge($lang, array(
 	'NO_EMAIL_MESSAGE'		=> 'You must enter a message.',
 	'NO_EMAIL_SUBJECT'		=> 'You must specify a subject for your message.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index eab027f295..80e958afa5 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -156,5 +156,3 @@ $lang = array_merge($lang, array(
 
 	'UNLOCKED'			=> 'Unlocked',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index e8c1a3c494..1c439cf466 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -128,5 +128,3 @@ $lang = array_merge($lang, array(
 	'USER_GROUP_DEFAULT_EXPLAIN'	=> 'Saying yes here will set this group as the default group for the added users.',
 	'USER_GROUP_LEADER'				=> 'Set as group leader',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index 4d11309ebb..8d57c2f3ce 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -98,5 +98,3 @@ $lang = array_merge($lang, array(
 
 	'WRONG_LANGUAGE_FILE'		=> 'Selected language file is invalid.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php
index 875b24a94b..7925f1644d 100644
--- a/phpBB/language/en/acp/modules.php
+++ b/phpBB/language/en/acp/modules.php
@@ -80,5 +80,3 @@ $lang = array_merge($lang, array(
 
 	'SELECT_MODULE'			=> 'Select a module',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index cf248cffdb..806350e3c8 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -285,5 +285,3 @@ $lang = array_merge($lang, array(
 	'WRONG_PERMISSION_TYPE'				=> 'Wrong permission type selected.',
 	'WRONG_PERMISSION_SETTING_FORMAT'	=> 'The permission settings are in a wrong format, phpBB is not able to process them correctly.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 945a675861..0a3cd53b1e 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -237,5 +237,3 @@ $lang = array_merge($lang, array(
 	'acl_a_backup'		=> array('lang' => 'Can backup/restore database', 'cat' => 'misc'),
 	'acl_a_search'		=> array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'),
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 443f4a3ea2..b0f1b74faa 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -276,5 +276,3 @@ $lang = array_merge($lang, array(
 
 	'USED_IN_REPORTS'		=> 'Used in reports',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index a25dcd174b..31a82fd38f 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -152,5 +152,3 @@ $lang = array_merge($lang, array(
 
 	'VISIBILITY_OPTION'				=> 'Visibility options',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index 8a06225102..bf006d9dce 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -87,5 +87,3 @@ $lang = array_merge($lang, array(
 
 	'TOPICS_PRUNED'		=> 'Topics pruned',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index a7d687d7c2..9f0181a7e2 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -105,5 +105,3 @@ $lang = array_merge($lang, array(
 	'YES_SEARCH_UPDATE'						=> 'Enable fulltext updating',
 	'YES_SEARCH_UPDATE_EXPLAIN'				=> 'Updating of fulltext indexes when posting, overridden if search is disabled.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index f161a7e6e6..642a3a57c1 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -430,5 +430,3 @@ $lang = array_merge($lang, array(
 	'UNSET'					=> 'Undefined',
 
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index eda9659795..6ba333e507 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -138,5 +138,3 @@ $lang = array_merge($lang, array(
 	'USER_WARNING_LOG_DELETED'		=> 'No information available. Possibly the log entry has been deleted.',
 	'USER_TOOLS'					=> 'Basic tools',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php
index 42c8df2d6d..6c5379923e 100644
--- a/phpBB/language/en/captcha_qa.php
+++ b/phpBB/language/en/captcha_qa.php
@@ -61,5 +61,3 @@ $lang = array_merge($lang, array(
 	'QA_LAST_QUESTION'			=> 'You cannot delete all questions while the plugin is active.',
 
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php
index 463bfffe0d..3dad7a7409 100644
--- a/phpBB/language/en/captcha_recaptcha.php
+++ b/phpBB/language/en/captcha_recaptcha.php
@@ -48,5 +48,3 @@ $lang = array_merge($lang, array(
 
 	'RECAPTCHA_EXPLAIN'				=> 'In an effort to prevent automatic submissions, we require that you enter both of the words displayed into the text field underneath.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index db60cbf227..8cce9d8b03 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -876,5 +876,3 @@ $lang = array_merge($lang, array(
 	'default_dateformat'	=> 'D M d, Y g:i a', // Mon Jan 01, 2007 1:37 pm
 
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php
index 9f72d4070f..be11ec7609 100644
--- a/phpBB/language/en/groups.php
+++ b/phpBB/language/en/groups.php
@@ -92,5 +92,3 @@ $lang = array_merge($lang, array(
 	'USER_GROUP_DEMOTE_CONFIRM'	=> 'Are you sure you want to demote as group leader from the selected group?',
 	'USER_GROUP_DEMOTED'		=> 'Successfully demoted your leadership.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index df5f950e3e..6df877aab7 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -112,5 +112,3 @@ $help = array(
 		1 => 'If you are an administrator on this board and have the proper permissions, you can add further BBCodes through the Custom BBCodes section.'
 	)
 );
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 3b7dc02d3f..9e00c290f8 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -340,5 +340,3 @@ $help = array(
 		1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a <a href="http://www.google.com/search?q=whois">whois lookup</a>) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Group has <strong>absolutely no jurisdiction</strong> and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter <strong>not directly related</strong> to the phpBB.com website or the discrete software of phpBB itself. If you do e-mail phpBB Group <strong>about any third party</strong> use of this software then you should expect a terse response or no response at all.'
 	)
 );
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 14923e836e..358dafb4a7 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -624,5 +624,3 @@ $lang = array_merge($lang, array(
 
 	'TOPICS_TOPIC_TITLE'			=> 'Welcome to phpBB3',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index fc1b8c8f62..e2c0012430 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -401,5 +401,3 @@ $lang = array_merge($lang, array(
 		)
 	),
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index e7a9c6b88d..f6d3708f12 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -146,5 +146,3 @@ $lang = array_merge($lang, array(
 
 	'WWW'					=> 'Website',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 8016a233fd..76701aaf09 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -221,5 +221,3 @@ $lang = array_merge($lang, array(
 	'WRONG_FILESIZE'			=> 'The file is too big, maximum allowed size is %1d %2s.',
 	'WRONG_SIZE'				=> 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high. The submitted image is %5$d pixels wide and %6$d pixels high.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index d93fe6b56a..5b4fd4e559 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -101,5 +101,3 @@ $lang = array_merge($lang, array(
 
 	'TOO_FEW_AUTHOR_CHARS'	=> 'You must specify at least %d characters of the authors name.',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php
index 2dfdc0df13..365591d0cd 100644
--- a/phpBB/language/en/search_ignore_words.php
+++ b/phpBB/language/en/search_ignore_words.php
@@ -268,5 +268,3 @@ $words = array(
 	'ROTFLMAO',
 	'YMMV',
 );
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php
index e544456226..49fb2069ce 100644
--- a/phpBB/language/en/search_synonyms.php
+++ b/phpBB/language/en/search_synonyms.php
@@ -188,4 +188,3 @@ $synonyms = array(
 
 	'yeild'	=> 'yield',
 );
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 02b8a282d9..7bc4ad73aa 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -552,5 +552,3 @@ $lang = array_merge($lang, array(
 	'NO_PENDING'	=> 'No pending memberships',
 	'NO_NONMEMBER'	=> 'No non-member groups',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
index d2fae20c62..6905a7a629 100644
--- a/phpBB/language/en/viewforum.php
+++ b/phpBB/language/en/viewforum.php
@@ -67,5 +67,3 @@ $lang = array_merge($lang, array(
 	'VIEW_FORUM_TOPIC'		=> '1 topic',
 	'VIEW_FORUM_TOPICS'		=> '%d topics',
 ));
-
-?>
\ No newline at end of file
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 3e1874f1ab..9e69d657b7 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -113,5 +113,3 @@ $lang = array_merge($lang, array(
 	'VOTE_CONVERTED'		=> 'Changing votes is not supported for converted polls.',
 
 ));
-
-?>
\ No newline at end of file
-- 
cgit v1.2.1


From efedc973eb7442c004ed045f7f5f81e3f9ec2d4e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 2 Aug 2010 12:01:06 +0200
Subject: [ticket/6109] MSN is now called Windows Live Messenger (WLM)

Replaced the logo with the current one and changed the language strings.

PHPBB3-6109
---
 phpBB/language/en/acp/styles.php | 2 +-
 phpBB/language/en/common.php     | 6 +++---
 phpBB/language/en/memberlist.php | 6 +++---
 phpBB/language/en/ucp.php        | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 642a3a57c1..707d9ac7bd 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -223,7 +223,7 @@ $lang = array_merge($lang, array(
 	'IMG_ICON_CONTACT_EMAIL'	=> 'Send e-mail',
 	'IMG_ICON_CONTACT_ICQ'		=> 'ICQ',
 	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
-	'IMG_ICON_CONTACT_MSNM'		=> 'MSNM',
+	'IMG_ICON_CONTACT_MSNM'		=> 'WLM',
 	'IMG_ICON_CONTACT_PM'		=> 'Send message',
 	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',
 	'IMG_ICON_CONTACT_WWW'		=> 'Website',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 7daa5a0c9e..d5311c5820 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -339,7 +339,7 @@ $lang = array_merge($lang, array(
 	'MODERATORS'			=> 'Moderators',
 	'MONTH'					=> 'Month',
 	'MOVE'					=> 'Move',
-	'MSNM'					=> 'MSNM/WLM',
+	'MSNM'					=> 'WLM',
 
 	'NA'						=> 'N/A',
 	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
@@ -580,7 +580,7 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_INTERESTS'			=> 'The interests you entered is too long.',
 	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
 	'TOO_LONG_LOCATION'				=> 'The location you entered is too long.',
-	'TOO_LONG_MSN'					=> 'The MSNM/WLM name you entered is too long.',
+	'TOO_LONG_MSN'					=> 'The WLM name you entered is too long.',
 	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
 	'TOO_LONG_OCCUPATION'			=> 'The occupation you entered is too long.',
 	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
@@ -602,7 +602,7 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_INTERESTS'			=> 'The interests you entered is too short.',
 	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
 	'TOO_SHORT_LOCATION'			=> 'The location you entered is too short.',
-	'TOO_SHORT_MSN'					=> 'The MSNM/WLM name you entered is too short.',
+	'TOO_SHORT_MSN'					=> 'The WLM name you entered is too short.',
 	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_OCCUPATION'			=> 'The occupation you entered is too short.',
 	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 76dd5d0423..07edb2bb85 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -79,9 +79,9 @@ $lang = array_merge($lang, array(
 	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
 	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
 	'IM_MESSAGE'			=> 'Your message',
-	'IM_MSNM'				=> 'Please note that you need Windows Messenger installed to use this.',
+	'IM_MSNM'				=> 'Please note that you need Windows Live Messenger installed to use this.',
 	'IM_MSNM_BROWSER'		=> 'Your browser does not support this.',
-	'IM_MSNM_CONNECT'		=> 'MSNM is not connected.\nYou have to connect to MSNM to continue.',
+	'IM_MSNM_CONNECT'		=> 'WLM is not connected.\nYou have to connect to WLM to continue.',
 	'IM_NAME'				=> 'Your Name',
 	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
 	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
@@ -124,7 +124,7 @@ $lang = array_merge($lang, array(
 	'SEND_IM'				=> 'Instant messaging',
 	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
 	'SEND_MESSAGE'			=> 'Message',
-	'SEND_MSNM_MESSAGE'		=> 'Send MSNM/WLM message',
+	'SEND_MSNM_MESSAGE'		=> 'Send WLM message',
 	'SEND_YIM_MESSAGE'		=> 'Send YIM message',
 	'SORT_EMAIL'			=> 'E-mail',
 	'SORT_LAST_ACTIVE'		=> 'Last active',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 7bc4ad73aa..2bb9025037 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -425,7 +425,7 @@ $lang = array_merge($lang, array(
 	'UCP_MAIN_FRONT'			=> 'Front page',
 	'UCP_MAIN_SUBSCRIBED'		=> 'Manage subscriptions',
 
-	'UCP_MSNM'					=> 'WL/MSN Messenger',
+	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
 	'UCP_PREFS'					=> 'Board preferences',
-- 
cgit v1.2.1


From f07aeba9c056c7aea72a81d012ba8e793345f130 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 25 Apr 2010 11:07:10 -0400
Subject: [feature/system-cron] Added acp ui for use_system_cron config
 setting.

PHPBB3-9596
---
 phpBB/language/en/acp/board.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index bdd5f0d2f3..fe023958a9 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -433,6 +433,8 @@ $lang = array_merge($lang, array(
 	'SMILIES_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/smilies</samp>.',
 	'UPLOAD_ICONS_PATH'			=> 'Extension group icons storage path',
 	'UPLOAD_ICONS_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/upload_icons</samp>.',
+	'USE_SYSTEM_CRON'		=> 'Run periodic tasks from system cron',
+	'USE_SYSTEM_CRON_EXPLAIN'		=> 'When off, phpBB will arrange for periodic tasks to be run automatically. When on, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for <code>cron.php</code> to be invoked by the system cron facility at regular intervals (e.g. every 5 minutes).',
 ));
 
 // Security Settings
-- 
cgit v1.2.1


From 4f2b0d9d42869d743a04e6e2b2541383ffeff16c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 9 Feb 2011 21:05:10 +0100
Subject: [ticket/9549] Add the module and files for the ACP.

PHPBB3-9549
---
 phpBB/language/en/acp/common.php |  1 +
 phpBB/language/en/acp/groups.php | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 25a020d8a2..847e763ae8 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -100,6 +100,7 @@ $lang = array_merge($lang, array(
 	'ACP_GROUPS_MANAGE'				=> 'Manage groups',
 	'ACP_GROUPS_MANAGEMENT'			=> 'Group management',
 	'ACP_GROUPS_PERMISSIONS'		=> 'Groups’ permissions',
+	'ACP_GROUPS_POSITION'			=> 'Manage group positions',
 
 	'ACP_ICONS'					=> 'Topic icons',
 	'ACP_ICONS_SMILIES'			=> 'Topic icons/smilies',
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 3b3953ac36..9cc386f6fd 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -97,6 +97,8 @@ $lang = array_merge($lang, array(
 	'GROUP_SETTINGS_SAVE'			=> 'Group wide settings',
 	'GROUP_SKIP_AUTH'				=> 'Exempt group leader from permissions',
 	'GROUP_SKIP_AUTH_EXPLAIN'		=> 'If enabled group leader no longer inherit permissions from the group.',
+	'GROUP_SPECIAL'					=> 'Pre-defined',
+	'GROUP_TEAMPAGE'				=> 'Display group on teampage',
 	'GROUP_TYPE'					=> 'Group type',
 	'GROUP_TYPE_EXPLAIN'			=> 'This determines which users can join or view this group.',
 	'GROUP_UPDATED'					=> 'Group preferences updated successfully.',
@@ -105,19 +107,34 @@ $lang = array_merge($lang, array(
 	'GROUP_USERS_EXIST'				=> 'The selected users are already members.',
 	'GROUP_USERS_REMOVE'			=> 'Users removed from group and new defaults set successfully.',
 
+	'LEGEND_EXPLAIN'				=> 'These are the groups, which are viewed on the group legend:',
+	'LEGEND_SETTINGS'				=> 'Legend settings',
+	'LEGEND_SORT_GROUPNAME'			=> 'Sort legend by group name',
+	'LEGEND_SORT_GROUPNAME_EXPLAIN'	=> 'The order from bellow is ignored when this option is enabled.',
+
+	'MANAGE_LEGEND'			=> 'Manage group legend',
+	'MANAGE_TEAMPAGE'		=> 'Manage teampage',
 	'MAKE_DEFAULT_FOR_ALL'	=> 'Make default group for every member',
 	'MEMBERS'				=> 'Members',
 
 	'NO_GROUP'					=> 'No group specified.',
+	'NO_GROUPS_ADDED'			=> 'No groups added yet.',
 	'NO_GROUPS_CREATED'			=> 'No groups created yet.',
 	'NO_PERMISSIONS'			=> 'Do not copy permissions',
 	'NO_USERS'					=> 'You haven’t entered any users.',
 	'NO_USERS_ADDED'			=> 'No users were added to the group.',
 	'NO_VALID_USERS'			=> 'You haven’t entered any users eligible for that action.',
 
+	'SELECT_GROUP'				=> 'Select a group',
 	'SPECIAL_GROUPS'			=> 'Pre-defined groups',
 	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
 
+	'TEAMPAGE_EXPLAIN'			=> 'These are the groups, which are viewed on the teampage:',
+	'TEAMPAGE_FORUMS'			=> 'Display moderator forums',
+	'TEAMPAGE_FORUMS_EXPLAIN'	=> 'If set to yes, moderators will have a list with all of the forums, where they have moderator permissions, in their row. This can be very SQL intensive for big boards.',
+	'TEAMPAGE_MULTIPLE'			=> 'Display users in all groups',
+	'TEAMPAGE_MULTIPLE_EXPLAIN'	=> 'If set to no, the users will only be displayed in their first group.',
+	'TEAMPAGE_SETTINGS'			=> 'Teampage settings',
 	'TOTAL_MEMBERS'				=> 'Members',
 
 	'USERS_APPROVED'				=> 'Users approved successfully.',
-- 
cgit v1.2.1


From d2e2ccf8a49a3d62d3de3145e114d3ed0b255465 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 16 Feb 2011 10:47:41 +0100
Subject: [ticket/9549] Fix some minor issues with descriptions and
 coding-guidelines.

PHPBB3-9549
---
 phpBB/language/en/acp/groups.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 9cc386f6fd..1fcf213c43 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -110,7 +110,7 @@ $lang = array_merge($lang, array(
 	'LEGEND_EXPLAIN'				=> 'These are the groups, which are viewed on the group legend:',
 	'LEGEND_SETTINGS'				=> 'Legend settings',
 	'LEGEND_SORT_GROUPNAME'			=> 'Sort legend by group name',
-	'LEGEND_SORT_GROUPNAME_EXPLAIN'	=> 'The order from bellow is ignored when this option is enabled.',
+	'LEGEND_SORT_GROUPNAME_EXPLAIN'	=> 'The order below is ignored when this option is enabled.',
 
 	'MANAGE_LEGEND'			=> 'Manage group legend',
 	'MANAGE_TEAMPAGE'		=> 'Manage teampage',
@@ -131,7 +131,7 @@ $lang = array_merge($lang, array(
 
 	'TEAMPAGE_EXPLAIN'			=> 'These are the groups, which are viewed on the teampage:',
 	'TEAMPAGE_FORUMS'			=> 'Display moderator forums',
-	'TEAMPAGE_FORUMS_EXPLAIN'	=> 'If set to yes, moderators will have a list with all of the forums, where they have moderator permissions, in their row. This can be very SQL intensive for big boards.',
+	'TEAMPAGE_FORUMS_EXPLAIN'	=> 'If set to yes, moderators will have a list with all of the forums, where they have moderator permissions, in their row. This can be very database intensive for big boards.',
 	'TEAMPAGE_MULTIPLE'			=> 'Display users in all groups',
 	'TEAMPAGE_MULTIPLE_EXPLAIN'	=> 'If set to no, the users will only be displayed in their first group.',
 	'TEAMPAGE_SETTINGS'			=> 'Teampage settings',
-- 
cgit v1.2.1


From 6e9aecec796d9aeacd82c5da2c56103f729f29a4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 18 Feb 2011 00:06:06 +0100
Subject: [ticket/9549] Fix language strings.

PHPBB3-9549
---
 phpBB/language/en/acp/groups.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 1fcf213c43..eb83dec576 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -107,7 +107,7 @@ $lang = array_merge($lang, array(
 	'GROUP_USERS_EXIST'				=> 'The selected users are already members.',
 	'GROUP_USERS_REMOVE'			=> 'Users removed from group and new defaults set successfully.',
 
-	'LEGEND_EXPLAIN'				=> 'These are the groups, which are viewed on the group legend:',
+	'LEGEND_EXPLAIN'				=> 'These are the groups which are displayed in the group legend:',
 	'LEGEND_SETTINGS'				=> 'Legend settings',
 	'LEGEND_SORT_GROUPNAME'			=> 'Sort legend by group name',
 	'LEGEND_SORT_GROUPNAME_EXPLAIN'	=> 'The order below is ignored when this option is enabled.',
@@ -129,9 +129,9 @@ $lang = array_merge($lang, array(
 	'SPECIAL_GROUPS'			=> 'Pre-defined groups',
 	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
 
-	'TEAMPAGE_EXPLAIN'			=> 'These are the groups, which are viewed on the teampage:',
-	'TEAMPAGE_FORUMS'			=> 'Display moderator forums',
-	'TEAMPAGE_FORUMS_EXPLAIN'	=> 'If set to yes, moderators will have a list with all of the forums, where they have moderator permissions, in their row. This can be very database intensive for big boards.',
+	'TEAMPAGE_EXPLAIN'			=> 'These are the groups which are displayed on the teampage:',
+	'TEAMPAGE_FORUMS'			=> 'Display moderated forums',
+	'TEAMPAGE_FORUMS_EXPLAIN'	=> 'If set to yes, moderators will have a list with all of the forums where they have moderator permissions displayed in their row. This can be very database intensive for big boards.',
 	'TEAMPAGE_MULTIPLE'			=> 'Display users in all groups',
 	'TEAMPAGE_MULTIPLE_EXPLAIN'	=> 'If set to no, the users will only be displayed in their first group.',
 	'TEAMPAGE_SETTINGS'			=> 'Teampage settings',
-- 
cgit v1.2.1


From 4ac8eaf9e3421f394136dc722542198b3048f4f8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 25 Feb 2011 15:47:34 +0100
Subject: [ticket/9549] Display users in their primary group instead of their
 first group

PHPBB3-9549
---
 phpBB/language/en/acp/groups.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index eb83dec576..11342bf4f2 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -133,7 +133,7 @@ $lang = array_merge($lang, array(
 	'TEAMPAGE_FORUMS'			=> 'Display moderated forums',
 	'TEAMPAGE_FORUMS_EXPLAIN'	=> 'If set to yes, moderators will have a list with all of the forums where they have moderator permissions displayed in their row. This can be very database intensive for big boards.',
 	'TEAMPAGE_MULTIPLE'			=> 'Display users in all groups',
-	'TEAMPAGE_MULTIPLE_EXPLAIN'	=> 'If set to no, the users will only be displayed in their first group.',
+	'TEAMPAGE_MULTIPLE_EXPLAIN'	=> 'If set to no, the users will only be displayed in their primary group (If the primary group is not listed, the users will be displayed in their first displayed group).',
 	'TEAMPAGE_SETTINGS'			=> 'Teampage settings',
 	'TOTAL_MEMBERS'				=> 'Members',
 
-- 
cgit v1.2.1


From 97864d69ee66134f04936137e2357caf99cd9f30 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Thu, 17 Feb 2011 23:31:05 +0700
Subject: [feature/attachment-management-no-reassignment] Attachments
 management

This feature allows to manage attachments in posts and PMs via ACP.

PHPBB3-9721
---
 phpBB/language/en/acp/common.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 847e763ae8..9f89b6284c 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -116,6 +116,10 @@ $lang = array_merge($lang, array(
 	'ACP_LOGGING'				=> 'Logging',
 
 	'ACP_MAIN'					=> 'ACP index',
+
+	'ACP_MANAGE_ATTACHMENTS'			=> 'Manage attachments',
+	'ACP_MANAGE_ATTACHMENTS_EXPLAIN'	=> 'Here you can manage files attached to posts. You are able to delete the files or reassign them to existing posts. Reassigning to posts requires a valid post ID, you have to determine this ID by yourself. This will reassign the already assigned attachment to the post you entered.',
+
 	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions',
 	'ACP_MANAGE_FORUMS'			=> 'Manage forums',
 	'ACP_MANAGE_RANKS'			=> 'Manage ranks',
@@ -227,6 +231,7 @@ $lang = array_merge($lang, array(
 	'DOWNLOAD_AS'				=> 'Download as',
 	'DOWNLOAD_STORE'			=> 'Download or store file',
 	'DOWNLOAD_STORE_EXPLAIN'	=> 'You may directly download the file or save it in your <samp>store/</samp> folder.',
+	'DOWNLOADS'          		=> 'Downloads',
 
 	'EDIT'					=> 'Edit',
 	'ENABLE'				=> 'Enable',
@@ -284,6 +289,8 @@ $lang = array_merge($lang, array(
 
 	'SHOW_ALL_OPERATIONS'	=> 'Show all operations',
 
+	'TOTAL_SIZE'      		=> 'Total size',
+
 	'UCP'					=> 'User Control Panel',
 	'USERNAMES_EXPLAIN'		=> 'Place each username on a separate line.',
 	'USER_CONTROL_PANEL'	=> 'User Control Panel',
-- 
cgit v1.2.1


From d811820bc11bac61076d5a92d741d22df9944af8 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 11 Apr 2011 19:59:50 +0800
Subject: [feature/attachment-management-no-reassignment] Further feature
 adjustments.

-add database update entry;
- add files statistics checks;
- improve files deletion procedure;
- improve reversed order for pagination;
- adjust template file;
- add missing comma for orphan key in info module;
- change module mode name;
- fix module explanation text;
- add files comments output;
- change attachments per page amount from posts to topics per page value.

PHPBB3-9721
---
 phpBB/language/en/acp/common.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 9f89b6284c..11e8e05a56 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -118,7 +118,7 @@ $lang = array_merge($lang, array(
 	'ACP_MAIN'					=> 'ACP index',
 
 	'ACP_MANAGE_ATTACHMENTS'			=> 'Manage attachments',
-	'ACP_MANAGE_ATTACHMENTS_EXPLAIN'	=> 'Here you can manage files attached to posts. You are able to delete the files or reassign them to existing posts. Reassigning to posts requires a valid post ID, you have to determine this ID by yourself. This will reassign the already assigned attachment to the post you entered.',
+	'ACP_MANAGE_ATTACHMENTS_EXPLAIN'	=> 'Here you can list and delete files attached to posts and private messages.',
 
 	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions',
 	'ACP_MANAGE_FORUMS'			=> 'Manage forums',
@@ -238,6 +238,9 @@ $lang = array_merge($lang, array(
 	'EXPORT_DOWNLOAD'		=> 'Download',
 	'EXPORT_STORE'			=> 'Store',
 
+	'FILES_GONE'			=> 'Some of the attachments you selected for deletion do not exist. They may have been already deleted. Attachments that did exist were deleted.',
+	'FILES_STAT_WRONG'		=> 'Your files statistics is probably inaccurate and might need to be resynchronised. Actual values: number of attachments » %1$d, total size of attachments » %2$s.',
+
 	'GENERAL_OPTIONS'		=> 'General options',
 	'GENERAL_SETTINGS'		=> 'General settings',
 	'GLOBAL_MASK'			=> 'Global permission mask',
@@ -263,6 +266,7 @@ $lang = array_merge($lang, array(
 	'NOTIFY'				=> 'Notification',
 	'NO_ADMIN'				=> 'You are not authorised to administer this board.',
 	'NO_EMAILS_DEFINED'		=> 'No valid e-mail addresses found.',
+	'NO_FILES_TO_DELETE'	=> 'Attachments you selected for deletion do not exist.',
 	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',
 
 	'OFF'					=> 'Off',
-- 
cgit v1.2.1


From baba66a22991e93908a8b4e7f8bfa104b3588450 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 24 Apr 2011 23:33:51 +0800
Subject: [feature/attachment-management-no-reassignment] Handle privacy and
 some more.

- restrict files info for PM attachments;
- add an option to resync files stats if wrong;
- replace post_id sorting with post type (PM/regular post) one;
- some language fixes.

PHPBB3-9721
---
 phpBB/language/en/acp/attachments.php | 1 +
 phpBB/language/en/acp/common.php      | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 9ae250a95a..eede2c5d50 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -62,6 +62,7 @@ $lang = array_merge($lang, array(
 	'ATTACH_MAX_PM_FILESIZE_EXPLAIN'	=> 'Maximum size of each file, with 0 being unlimited, attached to a private message.',
 	'ATTACH_ORPHAN_URL'					=> 'Orphan attachments',
 	'ATTACH_POST_ID'					=> 'Post ID',
+	'ATTACH_POST_TYPE'					=> 'Post type',
 	'ATTACH_QUOTA'						=> 'Total attachment quota',
 	'ATTACH_QUOTA_EXPLAIN'				=> 'Maximum drive space available for attachments for the whole board, with 0 being unlimited.',
 	'ATTACH_TO_POST'					=> 'Attach file to post',
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 11e8e05a56..2a8ed86175 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -239,7 +239,7 @@ $lang = array_merge($lang, array(
 	'EXPORT_STORE'			=> 'Store',
 
 	'FILES_GONE'			=> 'Some of the attachments you selected for deletion do not exist. They may have been already deleted. Attachments that did exist were deleted.',
-	'FILES_STAT_WRONG'		=> 'Your files statistics is probably inaccurate and might need to be resynchronised. Actual values: number of attachments » %1$d, total size of attachments » %2$s.',
+	'FILES_STATS_WRONG'		=> 'Your files statistics are probably inaccurate and need to be resynchronised. Actual values: number of attachments = %1$d, total size of attachments = %2$s.',
 
 	'GENERAL_OPTIONS'		=> 'General options',
 	'GENERAL_SETTINGS'		=> 'General settings',
@@ -281,6 +281,8 @@ $lang = array_merge($lang, array(
 
 	'REMIND'							=> 'Remind',
 	'RESYNC'							=> 'Resynchronise',
+	'RESYNC_FILES_STATS'				=> 'Resynchronise files statistics',
+	'RESYNC_FILES_STATS_EXPLAIN'		=> 'Recalculates the total number and size of files attached to posts and private messages.',
 	'RETURN_TO'							=> 'Return to…',
 
 	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
@@ -367,6 +369,7 @@ $lang = array_merge($lang, array(
 	'RESET_DATE_CONFIRM'			=> 'Are you sure you wish to reset the board’s start date?',
 	'RESET_ONLINE'					=> 'Reset most users ever online',
 	'RESET_ONLINE_CONFIRM'			=> 'Are you sure you wish to reset the most users ever online counter?',
+	'RESYNC_FILES_STATS_CONFIRM'	=> 'Are you sure you wish to resynchronise files statistics?',
 	'RESYNC_POSTCOUNTS'				=> 'Resynchronise post counts',
 	'RESYNC_POSTCOUNTS_EXPLAIN'		=> 'Only existing posts will be taken into consideration. Pruned posts will not be counted.',
 	'RESYNC_POSTCOUNTS_CONFIRM'		=> 'Are you sure you wish to resynchronise post counts?',
@@ -671,6 +674,7 @@ $lang = array_merge($lang, array(
 	'LOG_REFERER_INVALID'		=> '<strong>Referer validation failed</strong><br />»Referer was “<em>%1$s</em>”. The request was rejected and the session killed.',
 	'LOG_RESET_DATE'			=> '<strong>Board start date reset</strong>',
 	'LOG_RESET_ONLINE'			=> '<strong>Most users online reset</strong>',
+	'LOG_RESYNC_FILES_STATS'	=> '<strong>Files statistics resynchronised</strong>',
 	'LOG_RESYNC_POSTCOUNTS'		=> '<strong>User post counts resynchronised</strong>',
 	'LOG_RESYNC_POST_MARKING'	=> '<strong>Dotted topics resynchronised</strong>',
 	'LOG_RESYNC_STATS'			=> '<strong>Post, topic and user statistics resynchronised</strong>',
-- 
cgit v1.2.1


From fe347ec1124de7022bbbf37d0a1fffeff56c7271 Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Tue, 25 May 2010 10:52:01 -0500
Subject: [feature/prune-users] Adjust some language strings for new features

Adjust two language strings for ACP prune feature to include descriptions for
new features.

PHPBB3-9622
---
 phpBB/language/en/acp/prune.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index bf006d9dce..1cd29d0f25 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -37,7 +37,9 @@ if (empty($lang) || !is_array($lang))
 
 // User pruning
 $lang = array_merge($lang, array(
-	'ACP_PRUNE_USERS_EXPLAIN'	=> 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.',
+	'ACP_PRUNE_USERS_EXPLAIN'	=> 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Use * as a wildcard for text fields.  Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.',
+
+	'CRITERIA'      => 'Criteria',
 
 	'DEACTIVATE_DELETE'			=> 'Deactivate or delete',
 	'DEACTIVATE_DELETE_EXPLAIN'	=> 'Choose whether to deactivate users or delete them entirely. Please note that deleted users cannot be restored!',
@@ -45,15 +47,17 @@ $lang = array_merge($lang, array(
 	'DELETE_USER_POSTS'			=> 'Delete pruned user posts',
 	'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.',
 
-	'JOINED_EXPLAIN'			=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.',
+	'JOINED_EXPLAIN'			=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.  You may use both fields to specify an interval, or leave one blank for an open date range.',
 
 	'LAST_ACTIVE_EXPLAIN'		=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format. Enter <kbd>0000-00-00</kbd> to prune users who never logged in, <em>Before</em> and <em>After</em> conditions will be ignored.',
 
+	'POSTS_ON_QUEUE'            => 'Posts Awaiting Approval',
+	'PRUNE_USERS_GROUP_EXPLAIN' => 'Selects all members of the group for pruning.',
 	'PRUNE_USERS_LIST'				=> 'Users to be pruned',
-	'PRUNE_USERS_LIST_DELETE'		=> 'With the selected critera for pruning users the following accounts will be removed.',
-	'PRUNE_USERS_LIST_DEACTIVATE'	=> 'With the selected critera for pruning users the following accounts will be deactivated.',
+	'PRUNE_USERS_LIST_DELETE'		=> 'With the selected critera for pruning users the following accounts will be removed.  You can remove individual users from the deletion list by unchecking the box next to their username.',
+	'PRUNE_USERS_LIST_DEACTIVATE'	=> 'With the selected critera for pruning users the following accounts will be deactivated.  You can remove individual users from the deactivation list by unchecking the box next to their username.',
 
-	'SELECT_USERS_EXPLAIN'		=> 'Enter specific usernames here, they will be used in preference to the criteria above. Founders cannot be pruned.',
+	'SELECT_USERS_EXPLAIN'		=> 'Enter specific usernames here.  They will be used in preference to the criteria above. Founders cannot be pruned.',
 
 	'USER_DEACTIVATE_SUCCESS'	=> 'The selected users have been deactivated successfully.',
 	'USER_DELETE_SUCCESS'		=> 'The selected users have been deleted successfully.',
-- 
cgit v1.2.1


From 33c7bb4ec3c391e8b19c6ddff25852a46fe3e304 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 8 May 2011 12:53:12 -0400
Subject: [feature/prune-users] Fixed whitespace in language file.

PHPBB3-9622
---
 phpBB/language/en/acp/prune.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index 1cd29d0f25..9bd8adc00f 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -37,9 +37,9 @@ if (empty($lang) || !is_array($lang))
 
 // User pruning
 $lang = array_merge($lang, array(
-	'ACP_PRUNE_USERS_EXPLAIN'	=> 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Use * as a wildcard for text fields.  Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.',
+	'ACP_PRUNE_USERS_EXPLAIN'	=> 'This section allows you to delete or deactivate users on your board. Accounts can be filtered in a variety of ways; by post count, most recent activity, etc. Criteria may be combined to narrow down which accounts are affected. For example, you can prune users with fewer than 10 posts, who were also inactive after 2002-01-01. Use * as a wildcard for text fields. Alternatively, you may skip the criteria selection completely by entering a list of users (each on a separate line) into the text field. Take care with this facility! Once a user is deleted, there is no way to reverse the action.',
 
-	'CRITERIA'      => 'Criteria',
+	'CRITERIA'				=> 'Criteria',
 
 	'DEACTIVATE_DELETE'			=> 'Deactivate or delete',
 	'DEACTIVATE_DELETE_EXPLAIN'	=> 'Choose whether to deactivate users or delete them entirely. Please note that deleted users cannot be restored!',
@@ -47,17 +47,17 @@ $lang = array_merge($lang, array(
 	'DELETE_USER_POSTS'			=> 'Delete pruned user posts',
 	'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.',
 
-	'JOINED_EXPLAIN'			=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format.  You may use both fields to specify an interval, or leave one blank for an open date range.',
+	'JOINED_EXPLAIN'			=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format. You may use both fields to specify an interval, or leave one blank for an open date range.',
 
 	'LAST_ACTIVE_EXPLAIN'		=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format. Enter <kbd>0000-00-00</kbd> to prune users who never logged in, <em>Before</em> and <em>After</em> conditions will be ignored.',
 
-	'POSTS_ON_QUEUE'            => 'Posts Awaiting Approval',
-	'PRUNE_USERS_GROUP_EXPLAIN' => 'Selects all members of the group for pruning.',
+	'POSTS_ON_QUEUE'			=> 'Posts Awaiting Approval',
+	'PRUNE_USERS_GROUP_EXPLAIN'	=> 'Selects all members of the group for pruning.',
 	'PRUNE_USERS_LIST'				=> 'Users to be pruned',
-	'PRUNE_USERS_LIST_DELETE'		=> 'With the selected critera for pruning users the following accounts will be removed.  You can remove individual users from the deletion list by unchecking the box next to their username.',
-	'PRUNE_USERS_LIST_DEACTIVATE'	=> 'With the selected critera for pruning users the following accounts will be deactivated.  You can remove individual users from the deactivation list by unchecking the box next to their username.',
+	'PRUNE_USERS_LIST_DELETE'		=> 'With the selected critera for pruning users the following accounts will be removed. You can remove individual users from the deletion list by unchecking the box next to their username.',
+	'PRUNE_USERS_LIST_DEACTIVATE'	=> 'With the selected critera for pruning users the following accounts will be deactivated. You can remove individual users from the deactivation list by unchecking the box next to their username.',
 
-	'SELECT_USERS_EXPLAIN'		=> 'Enter specific usernames here.  They will be used in preference to the criteria above. Founders cannot be pruned.',
+	'SELECT_USERS_EXPLAIN'		=> 'Enter specific usernames here. They will be used in preference to the criteria above. Founders cannot be pruned.',
 
 	'USER_DEACTIVATE_SUCCESS'	=> 'The selected users have been deactivated successfully.',
 	'USER_DELETE_SUCCESS'		=> 'The selected users have been deleted successfully.',
-- 
cgit v1.2.1


From 8fa44cc3b9778f84ca20eab1c1d404c4f848eab4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 19 Oct 2010 17:06:23 +0200
Subject: [ticket/8542] Display custom profile fields in private messages

Introduce an option to display the cpf in the PM view.

PHPBB3-8542
---
 phpBB/language/en/acp/board.php   | 1 +
 phpBB/language/en/acp/profile.php | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index fe023958a9..084076d8dc 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -353,6 +353,7 @@ $lang = array_merge($lang, array(
 	'LIMIT_SESSIONS'				=> 'Limit sessions',
 	'LIMIT_SESSIONS_EXPLAIN'		=> 'If the number of sessions exceeds this value within a one minute period the board will go offline. Set to 0 for unlimited sessions.',
 	'LOAD_CPF_MEMBERLIST'			=> 'Allow styles to display custom profile fields in memberlist',
+	'LOAD_CPF_PM'					=> 'Display custom profile fields in private messages',
 	'LOAD_CPF_VIEWPROFILE'			=> 'Display custom profile fields in user profiles',
 	'LOAD_CPF_VIEWTOPIC'			=> 'Display custom profile fields on topic pages',
 	'LOAD_USER_ACTIVITY'			=> 'Show user’s activity',
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 31a82fd38f..ea643157d8 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -66,6 +66,8 @@ $lang = array_merge($lang, array(
 	'DISPLAY_AT_PROFILE_EXPLAIN'	=> 'The user is able to change this profile field within the user control panel.',
 	'DISPLAY_AT_REGISTER'			=> 'Display on registration screen',
 	'DISPLAY_AT_REGISTER_EXPLAIN'	=> 'If this option is enabled, the field will be displayed on registration.',
+	'DISPLAY_ON_PM'					=> 'Display on view pm screen',
+	'DISPLAY_ON_PM_EXPLAIN'			=> 'If this option is enabled, the field will be displayed in the mini-profile on the pm screen.',
 	'DISPLAY_ON_VT'					=> 'Display on viewtopic screen',
 	'DISPLAY_ON_VT_EXPLAIN'			=> 'If this option is enabled, the field will be displayed in the mini-profile on the topic screen.',
 	'DISPLAY_PROFILE_FIELD'			=> 'Publicly display profile field',
-- 
cgit v1.2.1


From 541a7db1016560d77590b9265c63c10cdd7e01a5 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 13 Jul 2011 09:51:09 +0200
Subject: [ticket/7090] Update documented minimum PHP version to  5.2.0

PHPBB3-7090
---
 phpBB/language/en/install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index bc5a3ab936..2859b05909 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -300,10 +300,10 @@ $lang = array_merge($lang, array(
 	'PHP_REGISTER_GLOBALS_EXPLAIN'	=> 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.',
 	'PHP_SAFE_MODE'					=> 'Safe mode',
 	'PHP_SETTINGS'					=> 'PHP version and settings',
-	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 4.3.3 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
+	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.2.0 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
 	'PHP_URL_FOPEN_SUPPORT'			=> 'PHP setting <var>allow_url_fopen</var> is enabled',
 	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it.',
-	'PHP_VERSION_REQD'				=> 'PHP version >= 4.3.3',
+	'PHP_VERSION_REQD'				=> 'PHP version >= 5.2.0',
 	'POST_ID'						=> 'Post ID',
 	'PREFIX_FOUND'					=> 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
 	'PREPROCESS_STEP'				=> 'Executing pre-processing functions/queries',
-- 
cgit v1.2.1


From 33adfd633b6fa92bbc6e0b4fd303e942d2923b6e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 3 Sep 2011 18:55:30 +0300
Subject: [feature/remove-imagesets] Changing database structure

Removing imagesets. Changing database structure

PHPBB3-10336
---
 phpBB/language/en/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 96970dcb23..2b5d1cad6b 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -344,7 +344,7 @@ $lang = array_merge($lang, array(
 	'SUB_LICENSE'				=> 'License',
 	'SUB_SUPPORT'				=> 'Support',
 	'SUCCESSFUL_CONNECT'		=> 'Successful connection',
-	'SUPPORT_BODY'				=> 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="http://www.phpbb.com/community/viewforum.php?f=65">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>MODs / Styles</h2><p>For issues relating to MODs, please post in the appropriate <a href="http://www.phpbb.com/community/viewforum.php?f=81">Modifications Forum</a>.<br />For issues relating to styles, templates and imagesets, please post in the appropriate <a href="http://www.phpbb.com/community/viewforum.php?f=80">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="http://www.phpbb.com/community/viewtopic.php?f=14&amp;t=571070">The phpBB Welcome Package</a><br /><a href="http://www.phpbb.com/support/">Support Section</a><br /><a href="http://www.phpbb.com/support/documentation/3.0/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/">subscribe to our mailing list</a>?<br /><br />',
+	'SUPPORT_BODY'				=> 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="http://www.phpbb.com/community/viewforum.php?f=65">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>MODs / Styles</h2><p>For issues relating to MODs, please post in the appropriate <a href="http://www.phpbb.com/community/viewforum.php?f=81">Modifications Forum</a>.<br />For issues relating to styles, templates and themes, please post in the appropriate <a href="http://www.phpbb.com/community/viewforum.php?f=80">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="http://www.phpbb.com/community/viewtopic.php?f=14&amp;t=571070">The phpBB Welcome Package</a><br /><a href="http://www.phpbb.com/support/">Support Section</a><br /><a href="http://www.phpbb.com/support/documentation/3.0/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/">subscribe to our mailing list</a>?<br /><br />',
 	'SYNC_FORUMS'				=> 'Starting to synchronise forums',
 	'SYNC_POST_COUNT'			=> 'Synchronising post_counts',
 	'SYNC_POST_COUNT_ID'		=> 'Synchronising post_counts from <var>entry</var> %1$s to %2$s.',
-- 
cgit v1.2.1


From 98590201d862ad75e24971a8817a06fa66466f77 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 3 Sep 2011 18:57:16 +0300
Subject: [feature/remove-imagesets] Changing admin control panel styles module

Removing imagesets. Changing admin control panel styles module

PHPBB3-10336
---
 phpBB/language/en/acp/common.php | 11 ---------
 phpBB/language/en/acp/styles.php | 52 ++++------------------------------------
 2 files changed, 5 insertions(+), 58 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 2a8ed86175..cca928831f 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -104,7 +104,6 @@ $lang = array_merge($lang, array(
 
 	'ACP_ICONS'					=> 'Topic icons',
 	'ACP_ICONS_SMILIES'			=> 'Topic icons/smilies',
-	'ACP_IMAGESETS'				=> 'Imagesets',
 	'ACP_INACTIVE_USERS'		=> 'Inactive users',
 	'ACP_INDEX'					=> 'ACP index',
 
@@ -593,16 +592,6 @@ $lang = array_merge($lang, array(
 
 	'LOG_IMAGE_GENERATION_ERROR'	=> '<strong>Error while creating image</strong><br />» Error in %1$s on line %2$s: %3$s',
 
-	'LOG_IMAGESET_ADD_DB'			=> '<strong>Added new imageset to database</strong><br />» %s',
-	'LOG_IMAGESET_ADD_FS'			=> '<strong>Add new imageset on filesystem</strong><br />» %s',
-	'LOG_IMAGESET_DELETE'			=> '<strong>Deleted imageset</strong><br />» %s',
-	'LOG_IMAGESET_EDIT_DETAILS'		=> '<strong>Edited imageset details</strong><br />» %s',
-	'LOG_IMAGESET_EDIT'				=> '<strong>Edited imageset</strong><br />» %s',
-	'LOG_IMAGESET_EXPORT'			=> '<strong>Exported imageset</strong><br />» %s',
-	'LOG_IMAGESET_LANG_MISSING'		=> '<strong>Imageset misses “%2$s” localisation</strong><br />» %1$s',
-	'LOG_IMAGESET_LANG_REFRESHED'	=> '<strong>Refreshed “%2$s” localisation of imageset</strong><br />» %1$s',
-	'LOG_IMAGESET_REFRESHED'		=> '<strong>Refreshed imageset</strong><br />» %s',
-
 	'LOG_INACTIVE_ACTIVATE'	=> '<strong>Activated inactive users</strong><br />» %s',
 	'LOG_INACTIVE_DELETE'	=> '<strong>Deleted inactive users</strong><br />» %s',
 	'LOG_INACTIVE_REMIND'	=> '<strong>Sent reminder e-mails to inactive users</strong><br />» %s',
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 2037a2455d..c450dcadeb 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -36,12 +36,9 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 $lang = array_merge($lang, array(
-	'ACP_IMAGESETS_EXPLAIN'	=> 'Imagesets comprise all the button, forum, folder, etc. and other non-style specific images used by the board. Here you can edit, export or delete existing imagesets and import or activate new sets.',
-	'ACP_STYLES_EXPLAIN'	=> 'Here you can manage the available styles on your board. A style consists of a template, theme and imageset. You may alter existing styles, delete, deactivate, reactivate, create or import new ones. You can also see what a style will look like using the preview function. The current default style is noted by the presence of an asterisk (*). Also listed is the total user count for each style, note that overriding user styles will not be reflected here.',
+	'ACP_STYLES_EXPLAIN'	=> 'Here you can manage the available styles on your board. A style consists of a template and theme. You may alter existing styles, delete, deactivate, reactivate, create or import new ones. You can also see what a style will look like using the preview function. The current default style is noted by the presence of an asterisk (*). Also listed is the total user count for each style, note that overriding user styles will not be reflected here.',
 	'ACP_TEMPLATES_EXPLAIN'	=> 'A template set comprises all the markup used to generate the layout of your board. Here you can edit existing template sets, delete, export, import and preview sets. You can also modify the templating code used to generate BBCode.',
 	'ACP_THEMES_EXPLAIN'	=> 'From here you can create, install, edit, delete and export themes. A theme is the combination of colours and images that are applied to your templates to define the basic look of your board. The range of options open to you depends on the configuration of your server and phpBB installation, see the manual for further details. Please note that when creating new themes the use of an existing theme as a basis is optional.',
-	'ADD_IMAGESET'			=> 'Create imageset',
-	'ADD_IMAGESET_EXPLAIN'	=> 'Here you can create a new imageset. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this imageset on an existing one. You may also be able to upload or import (from the store directory) a imageset archive. If you upload or import an archive the imageset name can be optionally taken from the archive name (to do this leave the imageset name blank).',
 	'ADD_STYLE'				=> 'Create style',
 	'ADD_STYLE_EXPLAIN'		=> 'Here you can create a new style. Depending on your server configuration and file permissions you may have additional options. For example you may be able to base this style on an existing one. You may also be able to upload or import (from the store directory) a style archive. If you upload or import an archive the style name will be determined automatically.',
 	'ADD_TEMPLATE'			=> 'Create template',
@@ -62,12 +59,10 @@ $lang = array_merge($lang, array(
 	'CACHE_FILENAME'				=> 'Template file',
 	'CACHE_FILESIZE'				=> 'File size',
 	'CACHE_MODIFIED'				=> 'Modified',
-	'CONFIRM_IMAGESET_REFRESH'		=> 'Are you sure you wish to refresh all imageset data? The settings from the imageset configuration file will overwrite all modifications to the imageset which have been carried out with the imageset editor.',
 	'CONFIRM_TEMPLATE_CLEAR_CACHE'	=> 'Are you sure you wish to clear all cached versions of your template files?',
 	'CONFIRM_TEMPLATE_REFRESH'		=> 'Are you sure you wish to refresh all template data in the database with the contents of the template files on the filesystem? This will overwrite all modifications which have been carried out with the template editor while the template was stored in the database.',
 	'CONFIRM_THEME_REFRESH'			=> 'Are you sure you wish to refresh the theme data stored in the database with the contents of the theme on the filesystem? This will overwrite all modifications which have been carried out with the theme editor while the theme was stored in the database.',
 	'COPYRIGHT'						=> 'Copyright',
-	'CREATE_IMAGESET'				=> 'Create new imageset',
 	'CREATE_STYLE'					=> 'Create new style',
 	'CREATE_TEMPLATE'				=> 'Create new template set',
 	'CREATE_THEME'					=> 'Create new theme',
@@ -75,8 +70,6 @@ $lang = array_merge($lang, array(
 
 	'DEACTIVATE_DEFAULT'		=> 'You cannot deactivate the default style.',
 	'DELETE_FROM_FS'			=> 'Delete from filesystem',
-	'DELETE_IMAGESET'			=> 'Delete imageset',
-	'DELETE_IMAGESET_EXPLAIN'	=> 'Here you can remove the selected imageset from the database. Please note that there is no undo capability. It is recommended that you first export your set for possible future use.',
 	'DELETE_STYLE'				=> 'Delete style',
 	'DELETE_STYLE_EXPLAIN'		=> 'Here you can remove the selected style. Take care in deleting styles, there is no undo capability.',
 	'DELETE_TEMPLATE'			=> 'Delete template',
@@ -87,16 +80,12 @@ $lang = array_merge($lang, array(
 	'DIMENSIONS_EXPLAIN'		=> 'Selecting yes here will include width/height parameters.',
 
 
-	'EDIT_DETAILS_IMAGESET'				=> 'Edit imageset details',
-	'EDIT_DETAILS_IMAGESET_EXPLAIN'		=> 'Here you can edit certain imageset details such as its name.',
 	'EDIT_DETAILS_STYLE'				=> 'Edit style',
-	'EDIT_DETAILS_STYLE_EXPLAIN'		=> 'Using the form below you can modify this existing style. You may alter the combination of template, theme and imageset which define the style itself. You may also make the style the default one.',
+	'EDIT_DETAILS_STYLE_EXPLAIN'		=> 'Using the form below you can modify this existing style. You may alter the combination of template and theme which define the style itself. You may also make the style the default one.',
 	'EDIT_DETAILS_TEMPLATE'				=> 'Edit template details',
 	'EDIT_DETAILS_TEMPLATE_EXPLAIN'		=> 'Here you can edit certain template details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your template set can be written to by the web server.',
 	'EDIT_DETAILS_THEME'				=> 'Edit theme details',
 	'EDIT_DETAILS_THEME_EXPLAIN'		=> 'Here you can edit certain theme details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your stylesheet can be written to by the web server.',
-	'EDIT_IMAGESET'						=> 'Edit imageset',
-	'EDIT_IMAGESET_EXPLAIN'				=> 'Here you can edit the individual images which define the imageset. You can also specify dimensions for the image. Dimensions are optional, specifying them can overcome certain rendering issues with some browsers. By not specifying them you reduce the size of the database record a little.',
 	'EDIT_TEMPLATE'						=> 'Edit template',
 	'EDIT_TEMPLATE_EXPLAIN'				=> 'Here you can edit your template set directly. Please remember that these edits are permanent and cannot be undone once submitted. If PHP can write to the template files in your styles directory any changes here will be written directly to those files. If PHP cannot write to those files they will be copied into the database and all changes will only be reflected there. Please take care when editing your template set, remember to close all replacement variable terms {XXXX} and conditional statements.',
 	'EDIT_TEMPLATE_STORED_DB'			=> 'The template file was unwritable so the template set is now stored in the database containing the modified file.',
@@ -123,24 +112,7 @@ $lang = array_merge($lang, array(
 	'IMAGE_NAME'				=> 'Image name',
 	'IMAGE_PARAMETER'			=> 'Parameter',
 	'IMAGE_VALUE'				=> 'Value',
-	'IMAGESET_ADDED'			=> 'New imageset added on filesystem.',
-	'IMAGESET_ADDED_DB'			=> 'New imageset added to database.',
-	'IMAGESET_DELETED'			=> 'Imageset deleted successfully.',
-	'IMAGESET_DELETED_FS'		=> 'Imageset removed from database but some files may remain on the filesystem.',
-	'IMAGESET_DETAILS_UPDATED'	=> 'Imageset details successfully updated.',
-	'IMAGESET_ERR_ARCHIVE'		=> 'Please select an archive method.',
-	'IMAGESET_ERR_COPY_LONG'	=> 'The copyright can be no longer than 60 characters.',
-	'IMAGESET_ERR_NAME_CHARS'	=> 'The imageset name can only contain alphanumeric characters, -, +, _ and space.',
-	'IMAGESET_ERR_NAME_EXIST'	=> 'A imageset with that name already exists.',
-	'IMAGESET_ERR_NAME_LONG'	=> 'The imageset name can be no longer than 30 characters.',
-	'IMAGESET_ERR_NOT_IMAGESET'	=> 'The archive you specified does not contain a valid imageset.',
-	'IMAGESET_ERR_STYLE_NAME'	=> 'You must supply a name for this imageset.',
-	'IMAGESET_EXPORT'			=> 'Export imageset',
-	'IMAGESET_EXPORT_EXPLAIN'	=> 'Here you can export an imageset in the form of an archive. This archive will contain all the data necessary to install the set of images on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
-	'IMAGESET_EXPORTED'			=> 'Imageset exported successfully and stored in %s.',
-	'IMAGESET_NAME'				=> 'Imageset name',
-	'IMAGESET_REFRESHED'		=> 'Imageset refreshed successfully.',
-	'IMAGESET_UPDATED'			=> 'Imageset updated successfully.',
+
 	'ITALIC'					=> 'Italic',
 
 	'IMG_CAT_BUTTONS'		=> 'Localised buttons',
@@ -268,24 +240,19 @@ $lang = array_merge($lang, array(
 	'IMG_USER_ICON10'		=> 'User defined image 10',
 
 	'INCLUDE_DIMENSIONS'		=> 'Include dimensions',
-	'INCLUDE_IMAGESET'			=> 'Include imageset',
 	'INCLUDE_TEMPLATE'			=> 'Include template',
 	'INCLUDE_THEME'				=> 'Include theme',
 	'INHERITING_FROM'			=> 'Inherits from',
-	'INSTALL_IMAGESET'			=> 'Install imageset',
-	'INSTALL_IMAGESET_EXPLAIN'	=> 'Here you can install your selected imageset. You can edit certain details if you wish or use the installation defaults.',
 	'INSTALL_STYLE'				=> 'Install style',
 	'INSTALL_STYLE_EXPLAIN'		=> 'Here you can install a new style and if appropriate the corresponding style elements. If you already have the relevant style elements installed they will not be overwritten. Some styles require existing style elements to already be installed. If you try installing such a style and do not have the required elements you will be notified.',
 	'INSTALL_TEMPLATE'			=> 'Install Template',
 	'INSTALL_TEMPLATE_EXPLAIN'	=> 'Here you can install a new template set. Depending on your server configuration you may have a number of options here.',
 	'INSTALL_THEME'				=> 'Install theme',
 	'INSTALL_THEME_EXPLAIN'		=> 'Here you can install your selected theme. You can edit certain details if you wish or use the installation defaults.',
-	'INSTALLED_IMAGESET'		=> 'Installed imagesets',
 	'INSTALLED_STYLE'			=> 'Installed styles',
 	'INSTALLED_TEMPLATE'		=> 'Installed templates',
 	'INSTALLED_THEME'			=> 'Installed themes',
 
-	'KEEP_IMAGESET'				=> 'Keep “%s” imageset',
 	'KEEP_TEMPLATE'				=> 'Keep “%s” template',
 	'KEEP_THEME'				=> 'Keep “%s” theme',
 
@@ -294,19 +261,16 @@ $lang = array_merge($lang, array(
 	'LOCATION_DISABLED_EXPLAIN'	=> 'This setting is inherited and cannot be changed.',
 
 	'NO_CLASS'					=> 'Cannot find class in stylesheet.',
-	'NO_IMAGESET'				=> 'Cannot find imageset on filesystem.',
 	'NO_IMAGE'					=> 'No image',
 	'NO_IMAGE_ERROR'			=> 'Cannot find image on filesystem.',
 	'NO_STYLE'					=> 'Cannot find style on filesystem.',
 	'NO_TEMPLATE'				=> 'Cannot find template on filesystem.',
 	'NO_THEME'					=> 'Cannot find theme on filesystem.',
-	'NO_UNINSTALLED_IMAGESET'	=> 'No uninstalled imagesets detected.',
 	'NO_UNINSTALLED_STYLE'		=> 'No uninstalled styles detected.',
 	'NO_UNINSTALLED_TEMPLATE'	=> 'No uninstalled templates detected.',
 	'NO_UNINSTALLED_THEME'		=> 'No uninstalled themes detected.',
 	'NO_UNIT'					=> 'None',
 
-	'ONLY_IMAGESET'			=> 'This is the only remaining imageset, you cannot delete it.',
 	'ONLY_STYLE'			=> 'This is the only remaining style, you cannot delete it.',
 	'ONLY_TEMPLATE'			=> 'This is the only remaining template set, you cannot delete it.',
 	'ONLY_THEME'			=> 'This is the only remaining theme, you cannot delete it.',
@@ -317,8 +281,6 @@ $lang = array_merge($lang, array(
 	'REPEAT_X'					=> 'Only horizontally',
 	'REPEAT_Y'					=> 'Only vertically',
 	'REPEAT_ALL'				=> 'Both directions',
-	'REPLACE_IMAGESET'			=> 'Replace imageset with',
-	'REPLACE_IMAGESET_EXPLAIN'	=> 'This imageset will replace the one you are deleting in any styles that use it.',
 	'REPLACE_STYLE'				=> 'Replace style with',
 	'REPLACE_STYLE_EXPLAIN'		=> 'This style will replace the one being deleted for members that use it.',
 	'REPLACE_TEMPLATE'			=> 'Replace template with',
@@ -326,7 +288,6 @@ $lang = array_merge($lang, array(
 	'REPLACE_THEME'				=> 'Replace theme with',
 	'REPLACE_THEME_EXPLAIN'		=> 'This theme will replace the one you are deleting in any styles that use it.',
 	'REPLACE_WITH_OPTION'		=> 'Replace with “%s”',
-	'REQUIRES_IMAGESET'			=> 'This style requires the %s imageset to be installed.',
 	'REQUIRES_TEMPLATE'			=> 'This style requires the %s template set to be installed.',
 	'REQUIRES_THEME'			=> 'This style requires the %s theme to be installed.',
 
@@ -334,7 +295,6 @@ $lang = array_merge($lang, array(
 	'SELECT_TEMPLATE'			=> 'Select template file',
 	'SELECT_THEME'				=> 'Select theme file',
 	'SELECTED_IMAGE'			=> 'Selected image',
-	'SELECTED_IMAGESET'			=> 'Selected imageset',
 	'SELECTED_TEMPLATE'			=> 'Selected template',
 	'SELECTED_TEMPLATE_FILE'	=> 'Selected template file',
 	'SELECTED_THEME'			=> 'Selected theme',
@@ -354,13 +314,12 @@ $lang = array_merge($lang, array(
 	'STYLE_ERR_NAME_CHARS'		=> 'The style name can only contain alphanumeric characters, -, +, _ and space.',
 	'STYLE_ERR_NAME_EXIST'		=> 'A style with that name already exists.',
 	'STYLE_ERR_NAME_LONG'		=> 'The style name can be no longer than 30 characters.',
-	'STYLE_ERR_NO_IDS'			=> 'You must select a template, theme and imageset for this style.',
+	'STYLE_ERR_NO_IDS'			=> 'You must select a template and theme for this style.',
 	'STYLE_ERR_NOT_STYLE'		=> 'The imported or uploaded file did not contain a valid style archive.',
 	'STYLE_ERR_STYLE_NAME'		=> 'You must supply a name for this style.',
 	'STYLE_EXPORT'				=> 'Export style',
-	'STYLE_EXPORT_EXPLAIN'		=> 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme and imageset for a commonly used template you could simply export the theme and imageset and omit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
+	'STYLE_EXPORT_EXPLAIN'		=> 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme for a commonly used template you could simply export the theme and omit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
 	'STYLE_EXPORTED'			=> 'Style exported successfully and stored in %s.',
-	'STYLE_IMAGESET'			=> 'Imageset',
 	'STYLE_NAME'				=> 'Style name',
 	'STYLE_TEMPLATE'			=> 'Template',
 	'STYLE_THEME'				=> 'Theme',
@@ -427,7 +386,6 @@ $lang = array_merge($lang, array(
 	'THEME_UPDATED'				=> 'Theme updated successfully.',
 
 	'UNDERLINE'				=> 'Underline',
-	'UNINSTALLED_IMAGESET'	=> 'Uninstalled imagesets',
 	'UNINSTALLED_STYLE'		=> 'Uninstalled styles',
 	'UNINSTALLED_TEMPLATE'	=> 'Uninstalled templates',
 	'UNINSTALLED_THEME'		=> 'Uninstalled themes',
-- 
cgit v1.2.1


From 9e4349e7faac65403de02fd090a837fee92b764a Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Thu, 4 Sep 2008 11:39:25 +0000
Subject: [feature/remove-db-styles] Removed database storage of style
 components.

The bulk of database storage of templates is removed, rendering template
stored in the database as useless.

Theme database storage is reduced to a skeleton for full removal soon.

This commit was cherry picked from the old feature/ascraeus-experiment branch
the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.

PHPBB3-9741
---
 phpBB/language/en/acp/styles.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index c450dcadeb..32c82de45d 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -60,7 +60,6 @@ $lang = array_merge($lang, array(
 	'CACHE_FILESIZE'				=> 'File size',
 	'CACHE_MODIFIED'				=> 'Modified',
 	'CONFIRM_TEMPLATE_CLEAR_CACHE'	=> 'Are you sure you wish to clear all cached versions of your template files?',
-	'CONFIRM_TEMPLATE_REFRESH'		=> 'Are you sure you wish to refresh all template data in the database with the contents of the template files on the filesystem? This will overwrite all modifications which have been carried out with the template editor while the template was stored in the database.',
 	'CONFIRM_THEME_REFRESH'			=> 'Are you sure you wish to refresh the theme data stored in the database with the contents of the theme on the filesystem? This will overwrite all modifications which have been carried out with the theme editor while the theme was stored in the database.',
 	'COPYRIGHT'						=> 'Copyright',
 	'CREATE_STYLE'					=> 'Create new style',
@@ -88,7 +87,6 @@ $lang = array_merge($lang, array(
 	'EDIT_DETAILS_THEME_EXPLAIN'		=> 'Here you can edit certain theme details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your stylesheet can be written to by the web server.',
 	'EDIT_TEMPLATE'						=> 'Edit template',
 	'EDIT_TEMPLATE_EXPLAIN'				=> 'Here you can edit your template set directly. Please remember that these edits are permanent and cannot be undone once submitted. If PHP can write to the template files in your styles directory any changes here will be written directly to those files. If PHP cannot write to those files they will be copied into the database and all changes will only be reflected there. Please take care when editing your template set, remember to close all replacement variable terms {XXXX} and conditional statements.',
-	'EDIT_TEMPLATE_STORED_DB'			=> 'The template file was unwritable so the template set is now stored in the database containing the modified file.',
 	'EDIT_THEME'						=> 'Edit theme',
 	'EDIT_THEME_EXPLAIN'				=> 'Here you can edit the selected theme, changing colours, images, etc.',
 	'EDIT_THEME_STORED_DB'				=> 'The stylesheet file was unwritable so the stylesheet is now stored in the database containing your modification.',
@@ -326,7 +324,6 @@ $lang = array_merge($lang, array(
 	'STYLE_USED_BY'				=> 'Used by (including robots)',
 
 	'TEMPLATE_ADDED'			=> 'Template set added and stored on filesystem.',
-	'TEMPLATE_ADDED_DB'			=> 'Template set added and stored in database.',
 	'TEMPLATE_CACHE'			=> 'Template cache',
 	'TEMPLATE_CACHE_EXPLAIN'	=> 'By default phpBB caches the compiled version of its templates. This decreases the load on the server each time a page is viewed and thus may reduce the page generation time. Here you can view the cache status of each file and delete individual files or the entire cache.',
 	'TEMPLATE_CACHE_CLEARED'	=> 'Template cache cleared successfully.',
@@ -356,7 +353,6 @@ $lang = array_merge($lang, array(
 	'TEMPLATE_LOCATION_EXPLAIN'	=> 'Images are always stored on the filesystem.',
 	'TEMPLATE_NAME'				=> 'Template name',
 	'TEMPLATE_FILE_NOT_WRITABLE'=> 'Unable to write to template file %s. Please check the permissions for the directory and the files.',
-	'TEMPLATE_REFRESHED'		=> 'Template refreshed successfully.',
 
 	'THEME_ADDED'				=> 'New theme added on filesystem.',
 	'THEME_ADDED_DB'			=> 'New theme added to database.',
-- 
cgit v1.2.1


From 6d24a7191f2f4ba0b4cb8c079dfa0a78c3dc3ef0 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Tue, 20 Sep 2011 22:18:06 +0100
Subject: [feature/remove-db-styles] Add error if template/theme file is
 unwritable.

PHPBB3-9741
---
 phpBB/language/en/acp/styles.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 32c82de45d..b1a158d357 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -372,6 +372,7 @@ $lang = array_merge($lang, array(
 	'THEME_ERR_REFRESH_FS'		=> 'This theme is stored on the filesystem so there is no need to refresh it.',
 	'THEME_ERR_STYLE_NAME'		=> 'You must supply a name for this theme.',
 	'THEME_FILE'				=> 'Theme file',
+	'THEME_FILE_NOT_WRITABLE'	=> 'Unable to write to theme file %s. Please check the permissions for the directory and the files.',
 	'THEME_EXPORT'				=> 'Export Theme',
 	'THEME_EXPORT_EXPLAIN'		=> 'Here you can export a theme in the form of an archive. This archive will contain all the data necessary to install the theme on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
 	'THEME_EXPORTED'			=> 'Theme exported successfully and stored in %s.',
-- 
cgit v1.2.1


From 58c3556e193d98d15557fe7da029829c83a08163 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Tue, 20 Sep 2011 22:42:17 +0100
Subject: [feature/remove-db-styles] Mark log entrys as deprecated.

PHPBB3-9741
---
 phpBB/language/en/acp/common.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index cca928831f..0bc27b780d 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -675,22 +675,28 @@ $lang = array_merge($lang, array(
 	'LOG_STYLE_EDIT_DETAILS'	=> '<strong>Edited style</strong><br />» %s',
 	'LOG_STYLE_EXPORT'			=> '<strong>Exported style</strong><br />» %s',
 
+	// @deprecated 3.1
 	'LOG_TEMPLATE_ADD_DB'			=> '<strong>Added new template set to database</strong><br />» %s',
+	// @deprecated 3.1
 	'LOG_TEMPLATE_ADD_FS'			=> '<strong>Add new template set on filesystem</strong><br />» %s',
 	'LOG_TEMPLATE_CACHE_CLEARED'	=> '<strong>Deleted cached versions of template files in template set <em>%1$s</em></strong><br />» %2$s',
 	'LOG_TEMPLATE_DELETE'			=> '<strong>Deleted template set</strong><br />» %s',
 	'LOG_TEMPLATE_EDIT'				=> '<strong>Edited template set <em>%1$s</em></strong><br />» %2$s',
 	'LOG_TEMPLATE_EDIT_DETAILS'		=> '<strong>Edited template details</strong><br />» %s',
 	'LOG_TEMPLATE_EXPORT'			=> '<strong>Exported template set</strong><br />» %s',
+	// @deprecated 3.1
 	'LOG_TEMPLATE_REFRESHED'		=> '<strong>Refreshed template set</strong><br />» %s',
 
+	// @deprecated 3.1
 	'LOG_THEME_ADD_DB'			=> '<strong>Added new theme to database</strong><br />» %s',
+	// @deprecated 3.1
 	'LOG_THEME_ADD_FS'			=> '<strong>Add new theme on filesystem</strong><br />» %s',
 	'LOG_THEME_DELETE'			=> '<strong>Theme deleted</strong><br />» %s',
 	'LOG_THEME_EDIT_DETAILS'	=> '<strong>Edited theme details</strong><br />» %s',
 	'LOG_THEME_EDIT'			=> '<strong>Edited theme <em>%1$s</em></strong>',
 	'LOG_THEME_EDIT_FILE'		=> '<strong>Edited theme <em>%1$s</em></strong><br />» Modified file <em>%2$s</em>',
 	'LOG_THEME_EXPORT'			=> '<strong>Exported theme</strong><br />» %s',
+	// @deprecated 3.1
 	'LOG_THEME_REFRESHED'		=> '<strong>Refreshed theme</strong><br />» %s',
 
 	'LOG_UPDATE_DATABASE'	=> '<strong>Updated Database from version %1$s to version %2$s</strong>',
-- 
cgit v1.2.1


From 8b219832225bdad9e046a93c966e89c923c6e11e Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Tue, 20 Sep 2011 22:42:52 +0100
Subject: [feature/remove-db-styles] Update language to reflect removal of db
 storage.

PHPBB3-9741
---
 phpBB/language/en/acp/styles.php | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index b1a158d357..16b499e7f0 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -60,7 +60,6 @@ $lang = array_merge($lang, array(
 	'CACHE_FILESIZE'				=> 'File size',
 	'CACHE_MODIFIED'				=> 'Modified',
 	'CONFIRM_TEMPLATE_CLEAR_CACHE'	=> 'Are you sure you wish to clear all cached versions of your template files?',
-	'CONFIRM_THEME_REFRESH'			=> 'Are you sure you wish to refresh the theme data stored in the database with the contents of the theme on the filesystem? This will overwrite all modifications which have been carried out with the theme editor while the theme was stored in the database.',
 	'COPYRIGHT'						=> 'Copyright',
 	'CREATE_STYLE'					=> 'Create new style',
 	'CREATE_TEMPLATE'				=> 'Create new template set',
@@ -82,15 +81,13 @@ $lang = array_merge($lang, array(
 	'EDIT_DETAILS_STYLE'				=> 'Edit style',
 	'EDIT_DETAILS_STYLE_EXPLAIN'		=> 'Using the form below you can modify this existing style. You may alter the combination of template and theme which define the style itself. You may also make the style the default one.',
 	'EDIT_DETAILS_TEMPLATE'				=> 'Edit template details',
-	'EDIT_DETAILS_TEMPLATE_EXPLAIN'		=> 'Here you can edit certain template details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your template set can be written to by the web server.',
+	'EDIT_DETAILS_TEMPLATE_EXPLAIN'		=> 'Here you can edit certain template details such as its name.',
 	'EDIT_DETAILS_THEME'				=> 'Edit theme details',
-	'EDIT_DETAILS_THEME_EXPLAIN'		=> 'Here you can edit certain theme details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your stylesheet can be written to by the web server.',
+	'EDIT_DETAILS_THEME_EXPLAIN'		=> 'Here you can edit certain theme details such as its name.',
 	'EDIT_TEMPLATE'						=> 'Edit template',
-	'EDIT_TEMPLATE_EXPLAIN'				=> 'Here you can edit your template set directly. Please remember that these edits are permanent and cannot be undone once submitted. If PHP can write to the template files in your styles directory any changes here will be written directly to those files. If PHP cannot write to those files they will be copied into the database and all changes will only be reflected there. Please take care when editing your template set, remember to close all replacement variable terms {XXXX} and conditional statements.',
+	'EDIT_TEMPLATE_EXPLAIN'				=> 'Here you can edit your template set directly. Please remember that these edits are permanent and cannot be undone once submitted. Please take care when editing your template set, remember to close all replacement variable terms {XXXX} and conditional statements.',
 	'EDIT_THEME'						=> 'Edit theme',
 	'EDIT_THEME_EXPLAIN'				=> 'Here you can edit the selected theme, changing colours, images, etc.',
-	'EDIT_THEME_STORED_DB'				=> 'The stylesheet file was unwritable so the stylesheet is now stored in the database containing your modification.',
-	'EDIT_THEME_STORE_PARSED'			=> 'The theme requires that its stylesheet is parsed. This is only possible if it’s stored in the database.',
 	'EDITOR_DISABLED'					=> 'The template editor is disabled.',
 	'EXPORT'							=> 'Export',
 
@@ -256,7 +253,6 @@ $lang = array_merge($lang, array(
 
 	'LINE_SPACING'				=> 'Line spacing',
 	'LOCALISED_IMAGES'			=> 'Localised',
-	'LOCATION_DISABLED_EXPLAIN'	=> 'This setting is inherited and cannot be changed.',
 
 	'NO_CLASS'					=> 'Cannot find class in stylesheet.',
 	'NO_IMAGE'					=> 'No image',
@@ -297,7 +293,6 @@ $lang = array_merge($lang, array(
 	'SELECTED_TEMPLATE_FILE'	=> 'Selected template file',
 	'SELECTED_THEME'			=> 'Selected theme',
 	'SELECTED_THEME_FILE'		=> 'Selected theme file',
-	'STORE_DATABASE'			=> 'Database',
 	'STORE_FILESYSTEM'			=> 'Filesystem',
 	'STYLE_ACTIVATE'			=> 'Activate',
 	'STYLE_ACTIVE'				=> 'Active',
@@ -323,14 +318,14 @@ $lang = array_merge($lang, array(
 	'STYLE_THEME'				=> 'Theme',
 	'STYLE_USED_BY'				=> 'Used by (including robots)',
 
-	'TEMPLATE_ADDED'			=> 'Template set added and stored on filesystem.',
+	'TEMPLATE_ADDED'			=> 'Template set added.',
 	'TEMPLATE_CACHE'			=> 'Template cache',
 	'TEMPLATE_CACHE_EXPLAIN'	=> 'By default phpBB caches the compiled version of its templates. This decreases the load on the server each time a page is viewed and thus may reduce the page generation time. Here you can view the cache status of each file and delete individual files or the entire cache.',
 	'TEMPLATE_CACHE_CLEARED'	=> 'Template cache cleared successfully.',
 	'TEMPLATE_CACHE_EMPTY'		=> 'There are no cached templates.',
 	'TEMPLATE_DELETED'			=> 'Template set deleted successfully.',
 	'TEMPLATE_DELETE_DEPENDENT'	=> 'The template set cannot be deleted as there are one or more other template sets inheriting from it:',
-	'TEMPLATE_DELETED_FS'		=> 'Template set removed from database but some files may remain on the filesystem.',
+	'TEMPLATE_DELETED_FS'		=> 'Template set removed from database but files remain on the filesystem.',
 	'TEMPLATE_DETAILS_UPDATED'	=> 'Template details successfully updated.',
 	'TEMPLATE_EDITOR'			=> 'Raw HTML template editor',
 	'TEMPLATE_EDITOR_HEIGHT'	=> 'Template editor height',
@@ -349,13 +344,10 @@ $lang = array_merge($lang, array(
 	'TEMPLATE_FILE'				=> 'Template file',
 	'TEMPLATE_FILE_UPDATED'		=> 'Template file updated successfully.',
 	'TEMPLATE_INHERITS'			=> 'This template sets inherits from %s and thus cannot have a different storage setting than its super template.',
-	'TEMPLATE_LOCATION'			=> 'Store templates in',
-	'TEMPLATE_LOCATION_EXPLAIN'	=> 'Images are always stored on the filesystem.',
 	'TEMPLATE_NAME'				=> 'Template name',
 	'TEMPLATE_FILE_NOT_WRITABLE'=> 'Unable to write to template file %s. Please check the permissions for the directory and the files.',
 
-	'THEME_ADDED'				=> 'New theme added on filesystem.',
-	'THEME_ADDED_DB'			=> 'New theme added to database.',
+	'THEME_ADDED'				=> 'New theme added.',
 	'THEME_CLASS_ADDED'			=> 'Custom class added successfully.',
 	'THEME_DELETED'				=> 'Theme deleted successfully.',
 	'THEME_DELETED_FS'			=> 'Theme removed from database but files remain on the filesystem.',
@@ -369,17 +361,13 @@ $lang = array_merge($lang, array(
 	'THEME_ERR_NAME_EXIST'		=> 'A theme with that name already exists.',
 	'THEME_ERR_NAME_LONG'		=> 'The theme name can be no longer than 30 characters.',
 	'THEME_ERR_NOT_THEME'		=> 'The archive you specified does not contain a valid theme.',
-	'THEME_ERR_REFRESH_FS'		=> 'This theme is stored on the filesystem so there is no need to refresh it.',
 	'THEME_ERR_STYLE_NAME'		=> 'You must supply a name for this theme.',
 	'THEME_FILE'				=> 'Theme file',
 	'THEME_FILE_NOT_WRITABLE'	=> 'Unable to write to theme file %s. Please check the permissions for the directory and the files.',
 	'THEME_EXPORT'				=> 'Export Theme',
 	'THEME_EXPORT_EXPLAIN'		=> 'Here you can export a theme in the form of an archive. This archive will contain all the data necessary to install the theme on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
 	'THEME_EXPORTED'			=> 'Theme exported successfully and stored in %s.',
-	'THEME_LOCATION'			=> 'Store stylesheet in',
-	'THEME_LOCATION_EXPLAIN'	=> 'Images are always stored on the filesystem.',
 	'THEME_NAME'				=> 'Theme name',
-	'THEME_REFRESHED'			=> 'Theme refreshed successfully.',
 	'THEME_UPDATED'				=> 'Theme updated successfully.',
 
 	'UNDERLINE'				=> 'Underline',
-- 
cgit v1.2.1


From 56c6476233646e7c735aa4e3b98c4a6b62df5c7d Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 25 Sep 2011 15:12:56 -0700
Subject: [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Add an option to the ACP so admins can choose to host jQuery
from the local version shipped with phpBB, or via a popular CDN.

PHPBB3-10390
---
 phpBB/language/en/acp/board.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index abf346137d..4da069f68f 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -549,3 +549,13 @@ $lang = array_merge($lang, array(
 	'JAB_USERNAME'				=> 'Jabber username or JID',
 	'JAB_USERNAME_EXPLAIN'		=> 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.',
 ));
+
+// jQuery settings
+$lang = array_merge($lang, array(
+	'JQUERY_HOST'			=> 'jQuery server',
+	'JQUERY_HOST_EXPLAIN'	=> 'Load jQuery from your local server, or choose a remote copy hosted on a CDN (Content Delivery Network). If the CDN fails, phpBB will fall back to the local copy.',
+	'JQUERY_HOST_LOCAL'		=> 'Localhost',
+	'JQUERY_HOST_GOOGLE'	=> 'Google Ajax API CDN',
+	'JQUERY_HOST_JQUERY'	=> 'jQuery CDN',
+	'JQUERY_HOST_MS'		=> 'Microsoft CDN',
+));
-- 
cgit v1.2.1


From d4fe81f8f0458b46b1bfe086c5a34af38e5af618 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 25 Sep 2011 18:16:46 -0700
Subject: [ticket/10390] Fix a type-o - captialize AJAX

AJAX should be capitalized where it appears in the ACP as the
option: "Google AJAX API CDN"

PHPBB3-10390
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 4da069f68f..1bab87b37f 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -555,7 +555,7 @@ $lang = array_merge($lang, array(
 	'JQUERY_HOST'			=> 'jQuery server',
 	'JQUERY_HOST_EXPLAIN'	=> 'Load jQuery from your local server, or choose a remote copy hosted on a CDN (Content Delivery Network). If the CDN fails, phpBB will fall back to the local copy.',
 	'JQUERY_HOST_LOCAL'		=> 'Localhost',
-	'JQUERY_HOST_GOOGLE'	=> 'Google Ajax API CDN',
+	'JQUERY_HOST_GOOGLE'	=> 'Google AJAX API CDN',
 	'JQUERY_HOST_JQUERY'	=> 'jQuery CDN',
 	'JQUERY_HOST_MS'		=> 'Microsoft CDN',
 ));
-- 
cgit v1.2.1


From 81e8faecbcc4f8c22a1dafdefe848ac548a6c77a Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 25 Sep 2011 19:09:29 -0700
Subject: [ticket/10390] Reword the language for jQuery host/server options

Reword some of the language used for the description and pull-down options
to try and make it more clear to users that they have the option to use
jQuery from their own server with the copy included with phpBB, or from one
of the remote CDN servers.

PHPBB3-10390
---
 phpBB/language/en/acp/board.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 1bab87b37f..7a028b4064 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -552,10 +552,10 @@ $lang = array_merge($lang, array(
 
 // jQuery settings
 $lang = array_merge($lang, array(
-	'JQUERY_HOST'			=> 'jQuery server',
-	'JQUERY_HOST_EXPLAIN'	=> 'Load jQuery from your local server, or choose a remote copy hosted on a CDN (Content Delivery Network). If the CDN fails, phpBB will fall back to the local copy.',
-	'JQUERY_HOST_LOCAL'		=> 'Localhost',
-	'JQUERY_HOST_GOOGLE'	=> 'Google AJAX API CDN',
-	'JQUERY_HOST_JQUERY'	=> 'jQuery CDN',
-	'JQUERY_HOST_MS'		=> 'Microsoft CDN',
+	'JQUERY_HOST'			=> 'Load jQuery from your server or a hosted CDN',
+	'JQUERY_HOST_EXPLAIN'	=> 'Load jQuery from the copy included with phpBB on your local server, or choose a remote copy hosted on a CDN (Content Delivery Network). If the CDN fails, phpBB will fall back to the copy included with phpBB.',
+	'JQUERY_HOST_LOCAL'		=> 'Included with phpBB on my server',
+	'JQUERY_HOST_GOOGLE'	=> 'Hosted CDN: Google AJAX API',
+	'JQUERY_HOST_JQUERY'	=> 'Hosted CDN: jQuery',
+	'JQUERY_HOST_MS'		=> 'Hosted CDN: Microsoft',
 ));
-- 
cgit v1.2.1


From 2dca3c3c278e99cfd6cdbea7149063d160e4cc11 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 26 Sep 2011 20:26:32 -0700
Subject: [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP

jQuery will now be available via remote CDN from Google. Microsoft and
jQuery CDNs have been removed, so we can simplify this option for the user.
Default mode is NO so the copy of jQuery included with phpBB is served by
default.

PHPBB3-10390
---
 phpBB/language/en/acp/board.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 7a028b4064..07102d4db3 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -356,6 +356,8 @@ $lang = array_merge($lang, array(
 	'LOAD_CPF_PM'					=> 'Display custom profile fields in private messages',
 	'LOAD_CPF_VIEWPROFILE'			=> 'Display custom profile fields in user profiles',
 	'LOAD_CPF_VIEWTOPIC'			=> 'Display custom profile fields on topic pages',
+	'LOAD_JQUERY_CDN'				=> 'Serve jQuery using Google’s CDN',
+	'LOAD_JQUERY_CDN_EXPLAIN'		=> 'If this setting is enabled, jQuery will be served from Google’s AJAX API CDN instead of the copy included with phpBB on your server. If the CDN fails, phpBB will attempt to fallback to the copy included with phpBB.',
 	'LOAD_USER_ACTIVITY'			=> 'Show user’s activity',
 	'LOAD_USER_ACTIVITY_EXPLAIN'	=> 'Displays active topic/forum in user profiles and user control panel. It is recommended to disable this on boards with more than one million posts.',
 	'RECOMPILE_STYLES'				=> 'Recompile stale style components',
@@ -549,13 +551,3 @@ $lang = array_merge($lang, array(
 	'JAB_USERNAME'				=> 'Jabber username or JID',
 	'JAB_USERNAME_EXPLAIN'		=> 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.',
 ));
-
-// jQuery settings
-$lang = array_merge($lang, array(
-	'JQUERY_HOST'			=> 'Load jQuery from your server or a hosted CDN',
-	'JQUERY_HOST_EXPLAIN'	=> 'Load jQuery from the copy included with phpBB on your local server, or choose a remote copy hosted on a CDN (Content Delivery Network). If the CDN fails, phpBB will fall back to the copy included with phpBB.',
-	'JQUERY_HOST_LOCAL'		=> 'Included with phpBB on my server',
-	'JQUERY_HOST_GOOGLE'	=> 'Hosted CDN: Google AJAX API',
-	'JQUERY_HOST_JQUERY'	=> 'Hosted CDN: jQuery',
-	'JQUERY_HOST_MS'		=> 'Hosted CDN: Microsoft',
-));
-- 
cgit v1.2.1


From 9bea7c327846c7281dd5d1f78322ac0016c4dfc9 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 27 Sep 2011 20:15:41 -0700
Subject: [ticket/10390] Fix wording: fallback should be fall back

PHPBB3-10390
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 07102d4db3..7ead6c6628 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -357,7 +357,7 @@ $lang = array_merge($lang, array(
 	'LOAD_CPF_VIEWPROFILE'			=> 'Display custom profile fields in user profiles',
 	'LOAD_CPF_VIEWTOPIC'			=> 'Display custom profile fields on topic pages',
 	'LOAD_JQUERY_CDN'				=> 'Serve jQuery using Google’s CDN',
-	'LOAD_JQUERY_CDN_EXPLAIN'		=> 'If this setting is enabled, jQuery will be served from Google’s AJAX API CDN instead of the copy included with phpBB on your server. If the CDN fails, phpBB will attempt to fallback to the copy included with phpBB.',
+	'LOAD_JQUERY_CDN_EXPLAIN'		=> 'If this setting is enabled, jQuery will be served from Google’s AJAX API CDN instead of the copy included with phpBB on your server. If the CDN fails, phpBB will attempt to fall back to the copy included with phpBB.',
 	'LOAD_USER_ACTIVITY'			=> 'Show user’s activity',
 	'LOAD_USER_ACTIVITY_EXPLAIN'	=> 'Displays active topic/forum in user profiles and user control panel. It is recommended to disable this on boards with more than one million posts.',
 	'RECOMPILE_STYLES'				=> 'Recompile stale style components',
-- 
cgit v1.2.1


From 65a34fd047f4ac1ff3638a568f44d3fe7d664d88 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 14 Oct 2011 00:54:11 +0200
Subject: [ticket/10410] Add option to display users in their first teampage
 group

PHPBB3-10410
---
 phpBB/language/en/acp/groups.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 11342bf4f2..28e6fb80d9 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -129,11 +129,13 @@ $lang = array_merge($lang, array(
 	'SPECIAL_GROUPS'			=> 'Pre-defined groups',
 	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
 
+	'TEAMPAGE_DISP_ALL'			=> 'All memberships',
+	'TEAMPAGE_DISP_DEFAULT'		=> 'User’s default group only',
+	'TEAMPAGE_DISP_FIRST'		=> 'First membership only',
 	'TEAMPAGE_EXPLAIN'			=> 'These are the groups which are displayed on the teampage:',
 	'TEAMPAGE_FORUMS'			=> 'Display moderated forums',
 	'TEAMPAGE_FORUMS_EXPLAIN'	=> 'If set to yes, moderators will have a list with all of the forums where they have moderator permissions displayed in their row. This can be very database intensive for big boards.',
-	'TEAMPAGE_MULTIPLE'			=> 'Display users in all groups',
-	'TEAMPAGE_MULTIPLE_EXPLAIN'	=> 'If set to no, the users will only be displayed in their primary group (If the primary group is not listed, the users will be displayed in their first displayed group).',
+	'TEAMPAGE_MEMBERSHIPS'		=> 'Display user memberships',
 	'TEAMPAGE_SETTINGS'			=> 'Teampage settings',
 	'TOTAL_MEMBERS'				=> 'Members',
 
-- 
cgit v1.2.1


From 757fcd3e63535f9fda68cf359f849a44059c7b27 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 10 Sep 2011 03:38:01 +0200
Subject: [ticket/10345] Add a system to allow multiple plural forms

See http://wiki.phpbb.com/Plural_Rules for explanation and examples.

PHPBB3-10345
---
 phpBB/language/en/common.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 44a63a6acb..57c9d916a2 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -45,6 +45,11 @@ $lang = array_merge($lang, array(
 	'DATE_FORMAT'		=> '|d M Y|',	// 01 Jan 2007 (with Relative days enabled)
 	'USER_LANG'			=> 'en-gb',
 
+	// You can define different rules for the determination of plural forms here.
+	// See http://wiki.phpbb.com/Plural_Rules for more information
+	// or ask the translation manager for help.
+	'PLURAL_RULE'		=> 1,
+
 	'1_DAY'			=> '1 day',
 	'1_MONTH'		=> '1 month',
 	'1_YEAR'		=> '1 year',
-- 
cgit v1.2.1


From f16d72fcfb9a7621bf64b82cc2c710c6e484d965 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Sep 2011 01:46:00 +0200
Subject: [ticket/10345] Fix documentation on the new function and the switch

Also do not min/max the value, but throw an error on an invalid Plural rule.

PHPBB3-10345
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 57c9d916a2..cf01c6f32e 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -285,6 +285,7 @@ $lang = array_merge($lang, array(
 	'INTERESTS'					=> 'Interests',
 	'INVALID_DIGEST_CHALLENGE'	=> 'Invalid digest challenge.',
 	'INVALID_EMAIL_LOG'			=> '<strong>%s</strong> possibly an invalid e-mail address?',
+	'INVALID_PLURAL_RULE'		=> 'The chosen plural rule is invalid. Valid values are integers between 0 and 15.',
 	'IP'						=> 'IP',
 	'IP_BLACKLISTED'			=> 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.',
 
-- 
cgit v1.2.1


From 0734dd3c42f573d819c058cd6c6b55d035d1836d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Sep 2011 15:34:40 +0200
Subject: [ticket/10345] Remove '1 hour ago' string which conflicted with
 plural rules

This message was only viewed for 1 second anyway,
as floor($delta / 60) is only 60 for 3600 to 3660,
but the code was limited to $delta <= 3600

PHPBB3-10345
---
 phpBB/language/en/common.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index cf01c6f32e..b57c2d9747 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -746,7 +746,6 @@ $lang = array_merge($lang, array(
 			0		=> 'less than a minute ago',
 			1		=> '%d minute ago',
 			2		=> '%d minutes ago',
-			60		=> '1 hour ago',
 		),
 
 		'Sunday'	=> 'Sunday',
-- 
cgit v1.2.1


From 88ae40a4b19360645d5e5a614cc378e7cce4afe3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 14 Sep 2011 00:28:52 +0200
Subject: [ticket/10345] Make use of the plural function in some basic places

PHPBB3-10345
---
 phpBB/language/en/acp/posting.php |   6 +-
 phpBB/language/en/common.php      | 159 ++++++++++++++++++++++++--------------
 phpBB/language/en/mcp.php         |  31 +++++---
 phpBB/language/en/memberlist.php  |   8 +-
 phpBB/language/en/posting.php     |  18 ++++-
 phpBB/language/en/search.php      |  19 ++++-
 phpBB/language/en/ucp.php         |  33 ++++++--
 phpBB/language/en/viewforum.php   |   7 +-
 phpBB/language/en/viewtopic.php   |  21 +++--
 9 files changed, 209 insertions(+), 93 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 16e1aaca66..7aa01469b7 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -185,7 +185,11 @@ $lang = array_merge($lang, array(
 	'SMILIES_URL'				=> 'Smiley image file',
 	'SMILIES_WIDTH'				=> 'Smiley width',
 
-	'TOO_MANY_SMILIES'			=> 'Limit of %d smilies reached.',
+	'TOO_MANY_SMILIES'			=> array(
+		0	=> 'Limit of %d smilies reached.',
+		1	=> 'Limit of %d smiley reached.',
+		2	=> 'Limit of %d smilies reached.',
+	),
 
 	'WRONG_PAK_TYPE'	=> 'The specified package does not contain the appropriate data.',
 ));
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b57c2d9747..6fcef11852 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -113,8 +113,11 @@ $lang = array_merge($lang, array(
 	'BOARD_DISABLED'		=> 'This board is currently disabled.',
 	'BOARD_UNAVAILABLE'		=> 'Sorry but the board is temporarily unavailable, please try again in a few minutes.',
 	'BROWSING_FORUM'		=> 'Users browsing this forum: %1$s',
-	'BROWSING_FORUM_GUEST'	=> 'Users browsing this forum: %1$s and %2$d guest',
-	'BROWSING_FORUM_GUESTS'	=> 'Users browsing this forum: %1$s and %2$d guests',
+	'BROWSING_FORUM_GUESTS'	=> array(
+		0	=> 'Users browsing this forum: %2$s and 0 guests',
+		1	=> 'Users browsing this forum: %2$s and %1$d guest',
+		2	=> 'Users browsing this forum: %2$s and %1$d guests',
+	),
 	'BYTES'					=> 'Bytes',
 
 	'CANCEL'				=> 'Cancel',
@@ -155,12 +158,11 @@ $lang = array_merge($lang, array(
 	'DISPLAY_TOPICS'		=> 'Display topics from previous',
 	'DOWNLOADED'			=> 'Downloaded',
 	'DOWNLOADING_FILE'		=> 'Downloading file',
-	'DOWNLOAD_COUNT'		=> 'Downloaded %d time',
-	'DOWNLOAD_COUNTS'		=> 'Downloaded %d times',
-	'DOWNLOAD_COUNT_NONE'	=> 'Not downloaded yet',
-	'VIEWED_COUNT'			=> 'Viewed %d time',
-	'VIEWED_COUNTS'			=> 'Viewed %d times',
-	'VIEWED_COUNT_NONE'		=> 'Not viewed yet',
+	'DOWNLOAD_COUNTS'		=> array(
+		0	=> 'Not downloaded yet',
+		1	=> 'Downloaded %d time',
+		2	=> 'Downloaded %d times',
+	),
 
 	'EDIT_POST'							=> 'Edit post',
 	'EMAIL'								=> 'E-mail', // Short form for EMAIL_ADDRESS
@@ -245,12 +247,16 @@ $lang = array_merge($lang, array(
 	'GROUP_ERR_USERNAME'		=> 'No group name specified.',
 	'GROUP_ERR_USER_LONG'		=> 'Group names cannot exceed 60 characters. The specified group name is too long.',
 	'GUEST'						=> 'Guest',
-	'GUEST_USERS_ONLINE'		=> 'There are %d guest users online',
-	'GUEST_USERS_TOTAL'			=> '%d guests',
-	'GUEST_USERS_ZERO_ONLINE'	=> 'There are 0 guest users online',
-	'GUEST_USERS_ZERO_TOTAL'	=> '0 guests',
-	'GUEST_USER_ONLINE'			=> 'There is %d guest user online',
-	'GUEST_USER_TOTAL'			=> '%d guest',
+	'GUEST_USERS_ONLINE'		=> array(
+		0	=> 'There are 0 guest users online',
+		1	=> 'There is %d guest user online',
+		2	=> 'There are %d guest users online',
+	),
+	'GUEST_USERS_TOTAL'			=>  array(
+		0	=> '0 guests',
+		1	=> '%d guest',
+		2	=> '%d guests',
+	),
 	'G_ADMINISTRATORS'			=> 'Administrators',
 	'G_BOTS'					=> 'Bots',
 	'G_GUESTS'					=> 'Guests',
@@ -259,15 +265,16 @@ $lang = array_merge($lang, array(
 	'G_GLOBAL_MODERATORS'		=> 'Global moderators',
 	'G_NEWLY_REGISTERED'		=> 'Newly registered users',
 
-	'HIDDEN_USERS_ONLINE'			=> '%d hidden users online',
-	'HIDDEN_USERS_TOTAL'			=> '%d hidden',
-	'HIDDEN_USERS_TOTAL_AND'		=> '%d hidden and ',
-	'HIDDEN_USERS_ZERO_ONLINE'		=> '0 hidden users online',
-	'HIDDEN_USERS_ZERO_TOTAL'		=> '0 hidden',
-	'HIDDEN_USERS_ZERO_TOTAL_AND'	=> '0 hidden and ',
-	'HIDDEN_USER_ONLINE'			=> '%d hidden user online',
-	'HIDDEN_USER_TOTAL'				=> '%d hidden',
-	'HIDDEN_USER_TOTAL_AND'			=> '%d hidden and ',
+	'HIDDEN_USERS_ONLINE'		=> array(
+		0	=> '0 hidden users',
+		1	=> '%d hidden user',
+		2	=> '%d hidden users',
+	),
+	'HIDDEN_USERS_TOTAL'		=> array(
+		0	=> '0 hidden',
+		1	=> '%d hidden',
+		2	=> '%d hidden',
+	),
 	'HIDE_GUESTS'					=> 'Hide guests',
 	'HIDE_ME'						=> 'Hide my online status this session',
 	'HOURS'							=> 'Hours',
@@ -354,8 +361,11 @@ $lang = array_merge($lang, array(
 	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
 	'NEW_MESSAGE'				=> 'New message',
 	'NEW_MESSAGES'				=> 'New messages',
-	'NEW_PM'					=> '<strong>%d</strong> new message',
-	'NEW_PMS'					=> '<strong>%d</strong> new messages',
+	'NEW_PMS'					=> array(
+		0	=> '<strong>0</strong> new messages',
+		1	=> '<strong>%d</strong> new message',
+		2	=> '<strong>%d</strong> new messages',
+	),
 	'NEW_POST'					=> 'New post',	// Not used anymore
 	'NEW_POSTS'					=> 'New posts',	// Not used anymore
 	'NEXT'						=> 'Next',		// Used in pagination
@@ -389,7 +399,6 @@ $lang = array_merge($lang, array(
 	'NO_MODE'					=> 'No mode specified.',
 	'NO_MODERATORS'				=> 'There are no moderators.',
 	'NO_NEW_MESSAGES'			=> 'No new messages',
-	'NO_NEW_PM'					=> '<strong>0</strong> new messages',
 	'NO_NEW_POSTS'				=> 'No new posts',	// Not used anymore
 	'NO_ONLINE_USERS'			=> 'No registered users',
 	'NO_POSTS'					=> 'No posts',
@@ -403,7 +412,6 @@ $lang = array_merge($lang, array(
 	'NO_TOPIC_FORUM'			=> 'The topic or forum no longer exists.',
 	'NO_TOPICS'					=> 'There are no topics or posts in this forum.',
 	'NO_TOPICS_TIME_FRAME'		=> 'No topics exist inside this forum for the selected time frame.',
-	'NO_UNREAD_PM'				=> '<strong>0</strong> unread messages',
 	'NO_UNREAD_POSTS'			=> 'No unread posts',
 	'NO_UPLOAD_FORM_FOUND'		=> 'Upload initiated but no valid file upload form found.',
 	'NO_USER'					=> 'The requested user does not exist.',
@@ -421,9 +429,18 @@ $lang = array_merge($lang, array(
 	'OFFLINE'					=> 'Offline',
 	'ONLINE'					=> 'Online',
 	'ONLINE_BUDDIES'			=> 'Online friends',
-	'ONLINE_USERS_TOTAL'		=> 'In total there are <strong>%d</strong> users online :: ',
-	'ONLINE_USERS_ZERO_TOTAL'	=> 'In total there are <strong>0</strong> users online :: ',
-	'ONLINE_USER_TOTAL'			=> 'In total there is <strong>%d</strong> user online :: ',
+	// "... :: x registered and y hidden"
+	'ONLINE_USERS_TOTAL'		=> array(
+		0	=> 'In total there are <strong>0</strong> users online :: %2$s and %3$s',
+		1	=> 'In total there is <strong>%1$d</strong> user online :: %2$s and %3$s',
+		2	=> 'In total there are <strong>%1$d</strong> users online :: %2$s and %3$s',
+	),
+	// "... :: x registered, y hidden and z guests"
+	'ONLINE_USERS_TOTAL_GUESTS'	=> array(
+		0	=> 'In total there are <strong>0</strong> users online :: %2$s, %3$s and %4$s',
+		1	=> 'In total there is <strong>%1$d</strong> user online :: %2$s, %3$s and %4$s',
+		2	=> 'In total there are <strong>%1$d</strong> users online :: %2$s, %3$s and %4$s',
+	),
 	'OPTIONS'					=> 'Options',
 
 	'PAGE_OF'				=> 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
@@ -477,15 +494,17 @@ $lang = array_merge($lang, array(
 	'REDIRECTS'					=> 'Total redirects',
 	'REGISTER'					=> 'Register',
 	'REGISTERED_USERS'			=> 'Registered users:',
-	'REG_USERS_ONLINE'			=> 'There are %d registered users and ',
-	'REG_USERS_TOTAL'			=> '%d registered, ',
-	'REG_USERS_TOTAL_AND'		=> '%d registered and ',
-	'REG_USERS_ZERO_ONLINE'		=> 'There are 0 registered users and ',
-	'REG_USERS_ZERO_TOTAL'		=> '0 registered, ',
-	'REG_USERS_ZERO_TOTAL_AND'	=> '0 registered and ',
-	'REG_USER_ONLINE'			=> 'There is %d registered user and ',
-	'REG_USER_TOTAL'			=> '%d registered, ',
-	'REG_USER_TOTAL_AND'		=> '%d registered and ',
+	// "... and 2 hidden users online"
+	'REG_USERS_ONLINE'			=> array(
+		0	=> 'There are 0 registered users and %2$s online',
+		1	=> 'There is %1$d registered user and %2$s online',
+		2	=> 'There are %1$d registered users and %2$s online',
+	),
+	'REG_USERS_TOTAL'			=> array(
+		0	=> '0 registered',
+		1	=> '%d registered',
+		2	=> '%d registered',
+	),
 	'REMOVE'					=> 'Remove',
 	'REMOVE_INSTALL'			=> 'Please delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.',
 	'REPLIES'					=> 'Replies',
@@ -637,19 +656,33 @@ $lang = array_merge($lang, array(
 	'TOPIC_TITLE'		=> 'Topic title',
 	'TOPIC_UNAPPROVED'	=> 'This topic has not been approved',
 	'TOTAL_ATTACHMENTS'	=> 'Attachment(s)',
-	'TOTAL_LOG'			=> '1 log',
-	'TOTAL_LOGS'		=> '%d logs',
-	'TOTAL_NO_PM'		=> '0 private messages in total',
-	'TOTAL_PM'			=> '1 private message in total',
-	'TOTAL_PMS'			=> '%d private messages in total',
+	'TOTAL_LOGS'		=> array(
+		0	=> '0 logs',
+		1	=> '%d log',
+		2	=> '%d logs',
+	),
+	'TOTAL_PMS'		=> array(
+		0	=> '0 private messages in total',
+		1	=> '%d private message in total',
+		2	=> '%d private messages in total',
+	),
 	'TOTAL_POSTS'		=> 'Total posts',
-	'TOTAL_POSTS_OTHER'	=> 'Total posts <strong>%d</strong>',
-	'TOTAL_POSTS_ZERO'	=> 'Total posts <strong>0</strong>',
+	'TOTAL_POSTS_COUNT'	=> array(
+		0	=> 'Total posts <strong>0</strong>',
+		1	=> 'Total posts <strong>%d</strong>',
+		2	=> 'Total posts <strong>%d</strong>',
+	),
 	'TOPIC_REPORTED'	=> 'This topic has been reported',
-	'TOTAL_TOPICS_OTHER'=> 'Total topics <strong>%d</strong>',
-	'TOTAL_TOPICS_ZERO'	=> 'Total topics <strong>0</strong>',
-	'TOTAL_USERS_OTHER'	=> 'Total members <strong>%d</strong>',
-	'TOTAL_USERS_ZERO'	=> 'Total members <strong>0</strong>',
+	'TOTAL_TOPICS'		=> array(
+		0	=> 'Total topics <strong>0</strong>',
+		1	=> 'Total topics <strong>%d</strong>',
+		2	=> 'Total topics <strong>%d</strong>',
+	),
+	'TOTAL_USERS'		=> array(
+		0	=> 'Total members <strong>0</strong>',
+		1	=> 'Total members <strong>%d</strong>',
+		2	=> 'Total members <strong>%d</strong>',
+	),
 	'TRACKED_PHP_ERROR'	=> 'Tracked PHP errors: %s',
 
 	'UNABLE_GET_IMAGE_SIZE'	=> 'It was not possible to determine the dimensions of the image.',
@@ -657,8 +690,11 @@ $lang = array_merge($lang, array(
 	'UNKNOWN_BROWSER'		=> 'Unknown browser',
 	'UNMARK_ALL'			=> 'Unmark all',
 	'UNREAD_MESSAGES'		=> 'Unread messages',
-	'UNREAD_PM'				=> '<strong>%d</strong> unread message',
-	'UNREAD_PMS'			=> '<strong>%d</strong> unread messages',
+	'UNREAD_PMS'			=> array(
+		0	=> '<strong>0</strong> unread messages',
+		1	=> '<strong>%d</strong> unread message',
+		2	=> '<strong>%d</strong> unread messages',
+	),
 	'UNREAD_POST'			=> 'Unread post',
 	'UNREAD_POSTS'			=> 'Unread posts',
 	'UNWATCH_FORUM_CONFIRM'		=> 'Are you sure you wish to unsubscribe from this forum?',
@@ -676,8 +712,11 @@ $lang = array_merge($lang, array(
 	'USERNAMES'				=> 'Usernames',
 	'USER_AVATAR'			=> 'User avatar',
 	'USER_CANNOT_READ'		=> 'You cannot read posts in this forum.',
-	'USER_POST'				=> '%d Post',
-	'USER_POSTS'			=> '%d Posts',
+	'USER_POSTS'			=> array(
+		0	=> '0 Posts',
+		1	=> '%d Post',
+		2	=> '%d Posts',
+	),
 	'USERS'					=> 'Users',
 	'USE_PERMISSIONS'		=> 'Test out user’s permissions',
 
@@ -685,6 +724,11 @@ $lang = array_merge($lang, array(
 
 	'VARIANT_DATE_SEPARATOR'	=> ' / ',	// Used in date format dropdown, eg: "Today, 13:37 / 01 Jan 2007, 13:37" ... to join a relative date with calendar date
 	'VIEWED'					=> 'Viewed',
+	'VIEWED_COUNTS'		=> array(
+		0	=> 'Not viewed yet',
+		1	=> 'Viewed %d time',
+		2	=> 'Viewed %d times',
+	),
 	'VIEWING_FAQ'				=> 'Viewing FAQ',
 	'VIEWING_MEMBERS'			=> 'Viewing member details',
 	'VIEWING_ONLINE'			=> 'Viewing who is online',
@@ -699,8 +743,11 @@ $lang = array_merge($lang, array(
 	'VIEW_LATEST_POST'			=> 'View the latest post',
 	'VIEW_NEWEST_POST'			=> 'View first unread post',
 	'VIEW_NOTES'				=> 'View user notes',
-	'VIEW_ONLINE_TIME'			=> 'based on users active over the past %d minute',
-	'VIEW_ONLINE_TIMES'			=> 'based on users active over the past %d minutes',
+	'VIEW_ONLINE_TIMES'			=> array(
+		0	=> 'based on users active over the past %d minutes',
+		1	=> 'based on users active over the past %d minute',
+		2	=> 'based on users active over the past %d minutes',
+	),
 	'VIEW_TOPIC'				=> 'View topic',
 	'VIEW_TOPIC_ANNOUNCEMENT'	=> 'Announcement: ',
 	'VIEW_TOPIC_GLOBAL'			=> 'Global Announcement: ',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 16d6db061e..2d351eb9e0 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -120,8 +120,11 @@ $lang = array_merge($lang, array(
 	'LATEST_WARNING_TIME'		=> 'Latest warning issued',
 	'LATEST_WARNINGS'			=> 'Latest 5 warnings',
 	'LEAVE_SHADOW'				=> 'Leave shadow topic in place',
-	'LIST_REPORT'				=> '1 report',
-	'LIST_REPORTS'				=> '%d reports',
+	'LIST_REPORTS'				=> array(
+		0	=> '%d reports',
+		1	=> '%d report',
+		2	=> '%d reports',
+	),
 	'LOCK'						=> 'Lock',
 	'LOCK_POST_POST'			=> 'Lock post',
 	'LOCK_POST_POST_CONFIRM'	=> 'Are you sure you want to prevent editing this post?',
@@ -251,11 +254,13 @@ $lang = array_merge($lang, array(
 	'PM_REPORT_CLOSED_SUCCESS'	=> 'The selected PM report has been closed successfully.',
 	'PM_REPORT_DELETED_SUCCESS'	=> 'The selected PM report has been deleted successfully.',
 	'PM_REPORTED_SUCCESS'		=> 'This private message has been successfully reported.',
-	'PM_REPORT_TOTAL'			=> 'In total there is <strong>1</strong> PM report to review.',
 	'PM_REPORTS_CLOSED_SUCCESS'	=> 'The selected PM reports have been closed successfully.',
 	'PM_REPORTS_DELETED_SUCCESS'=> 'The selected PM reports have been deleted successfully.',
-	'PM_REPORTS_TOTAL'			=> 'In total there are <strong>%d</strong> PM reports to review.',
-	'PM_REPORTS_ZERO_TOTAL'		=> 'There are no PM reports to review.',
+	'PM_REPORTS_TOTAL'			=> array(
+		0	=> 'There are no PM reports to review.',
+		1	=> 'In total there is <strong>1</strong> PM report to review.',
+		2	=> 'In total there are <strong>%d</strong> PM reports to review.',
+	),
 	'PM_REPORT_DETAILS'			=> 'Private message report details',
 	'POSTER'					=> 'Poster',
 	'POSTS_APPROVED_SUCCESS'	=> 'The selected posts have been approved.',
@@ -282,8 +287,11 @@ $lang = array_merge($lang, array(
 	'REPORTED_ON_DATE'			=> 'on',
 	'REPORTS_CLOSED_SUCCESS'	=> 'The selected reports have been closed successfully.',
 	'REPORTS_DELETED_SUCCESS'	=> 'The selected reports have been deleted successfully.',
-	'REPORTS_TOTAL'				=> 'In total there are <strong>%d</strong> reports to review.',
-	'REPORTS_ZERO_TOTAL'		=> 'There are no reports to review.',
+	'REPORTS_TOTAL'				=> array(
+		0	=> 'There are no reports to review.',
+		1	=> 'In total there is <strong>1</strong> report to review.',
+		2	=> 'In total there are <strong>%d</strong> reports to review.',
+	),
 	'REPORT_CLOSED'				=> 'This report has already been closed.',
 	'REPORT_CLOSED_SUCCESS'		=> 'The selected report has been closed successfully.',
 	'REPORT_DELETED_SUCCESS'	=> 'The selected report has been deleted successfully.',
@@ -295,7 +303,6 @@ $lang = array_merge($lang, array(
 	'REPORT_POST_EXPLAIN'		=> 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
 	'REPORT_REASON'				=> 'Report reason',
 	'REPORT_TIME'				=> 'Report time',
-	'REPORT_TOTAL'				=> 'In total there is <strong>1</strong> report to review.',
 	'RESYNC'					=> 'Resync',
 	'RETURN_MESSAGE'			=> '%sReturn to the message%s',
 	'RETURN_NEW_FORUM'			=> '%sGo to the new forum%s',
@@ -353,9 +360,11 @@ $lang = array_merge($lang, array(
 	'TOPIC_UNLOCKED_SUCCESS'	=> 'The selected topic has been unlocked.',
 	'TOTAL_WARNINGS'			=> 'Total Warnings',
 
-	'UNAPPROVED_POSTS_TOTAL'		=> 'In total there are <strong>%d</strong> posts waiting for approval.',
-	'UNAPPROVED_POSTS_ZERO_TOTAL'	=> 'There are no posts waiting for approval.',
-	'UNAPPROVED_POST_TOTAL'			=> 'In total there is <strong>1</strong> post waiting for approval.',
+	'UNAPPROVED_POSTS_TOTAL'		=> array(
+		0	=> 'There are no posts waiting for approval.',
+		1	=> 'In total there is <strong>1</strong> post waiting for approval.',
+		2	=> 'In total there are <strong>%d</strong> posts waiting for approval.',
+	),
 	'UNLOCK'						=> 'Unlock',
 	'UNLOCK_POST'					=> 'Unlock post',
 	'UNLOCK_POST_EXPLAIN'			=> 'Allow editing',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 75c375d9eb..8138b61ae2 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -93,8 +93,11 @@ $lang = array_merge($lang, array(
 
 	'LAST_ACTIVE'				=> 'Last active',
 	'LESS_THAN'					=> 'Less than',
-	'LIST_USER'					=> '1 user',
-	'LIST_USERS'				=> '%d users',
+	'LIST_USERS'				=> array(
+		0	=> '0 users',
+		1	=> '%d user',
+		2	=> '%d users',
+	),
 	'LOGIN_EXPLAIN_LEADERS'		=> 'The board requires you to be registered and logged in to view the team listing.',
 	'LOGIN_EXPLAIN_MEMBERLIST'	=> 'The board requires you to be registered and logged in to access the memberlist.',
 	'LOGIN_EXPLAIN_SEARCHUSER'	=> 'The board requires you to be registered and logged in to search users.',
@@ -136,6 +139,7 @@ $lang = array_merge($lang, array(
 	'USER_LAST_REMINDED'	=> array(
 		0		=> 'No reminder sent at this time',
 		1		=> '%1$d reminder sent<br />» %2$s',
+		2		=> '%1$d reminder sent<br />» %2$s',
 	),
 	'USER_ONLINE'			=> 'Online',
 	'USER_PRESENCE'			=> 'Board presence',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 887b9c57dc..01b1b3a9e1 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -149,8 +149,16 @@ $lang = array_merge($lang, array(
 	'POLL_MAX_OPTIONS'			=> 'Options per user',
 	'POLL_MAX_OPTIONS_EXPLAIN'	=> 'This is the number of options each user may select when voting.',
 	'POLL_OPTIONS'				=> 'Poll options',
-	'POLL_OPTIONS_EXPLAIN'		=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options.',
-	'POLL_OPTIONS_EDIT_EXPLAIN'	=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options. If you remove or add options all previous votes will be reset.',
+	'POLL_OPTIONS_EXPLAIN'		=> array(
+		0	=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options.',
+		1	=> 'Place each option on a new line. You may enter <strong>%d</strong> option.',
+		2	=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options.',
+	),
+	'POLL_OPTIONS_EDIT_EXPLAIN'		=> array(
+		0	=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options. If you remove or add options all previous votes will be reset.',
+		1	=> 'Place each option on a new line. You may enter <strong>%d</strong> option. If you remove or add options all previous votes will be reset.',
+		2	=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options. If you remove or add options all previous votes will be reset.',
+	),
 	'POLL_QUESTION'				=> 'Poll question',
 	'POLL_TITLE_TOO_LONG'		=> 'The poll title must contain fewer than 100 characters.',
 	'POLL_TITLE_COMP_TOO_LONG'	=> 'The parsed size of your poll title is too large, consider removing BBCodes or smilies.',
@@ -175,7 +183,11 @@ $lang = array_merge($lang, array(
 	'POST_TOPIC_AS'				=> 'Post topic as',
 	'PROGRESS_BAR'				=> 'Progress bar',
 
-	'QUOTE_DEPTH_EXCEEDED'		=> 'You may embed only %1$d quotes within each other.',
+	'QUOTE_DEPTH_EXCEEDED'		=> array(
+		0	=> 'You may embed only %d quotes within each other.',
+		1	=> 'You may embed only %d quote within each other.',
+		2	=> 'You may embed only %d quotes within each other.',
+	),
 
 	'SAVE'						=> 'Save',
 	'SAVE_DATE'					=> 'Saved at',
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 6d3a94667a..734b65e575 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -41,9 +41,16 @@ $lang = array_merge($lang, array(
 
 	'DISPLAY_RESULTS'		=> 'Display results as',
 
-	'FOUND_SEARCH_MATCH'		=> 'Search found %d match',
-	'FOUND_SEARCH_MATCHES'		=> 'Search found %d matches',
-	'FOUND_MORE_SEARCH_MATCHES'	=> 'Search found more than %d matches',
+	'FOUND_SEARCH_MATCHES'		=> array(
+		0	=> 'Search found %d matches',
+		1	=> 'Search found %d match',
+		2	=> 'Search found %d matches',
+	),
+	'FOUND_MORE_SEARCH_MATCHES'		=> array(
+		0	=> 'Search found more than %d matches',
+		1	=> 'Search found more than %d match',
+		2	=> 'Search found more than %d matches',
+	),
 
 	'GLOBAL'				=> 'Global announcement',
 
@@ -100,5 +107,9 @@ $lang = array_merge($lang, array(
 	'SORT_POST_SUBJECT'			=> 'Post subject',
 	'SORT_TIME'					=> 'Post time',
 
-	'TOO_FEW_AUTHOR_CHARS'	=> 'You must specify at least %d characters of the authors name.',
+	'TOO_FEW_AUTHOR_CHARS'	=> array(
+		0	=> 'You must specify at least %d characters of the authors name.',
+		1	=> 'You must specify at least %d character of the authors name.',
+		2	=> 'You must specify at least %d characters of the authors name.',
+	),
 ));
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index c8ffbf31c0..fb26c2f8e1 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -202,13 +202,21 @@ $lang = array_merge($lang, array(
 	'FOES_EXPLAIN'				=> 'Foes are users which will be ignored by default. Posts by these users will not be fully visible. Personal messages from foes are still permitted. Please note that you cannot ignore moderators or administrators.',
 	'FOES_UPDATED'				=> 'Your foes list has been updated successfully.',
 	'FOLDER_ADDED'				=> 'Folder successfully added.',
-	'FOLDER_MESSAGE_STATUS'		=> '%1$d from %2$d messages stored',
+	'FOLDER_MESSAGE_STATUS'		=> array(
+		0	=> '%2$d from %1$d messages stored',
+		1	=> '%2$d from %1$d message stored',
+		2	=> '%2$d from %1$d messages stored',
+	),
 	'FOLDER_NAME_EMPTY'			=> 'You must enter a name for this folder.',
 	'FOLDER_NAME_EXIST'			=> 'Folder <strong>%s</strong> already exists.',
 	'FOLDER_OPTIONS'			=> 'Folder options',
 	'FOLDER_RENAMED'			=> 'Folder successfully renamed.',
 	'FOLDER_REMOVED'			=> 'Folder successfully removed.',
-	'FOLDER_STATUS_MSG'			=> 'Folder is %1$d%% full (%2$d from %3$d messages stored)',
+	'FOLDER_STATUS_MSG'			=> array(
+		0	=> 'Folder is %3$d%% full (%2$d from %1$d messages stored)',
+		1	=> 'Folder is %3$d%% full (%2$d from %1$d message stored)',
+		2	=> 'Folder is %3$d%% full (%2$d from %1$d messages stored)',
+	),
 	'FORWARD_PM'				=> 'Forward PM',
 	'FORCE_PASSWORD_EXPLAIN'	=> 'Before you may continue browsing the board you are required to change your password.',
 	'FRIEND_MESSAGE'			=> 'Message from friend',
@@ -292,8 +300,11 @@ $lang = array_merge($lang, array(
 	'NOT_ADDED_FOES_SELF'			=> 'You cannot add yourself to the foes list.',
 	'NOT_AGREE'						=> 'I do not agree to these terms',
 	'NOT_ENOUGH_SPACE_FOLDER'		=> 'The destination folder “%s” seems to be full. The requested action has not been taken.',
-	'NOT_MOVED_MESSAGE'				=> 'You have 1 private message currently on hold because of full folder.',
-	'NOT_MOVED_MESSAGES'			=> 'You have %d private messages currently on hold because of full folder.',
+	'NOT_MOVED_MESSAGES'			=> array(
+		0	=> 'You have %d private messages currently on hold because of full folder.',
+		1	=> 'You have %d private message currently on hold because of full folder.',
+		2	=> 'You have %d private messages currently on hold because of full folder.',
+	),
 	'NO_ACTION_MODE'				=> 'No message action specified.',
 	'NO_AUTHOR'						=> 'No author defined for this message',
 	'NO_AVATAR_CATEGORY'			=> 'None',
@@ -388,8 +399,11 @@ $lang = array_merge($lang, array(
 	'RULE_ALREADY_DEFINED'				=> 'This rule was defined previously.',
 	'RULE_DELETED'						=> 'Rule successfully removed.',
 	'RULE_NOT_DEFINED'					=> 'Rule not correctly specified.',
-	'RULE_REMOVED_MESSAGE'				=> 'One private message had been removed due to private message filters.',
-	'RULE_REMOVED_MESSAGES'				=> '%d private messages were removed due to private message filters.',
+	'RULE_REMOVED_MESSAGES'				=> array(
+		0	=> '%d private messages were removed due to private message filters.',
+		1	=> '%d private message was removed due to private message filters.',
+		2	=> '%d private messages were removed due to private message filters.',
+	),
 
 	'SAME_PASSWORD_ERROR'		=> 'The new password you entered is the same as your current password.',
 	'SEARCH_YOUR_POSTS'			=> 'Show your posts',
@@ -489,8 +503,11 @@ $lang = array_merge($lang, array(
 	'VIEW_NEXT_PM'				=> 'Next PM',
 	'VIEW_PM'					=> 'View message',
 	'VIEW_PM_INFO'				=> 'Message details',
-	'VIEW_PM_MESSAGE'			=> '1 message',
-	'VIEW_PM_MESSAGES'			=> '%d messages',
+	'VIEW_PM_MESSAGES'			=> array(
+		0	=> '%d messages',
+		1	=> '%d message',
+		2	=> '%d messages',
+	),
 	'VIEW_PREVIOUS_HISTORY'		=> 'Previous PM in history',
 	'VIEW_PREVIOUS_PM'			=> 'Previous PM',
 	'VIEW_SIGS'					=> 'Display signatures',
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
index 6905a7a629..d5eea0f4e3 100644
--- a/phpBB/language/en/viewforum.php
+++ b/phpBB/language/en/viewforum.php
@@ -64,6 +64,9 @@ $lang = array_merge($lang, array(
 	'UNREAD_POSTS_LOCKED'	=> 'Unread posts [ Locked ]',
 
 	'VIEW_FORUM'			=> 'View forum',
-	'VIEW_FORUM_TOPIC'		=> '1 topic',
-	'VIEW_FORUM_TOPICS'		=> '%d topics',
+	'VIEW_FORUM_TOPICS'		=> array(
+		0	=> '%d topics',
+		1	=> '%d topic',
+		2	=> '%d topics',
+	),
 ));
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 9e69d657b7..1e686b69ab 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -53,8 +53,11 @@ $lang = array_merge($lang, array(
 	'DELETE_TOPIC'			=> 'Delete topic',
 	'DOWNLOAD_NOTICE'		=> 'You do not have the required permissions to view the files attached to this post.',
 
-	'EDITED_TIMES_TOTAL'	=> 'Last edited by %1$s on %2$s, edited %3$d times in total.',
-	'EDITED_TIME_TOTAL'		=> 'Last edited by %1$s on %2$s, edited %3$d time in total.',
+	'EDITED_TIMES_TOTAL'	=> array(
+		0	=> 'Last edited by %2$s on %3$s, edited %1$d times in total.',
+		1	=> 'Last edited by %2$s on %3$s, edited %1$d time in total.',
+		2	=> 'Last edited by %2$s on %3$s, edited %1$d times in total.',
+	)
 	'EMAIL_TOPIC'			=> 'E-mail friend',
 	'ERROR_NO_ATTACHMENT'	=> 'The selected attachment does not exist anymore.',
 
@@ -70,8 +73,11 @@ $lang = array_merge($lang, array(
 	'MAKE_GLOBAL'				=> 'Change to “Global”',
 	'MAKE_NORMAL'				=> 'Change to “Standard Topic”',
 	'MAKE_STICKY'				=> 'Change to “Sticky”',
-	'MAX_OPTIONS_SELECT'		=> 'You may select up to <strong>%d</strong> options',
-	'MAX_OPTION_SELECT'			=> 'You may select <strong>1</strong> option',
+	'MAX_OPTIONS_SELECT'		=> array(
+		0	=> 'You may select up to <strong>%d</strong> options',
+		1	=> 'You may select <strong>%d</strong> option',
+		2	=> 'You may select up to <strong>%d</strong> options',
+	),
 	'MISSING_INLINE_ATTACHMENT'	=> 'The attachment <strong>%s</strong> is no longer available',
 	'MOVE_TOPIC'				=> 'Move topic',
 
@@ -105,8 +111,11 @@ $lang = array_merge($lang, array(
 	'VIEW_NEXT_TOPIC'		=> 'Next topic',
 	'VIEW_PREVIOUS_TOPIC'	=> 'Previous topic',
 	'VIEW_RESULTS'			=> 'View results',
-	'VIEW_TOPIC_POST'		=> '1 post',
-	'VIEW_TOPIC_POSTS'		=> '%d posts',
+	'VIEW_TOPIC_POSTS'		=> array(
+		0	=> '%d posts',
+		1	=> '%d post',
+		2	=> '%d posts',
+	),
 	'VIEW_UNREAD_POST'		=> 'First unread post',
 	'VISIT_WEBSITE'			=> 'WWW',
 	'VOTE_SUBMITTED'		=> 'Your vote has been cast.',
-- 
cgit v1.2.1


From 179662e949967090724c5e14ea4d4d399886a38a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 20 Sep 2011 01:33:33 +0200
Subject: [ticket/10345] Use the plural function in some more places.

I added two function avatar_explanation_string() and avatar_error_wrong_size()
for easier handling of the "pixels"-languages, as they are used quite often.

PHPBB3-10345
---
 phpBB/language/en/acp/groups.php  |  6 ++++--
 phpBB/language/en/acp/posting.php | 32 ++++++++++++++++++++------------
 phpBB/language/en/acp/search.php  | 11 +++++++++--
 phpBB/language/en/common.php      | 12 +++++++++++-
 phpBB/language/en/posting.php     | 39 +++++++++++++++++++++++++++++----------
 phpBB/language/en/search.php      |  2 +-
 phpBB/language/en/ucp.php         | 20 ++++++++++++++------
 7 files changed, 88 insertions(+), 34 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 28e6fb80d9..8fc71f217d 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -54,8 +54,10 @@ $lang = array_merge($lang, array(
 	'GROUP_CLOSED'					=> 'Closed',
 	'GROUP_COLOR'					=> 'Group colour',
 	'GROUP_COLOR_EXPLAIN'			=> 'Defines the colour members’ usernames will appear in, leave blank for user default.',
-	'GROUP_CONFIRM_ADD_USER'		=> 'Are you sure that you want to add the user %1$s to the group?',
-	'GROUP_CONFIRM_ADD_USERS'		=> 'Are you sure that you want to add the users %1$s to the group?',
+	'GROUP_CONFIRM_ADD_USERS'		=> array(
+		1	=> 'Are you sure that you want to add the user %2$s to the group?',
+		2	=> 'Are you sure that you want to add the users %2$s to the group?',
+	),
 	'GROUP_CREATED'					=> 'Group has been created successfully.',
 	'GROUP_DEFAULT'					=> 'Make group default for member',
 	'GROUP_DEFS_UPDATED'			=> 'Default group set for all selected members.',
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 7aa01469b7..3d920b5340 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -121,15 +121,19 @@ $lang = array_merge($lang, array(
 	'FIRST'			=> 'First',
 
 	'ICONS_ADD'				=> 'Add a new icon',
-	'ICONS_NONE_ADDED'		=> 'No icons were added.',
-	'ICONS_ONE_ADDED'		=> 'The icon has been added successfully.',
-	'ICONS_ADDED'			=> 'The icons have been added successfully.',
+	'ICONS_ADDED'			=> array(
+		0	=> 'No icons were added.',
+		1	=> 'The icon has been added successfully.',
+		2	=> 'The icons have been added successfully.',
+	),
 	'ICONS_CONFIG'			=> 'Icon configuration',
 	'ICONS_DELETED'			=> 'The icon has been removed successfully.',
 	'ICONS_EDIT'			=> 'Edit icon',
-	'ICONS_ONE_EDITED'		=> 'The icon has been updated successfully.',
-	'ICONS_NONE_EDITED'		=> 'No icons were updated.',
-	'ICONS_EDITED'			=> 'The icons have been updated successfully.',
+	'ICONS_EDITED'			=> array(
+		0	=> 'No icons were updated.',
+		1	=> 'The icon has been updated successfully.',
+		2	=> 'The icons have been updated successfully.',
+	),
 	'ICONS_HEIGHT'			=> 'Icon height',
 	'ICONS_IMAGE'			=> 'Icon image',
 	'ICONS_IMPORTED'		=> 'The icons pack has been installed successfully.',
@@ -161,9 +165,11 @@ $lang = array_merge($lang, array(
 
 	'SELECT_PACKAGE'			=> 'Select a package file',
 	'SMILIES_ADD'				=> 'Add a new smiley',
-	'SMILIES_NONE_ADDED'		=> 'No smilies were added.',
-	'SMILIES_ONE_ADDED'			=> 'The smiley has been added successfully.',
-	'SMILIES_ADDED'				=> 'The smilies have been added successfully.',
+	'SMILIES_ADDED'				=> array(
+		0	=> 'No smilies were added.',
+		1	=> 'The smiley has been added successfully.',
+		2	=> 'The smilies have been added successfully.',
+	),
 	'SMILIES_CODE'				=> 'Smiley code',
 	'SMILIES_CONFIG'			=> 'Smiley configuration',
 	'SMILIES_DELETED'			=> 'The smiley has been removed successfully.',
@@ -171,9 +177,11 @@ $lang = array_merge($lang, array(
 	'SMILIE_NO_CODE'			=> 'The smiley “%s” was ignored, as there was no code entered.',
 	'SMILIE_NO_EMOTION'			=> 'The smiley “%s” was ignored, as there was no emotion entered.',
 	'SMILIE_NO_FILE'			=> 'The smiley “%s” was ignored, as the file is missing.',
-	'SMILIES_NONE_EDITED'		=> 'No smilies were updated.',
-	'SMILIES_ONE_EDITED'		=> 'The smiley has been updated successfully.',
-	'SMILIES_EDITED'			=> 'The smilies have been updated successfully.',
+	'SMILIES_EDITED'			=> array(
+		0	=> 'No smilies were updated.',
+		1	=> 'The smiley has been updated successfully.',
+		2	=> 'The smilies have been updated successfully.',
+	),
 	'SMILIES_EMOTION'			=> 'Emotion',
 	'SMILIES_HEIGHT'			=> 'Smiley height',
 	'SMILIES_IMAGE'				=> 'Smiley image',
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 9f0181a7e2..c7db788bb0 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -85,8 +85,15 @@ $lang = array_merge($lang, array(
 
 	'SEARCH_GUEST_INTERVAL'					=> 'Guest search flood interval',
 	'SEARCH_GUEST_INTERVAL_EXPLAIN'			=> 'Number of seconds guests must wait between searches. If one guest searches all others have to wait until the time interval passed.',
-	'SEARCH_INDEX_CREATE_REDIRECT'			=> 'All posts up to post id %1$d have now been indexed, of which %2$d posts were within this step.<br />The current rate of indexing is approximately %3$.1f posts per second.<br />Indexing in progress…',
-	'SEARCH_INDEX_DELETE_REDIRECT'			=> 'All posts up to post id %1$d have been removed from the search index.<br />Deleting in progress…',
+	'SEARCH_INDEX_CREATE_REDIRECT'			=> array(
+		2	=> 'All posts up to post id %2$d have now been indexed, of which %1$d posts were within this step.<br />',
+	),
+	'SEARCH_INDEX_CREATE_REDIRECT_RATE'		=> array(
+		2	=> 'The current rate of indexing is approximately %1$.1f posts per second.<br />Indexing in progress…',
+	),
+	'SEARCH_INDEX_DELETE_REDIRECT'			=> array(
+		2	=> 'All posts up to post id %2$d have been removed from the search index.<br />Deleting in progress…',
+	),
 	'SEARCH_INDEX_CREATED'					=> 'Successfully indexed all posts in the board database.',
 	'SEARCH_INDEX_REMOVED'					=> 'Successfully deleted the search index for this backend.',
 	'SEARCH_INTERVAL'						=> 'User search flood interval',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6fcef11852..1cf371a887 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -96,7 +96,7 @@ $lang = array_merge($lang, array(
 	'AVATAR_URL_INVALID'			=> 'The URL you specified is invalid.',
 	'AVATAR_URL_NOT_FOUND'			=> 'The file specified could not be found.',
 	'AVATAR_WRONG_FILESIZE'			=> 'The avatar’s filesize must be between 0 and %1d %2s.',
-	'AVATAR_WRONG_SIZE'				=> 'The submitted avatar is %5$d pixels wide and %6$d pixels high. Avatars must be at least %1$d pixels wide and %2$d pixels high, but no larger than %3$d pixels wide and %4$d pixels high.',
+	'AVATAR_WRONG_SIZE'				=> 'The submitted avatar is %5$s wide and %6$s high. Avatars must be at least %1$s wide and %2$s high, but no larger than %3$s wide and %4$s high.',
 
 	'BACK_TO_TOP'			=> 'Top',
 	'BACK_TO_PREV'			=> 'Back to previous page',
@@ -125,6 +125,11 @@ $lang = array_merge($lang, array(
 	'CHANGE_FONT_SIZE'		=> 'Change font size',
 	'CHANGING_PREFERENCES'	=> 'Changing board preferences',
 	'CHANGING_PROFILE'		=> 'Changing profile settings',
+	'CHARACTERS'			=> array(
+		0	=> '%d characters',
+		1	=> '%d character',
+		2	=> '%d characters',
+	),
 	'CLICK_VIEW_PRIVMSG'	=> '%sGo to your inbox%s',
 	'COLLAPSE_VIEW'			=> 'Collapse view',
 	'CLOSE_WINDOW'			=> 'Close window',
@@ -447,6 +452,11 @@ $lang = array_merge($lang, array(
 	'PAGE_TITLE_NUMBER'		=> 'Page %s',
 	'PASSWORD'				=> 'Password',
 	'PIXEL'					=> 'px',
+	'PIXELS'				=> array(
+		0	=> '%d pixels',
+		1	=> '%d pixel',
+		2	=> '%d pixels',
+	),
 	'PLAY_QUICKTIME_FILE'	=> 'Play Quicktime file',
 	'PM'					=> 'PM',
 	'PM_REPORTED'			=> 'Click to view report',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 01b1b3a9e1..a7dbc1bc80 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -121,13 +121,25 @@ $lang = array_merge($lang, array(
 	'LOGIN_EXPLAIN_QUOTE'		=> 'You need to login in order to quote posts within this forum.',
 	'LOGIN_EXPLAIN_REPLY'		=> 'You need to login in order to reply to topics within this forum.',
 
-	'MAX_FONT_SIZE_EXCEEDED'	=> 'You may only use fonts up to size %1$d.',
-	'MAX_FLASH_HEIGHT_EXCEEDED'	=> 'Your flash files may only be up to %1$d pixels high.',
-	'MAX_FLASH_WIDTH_EXCEEDED'	=> 'Your flash files may only be up to %1$d pixels wide.',
-	'MAX_IMG_HEIGHT_EXCEEDED'	=> 'Your images may only be up to %1$d pixels high.',
-	'MAX_IMG_WIDTH_EXCEEDED'	=> 'Your images may only be up to %1$d pixels wide.',
+	'MAX_FONT_SIZE_EXCEEDED'	=> 'You may only use fonts up to size %d.',
+	'MAX_FLASH_HEIGHT_EXCEEDED'	=> array(
+		2	=> 'Your flash files may only be up to %d pixels high.',
+	),
+	'MAX_FLASH_WIDTH_EXCEEDED'	=> array(
+		2	=> 'Your flash files may only be up to %d pixels wide.',
+	),
+	'MAX_IMG_HEIGHT_EXCEEDED'	=> array(
+		2	=> 'Your images may only be up to %1$d pixels high.',
+	),
+	'MAX_IMG_WIDTH_EXCEEDED'	=> array(
+		2	=> 'Your images may only be up to %d pixels wide.',
+	),
 
-	'MESSAGE_BODY_EXPLAIN'		=> 'Enter your message here, it may contain no more than <strong>%d</strong> characters.',
+	'MESSAGE_BODY_EXPLAIN'		=> array(
+		0	=> '', // zero means no limit, so we don't view a message here.
+		1	=> 'Enter your message here, it may contain no more than <strong>%d</strong> character.',
+		2	=> 'Enter your message here, it may contain no more than <strong>%d</strong> characters.',
+	),
 	'MESSAGE_DELETED'			=> 'This message has been deleted successfully.',
 	'MORE_SMILIES'				=> 'View more smilies',
 
@@ -202,12 +214,19 @@ $lang = array_merge($lang, array(
 	'STYLES_TIP'				=> 'Tip: Styles can be applied quickly to selected text.',
 
 	'TOO_FEW_CHARS'				=> 'Your message contains too few characters.',
-	'TOO_FEW_CHARS_LIMIT'		=> 'Your message contains %1$d characters. The minimum number of characters you need to enter is %2$d.',
+	'TOO_FEW_CHARS_LIMIT'		=> array(
+		1	=> 'Your message contains %1$d character. The minimum number of characters you need to enter is %2$d.',
+		2	=> 'Your message contains %1$d characters. The minimum number of characters you need to enter is %2$d.',
+	),
 	'TOO_FEW_POLL_OPTIONS'		=> 'You must enter at least two poll options.',
 	'TOO_MANY_ATTACHMENTS'		=> 'Cannot add another attachment, %d is the maximum.',
 	'TOO_MANY_CHARS'			=> 'Your message contains too many characters.',
-	'TOO_MANY_CHARS_POST'		=> 'Your message contains %1$d characters. The maximum number of allowed characters is %2$d.',
-	'TOO_MANY_CHARS_SIG'		=> 'Your signature contains %1$d characters. The maximum number of allowed characters is %2$d.',
+	'TOO_MANY_CHARS_POST'		=> array(
+		2	=> 'Your message contains %1$d characters. The maximum number of allowed characters is %2$d.',
+	),
+	'TOO_MANY_CHARS_SIG'		=> array(
+		2	=> 'Your signature contains %1$d characters. The maximum number of allowed characters is %2$d.',
+	),
 	'TOO_MANY_POLL_OPTIONS'		=> 'You have tried to enter too many poll options.',
 	'TOO_MANY_SMILIES'			=> 'Your message contains too many smilies. The maximum number of smilies allowed is %d.',
 	'TOO_MANY_URLS'				=> 'Your message contains too many URLs. The maximum number of URLs allowed is %d.',
@@ -231,5 +250,5 @@ $lang = array_merge($lang, array(
 	'VIEW_PRIVATE_MESSAGE'		=> '%sView your submitted private message%s',
 
 	'WRONG_FILESIZE'			=> 'The file is too big, maximum allowed size is %1d %2s.',
-	'WRONG_SIZE'				=> 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high. The submitted image is %5$d pixels wide and %6$d pixels high.',
+	'WRONG_SIZE'				=> 'The image must be at least %1$s wide, %2$s high and at most %3$s wide and %4$s high. The submitted image is %5$s wide and %6$s high.',
 ));
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 734b65e575..c5b37d897e 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -65,7 +65,7 @@ $lang = array_merge($lang, array(
 
 	'MAX_NUM_SEARCH_KEYWORDS_REFINE'	=> 'You specified too many words to search for. Please do not enter more than %1$d words.',
 
-	'NO_KEYWORDS'			=> 'You must specify at least one word to search for. Each word must consist of at least %d characters and must not contain more than %d characters excluding wildcards.',
+	'NO_KEYWORDS'			=> 'You must specify at least one word to search for. Each word must consist of at least %s and must not contain more than %s excluding wildcards.',
 	'NO_RECENT_SEARCHES'	=> 'No searches have been carried out recently.',
 	'NO_SEARCH'				=> 'Sorry but you are not permitted to use the search system.',
 	'NO_SEARCH_RESULTS'		=> 'No suitable matches were found.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index fb26c2f8e1..0aa97ee81e 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -89,7 +89,7 @@ $lang = array_merge($lang, array(
 	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
 	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
-	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$.2f KiB.',
+	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$s, height: %2$s, file size: %3$.2f KiB.',
 	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
 	'AVATAR_GALLERY'				=> 'Local gallery',
 	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',
@@ -188,10 +188,16 @@ $lang = array_merge($lang, array(
 	'EXPORT_FOLDER'				=> 'Export this view',
 
 	'FIELD_REQUIRED'					=> 'The field “%s” must be completed.',
-	'FIELD_TOO_SHORT'					=> 'The field “%1$s” is too short, a minimum of %2$d characters is required.',
-	'FIELD_TOO_LONG'					=> 'The field “%1$s” is too long, a maximum of %2$d characters is allowed.',
-	'FIELD_TOO_SMALL'					=> 'The value of “%1$s” is too small, a minimum value of %2$d is required.',
-	'FIELD_TOO_LARGE'					=> 'The value of “%1$s” is too large, a maximum value of %2$d is allowed.',
+	'FIELD_TOO_SHORT'					=> array(
+		1	=> 'The field “%2$s” is too short, a minimum of %1$d character is required.',
+		2	=> 'The field “%2$s” is too short, a minimum of %1$d characters is required.',
+	),
+	'FIELD_TOO_LONG'					=> array(
+		1	=> 'The field “%2$s” is too long, a maximum of %1$d character is allowed.',
+		2	=> 'The field “%2$s” is too long, a maximum of %1$d characters is allowed.',
+	),
+	'FIELD_TOO_SMALL'					=> 'The value of “%2$s” is too small, a minimum value of %1$d is required.',
+	'FIELD_TOO_LARGE'					=> 'The value of “%2$s” is too large, a maximum value of %1$d is allowed.',
 	'FIELD_INVALID_CHARS_NUMBERS_ONLY'	=> 'The field “%s” has invalid characters, only numbers are allowed.',
 	'FIELD_INVALID_CHARS_ALPHA_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric characters are allowed.',
 	'FIELD_INVALID_CHARS_SPACERS_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
@@ -273,7 +279,9 @@ $lang = array_merge($lang, array(
 	'MOVE_DELETED_MESSAGES_TO'		=> 'Move messages from removed folder to',
 	'MOVE_DOWN'						=> 'Move down',
 	'MOVE_MARKED_TO_FOLDER'			=> 'Move marked to %s',
-	'MOVE_PM_ERROR'					=> 'An error occurred while moving the messages to the new folder, only %1d from %2d messages were moved.',
+	'MOVE_PM_ERROR'					=> array(
+		2	=> 'An error occurred while moving the messages to the new folder, only %2d from %1d messages were moved.',
+	),
 	'MOVE_TO_FOLDER'				=> 'Move to folder',
 	'MOVE_UP'						=> 'Move up',
 
-- 
cgit v1.2.1


From c4aa8d8401420f8f36a622dc279587ee07466925 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 20 Sep 2011 23:29:52 +0200
Subject: [ticket/10345] Fix some last use cases of sprintf() to use
 $user->lang()

PHPBB3-10345
---
 phpBB/language/en/ucp.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 0aa97ee81e..e4aa41cbfd 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -352,10 +352,10 @@ $lang = array_merge($lang, array(
 	'NO_WATCHED_SELECTED'		=> 'You have not selected any subscribed topics or forums.',
 	'NO_WATCHED_TOPICS'			=> 'You are not subscribed to any topics.',
 
-	'PASS_TYPE_ALPHA_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case and must contain numbers.',
-	'PASS_TYPE_ANY_EXPLAIN'		=> 'Must be between %1$d and %2$d characters.',
-	'PASS_TYPE_CASE_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long and must contain letters in mixed case.',
-	'PASS_TYPE_SYMBOL_EXPLAIN'	=> 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case, must contain numbers and must contain symbols.',
+	'PASS_TYPE_ALPHA_EXPLAIN'	=> 'Password must be between %1$s and %2$s long, must contain letters in mixed case and must contain numbers.',
+	'PASS_TYPE_ANY_EXPLAIN'		=> 'Must be between %1$s and %2$s.',
+	'PASS_TYPE_CASE_EXPLAIN'	=> 'Password must be between %1$s and %2$s long and must contain letters in mixed case.',
+	'PASS_TYPE_SYMBOL_EXPLAIN'	=> 'Password must be between %1$s and %2$s long, must contain letters in mixed case, must contain numbers and must contain symbols.',
 	'PASSWORD'					=> 'Password',
 	'PASSWORD_ACTIVATED'		=> 'Your new password has been activated.',
 	'PASSWORD_UPDATED'			=> 'A new password was sent to your registered e-mail address.',
@@ -493,12 +493,12 @@ $lang = array_merge($lang, array(
 	'UPLOAD_AVATAR_FILE'			=> 'Upload from your machine',
 	'UPLOAD_AVATAR_URL'				=> 'Upload from a URL',
 	'UPLOAD_AVATAR_URL_EXPLAIN'		=> 'Enter the URL of the location containing the image. The image will be copied to this site.',
-	'USERNAME_ALPHA_ONLY_EXPLAIN'	=> 'Username must be between %1$d and %2$d chars long and use only alphanumeric characters.',
-	'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.',
-	'USERNAME_ASCII_EXPLAIN'		=> 'Username must be between %1$d and %2$d chars long and use only ASCII characters, so no special symbols.',
-	'USERNAME_LETTER_NUM_EXPLAIN'	=> 'Username must be between %1$d and %2$d chars long and use only letter or number characters.',
-	'USERNAME_LETTER_NUM_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use letter, number, space or -+_[] characters.',
-	'USERNAME_CHARS_ANY_EXPLAIN'	=> 'Length must be between %1$d and %2$d characters.',
+	'USERNAME_ALPHA_ONLY_EXPLAIN'	=> 'Username must be between %1$s and %2$s long and use only alphanumeric characters.',
+	'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$s and %2$s long and use alphanumeric, space or -+_[] characters.',
+	'USERNAME_ASCII_EXPLAIN'		=> 'Username must be between %1$s and %2$s long and use only ASCII characters, so no special symbols.',
+	'USERNAME_LETTER_NUM_EXPLAIN'	=> 'Username must be between %1$s and %2$s long and use only letter or number characters.',
+	'USERNAME_LETTER_NUM_SPACERS_EXPLAIN'=> 'Username must be between %1$s and %2$s long and use letter, number, space or -+_[] characters.',
+	'USERNAME_CHARS_ANY_EXPLAIN'	=> 'Length must be between %1$s and %2$s.',
 	'USERNAME_TAKEN_USERNAME'		=> 'The username you entered is already in use, please select an alternative.',
 	'USERNAME_DISALLOWED_USERNAME'	=> 'The username you entered has been disallowed or contains a disallowed word. Please choose a different name.',
 	'USER_NOT_FOUND_OR_INACTIVE'	=> 'The usernames you specified could either not be found or are not activated users.',
-- 
cgit v1.2.1


From 7da6826a671cfce61f7d92c2f5b1deafa4865872 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 20 Sep 2011 23:40:41 +0200
Subject: [ticket/10345] Remove some unused 0 cases

PHPBB3-10345
---
 phpBB/language/en/common.php    | 6 ------
 phpBB/language/en/search.php    | 3 ---
 phpBB/language/en/ucp.php       | 3 ---
 phpBB/language/en/viewforum.php | 1 -
 phpBB/language/en/viewtopic.php | 3 ---
 5 files changed, 16 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 1cf371a887..e01578a8ad 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -678,19 +678,13 @@ $lang = array_merge($lang, array(
 	),
 	'TOTAL_POSTS'		=> 'Total posts',
 	'TOTAL_POSTS_COUNT'	=> array(
-		0	=> 'Total posts <strong>0</strong>',
-		1	=> 'Total posts <strong>%d</strong>',
 		2	=> 'Total posts <strong>%d</strong>',
 	),
 	'TOPIC_REPORTED'	=> 'This topic has been reported',
 	'TOTAL_TOPICS'		=> array(
-		0	=> 'Total topics <strong>0</strong>',
-		1	=> 'Total topics <strong>%d</strong>',
 		2	=> 'Total topics <strong>%d</strong>',
 	),
 	'TOTAL_USERS'		=> array(
-		0	=> 'Total members <strong>0</strong>',
-		1	=> 'Total members <strong>%d</strong>',
 		2	=> 'Total members <strong>%d</strong>',
 	),
 	'TRACKED_PHP_ERROR'	=> 'Tracked PHP errors: %s',
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index c5b37d897e..d3801a58be 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -42,12 +42,10 @@ $lang = array_merge($lang, array(
 	'DISPLAY_RESULTS'		=> 'Display results as',
 
 	'FOUND_SEARCH_MATCHES'		=> array(
-		0	=> 'Search found %d matches',
 		1	=> 'Search found %d match',
 		2	=> 'Search found %d matches',
 	),
 	'FOUND_MORE_SEARCH_MATCHES'		=> array(
-		0	=> 'Search found more than %d matches',
 		1	=> 'Search found more than %d match',
 		2	=> 'Search found more than %d matches',
 	),
@@ -108,7 +106,6 @@ $lang = array_merge($lang, array(
 	'SORT_TIME'					=> 'Post time',
 
 	'TOO_FEW_AUTHOR_CHARS'	=> array(
-		0	=> 'You must specify at least %d characters of the authors name.',
 		1	=> 'You must specify at least %d character of the authors name.',
 		2	=> 'You must specify at least %d characters of the authors name.',
 	),
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index e4aa41cbfd..3f09ccb826 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -309,7 +309,6 @@ $lang = array_merge($lang, array(
 	'NOT_AGREE'						=> 'I do not agree to these terms',
 	'NOT_ENOUGH_SPACE_FOLDER'		=> 'The destination folder “%s” seems to be full. The requested action has not been taken.',
 	'NOT_MOVED_MESSAGES'			=> array(
-		0	=> 'You have %d private messages currently on hold because of full folder.',
 		1	=> 'You have %d private message currently on hold because of full folder.',
 		2	=> 'You have %d private messages currently on hold because of full folder.',
 	),
@@ -408,7 +407,6 @@ $lang = array_merge($lang, array(
 	'RULE_DELETED'						=> 'Rule successfully removed.',
 	'RULE_NOT_DEFINED'					=> 'Rule not correctly specified.',
 	'RULE_REMOVED_MESSAGES'				=> array(
-		0	=> '%d private messages were removed due to private message filters.',
 		1	=> '%d private message was removed due to private message filters.',
 		2	=> '%d private messages were removed due to private message filters.',
 	),
@@ -512,7 +510,6 @@ $lang = array_merge($lang, array(
 	'VIEW_PM'					=> 'View message',
 	'VIEW_PM_INFO'				=> 'Message details',
 	'VIEW_PM_MESSAGES'			=> array(
-		0	=> '%d messages',
 		1	=> '%d message',
 		2	=> '%d messages',
 	),
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
index d5eea0f4e3..90f40ecdfc 100644
--- a/phpBB/language/en/viewforum.php
+++ b/phpBB/language/en/viewforum.php
@@ -65,7 +65,6 @@ $lang = array_merge($lang, array(
 
 	'VIEW_FORUM'			=> 'View forum',
 	'VIEW_FORUM_TOPICS'		=> array(
-		0	=> '%d topics',
 		1	=> '%d topic',
 		2	=> '%d topics',
 	),
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 1e686b69ab..5bfc4907ce 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -54,7 +54,6 @@ $lang = array_merge($lang, array(
 	'DOWNLOAD_NOTICE'		=> 'You do not have the required permissions to view the files attached to this post.',
 
 	'EDITED_TIMES_TOTAL'	=> array(
-		0	=> 'Last edited by %2$s on %3$s, edited %1$d times in total.',
 		1	=> 'Last edited by %2$s on %3$s, edited %1$d time in total.',
 		2	=> 'Last edited by %2$s on %3$s, edited %1$d times in total.',
 	)
@@ -74,7 +73,6 @@ $lang = array_merge($lang, array(
 	'MAKE_NORMAL'				=> 'Change to “Standard Topic”',
 	'MAKE_STICKY'				=> 'Change to “Sticky”',
 	'MAX_OPTIONS_SELECT'		=> array(
-		0	=> 'You may select up to <strong>%d</strong> options',
 		1	=> 'You may select <strong>%d</strong> option',
 		2	=> 'You may select up to <strong>%d</strong> options',
 	),
@@ -112,7 +110,6 @@ $lang = array_merge($lang, array(
 	'VIEW_PREVIOUS_TOPIC'	=> 'Previous topic',
 	'VIEW_RESULTS'			=> 'View results',
 	'VIEW_TOPIC_POSTS'		=> array(
-		0	=> '%d posts',
 		1	=> '%d post',
 		2	=> '%d posts',
 	),
-- 
cgit v1.2.1


From 3788326d719ca49868cbb9682ceb3197ce7f6804 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 21 Sep 2011 00:43:25 +0200
Subject: [ticket/10345] Remove more useless 0-cases

PHPBB3-10345
---
 phpBB/language/en/acp/posting.php |  1 -
 phpBB/language/en/common.php      | 17 -----------------
 phpBB/language/en/mcp.php         |  1 -
 phpBB/language/en/memberlist.php  |  1 -
 phpBB/language/en/posting.php     |  3 ---
 phpBB/language/en/ucp.php         |  2 --
 6 files changed, 25 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 3d920b5340..ab8f57d08b 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -194,7 +194,6 @@ $lang = array_merge($lang, array(
 	'SMILIES_WIDTH'				=> 'Smiley width',
 
 	'TOO_MANY_SMILIES'			=> array(
-		0	=> 'Limit of %d smilies reached.',
 		1	=> 'Limit of %d smiley reached.',
 		2	=> 'Limit of %d smilies reached.',
 	),
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index e01578a8ad..b51d34335f 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -114,7 +114,6 @@ $lang = array_merge($lang, array(
 	'BOARD_UNAVAILABLE'		=> 'Sorry but the board is temporarily unavailable, please try again in a few minutes.',
 	'BROWSING_FORUM'		=> 'Users browsing this forum: %1$s',
 	'BROWSING_FORUM_GUESTS'	=> array(
-		0	=> 'Users browsing this forum: %2$s and 0 guests',
 		1	=> 'Users browsing this forum: %2$s and %1$d guest',
 		2	=> 'Users browsing this forum: %2$s and %1$d guests',
 	),
@@ -126,7 +125,6 @@ $lang = array_merge($lang, array(
 	'CHANGING_PREFERENCES'	=> 'Changing board preferences',
 	'CHANGING_PROFILE'		=> 'Changing profile settings',
 	'CHARACTERS'			=> array(
-		0	=> '%d characters',
 		1	=> '%d character',
 		2	=> '%d characters',
 	),
@@ -253,12 +251,10 @@ $lang = array_merge($lang, array(
 	'GROUP_ERR_USER_LONG'		=> 'Group names cannot exceed 60 characters. The specified group name is too long.',
 	'GUEST'						=> 'Guest',
 	'GUEST_USERS_ONLINE'		=> array(
-		0	=> 'There are 0 guest users online',
 		1	=> 'There is %d guest user online',
 		2	=> 'There are %d guest users online',
 	),
 	'GUEST_USERS_TOTAL'			=>  array(
-		0	=> '0 guests',
 		1	=> '%d guest',
 		2	=> '%d guests',
 	),
@@ -271,12 +267,10 @@ $lang = array_merge($lang, array(
 	'G_NEWLY_REGISTERED'		=> 'Newly registered users',
 
 	'HIDDEN_USERS_ONLINE'		=> array(
-		0	=> '0 hidden users',
 		1	=> '%d hidden user',
 		2	=> '%d hidden users',
 	),
 	'HIDDEN_USERS_TOTAL'		=> array(
-		0	=> '0 hidden',
 		1	=> '%d hidden',
 		2	=> '%d hidden',
 	),
@@ -367,7 +361,6 @@ $lang = array_merge($lang, array(
 	'NEW_MESSAGE'				=> 'New message',
 	'NEW_MESSAGES'				=> 'New messages',
 	'NEW_PMS'					=> array(
-		0	=> '<strong>0</strong> new messages',
 		1	=> '<strong>%d</strong> new message',
 		2	=> '<strong>%d</strong> new messages',
 	),
@@ -436,13 +429,11 @@ $lang = array_merge($lang, array(
 	'ONLINE_BUDDIES'			=> 'Online friends',
 	// "... :: x registered and y hidden"
 	'ONLINE_USERS_TOTAL'		=> array(
-		0	=> 'In total there are <strong>0</strong> users online :: %2$s and %3$s',
 		1	=> 'In total there is <strong>%1$d</strong> user online :: %2$s and %3$s',
 		2	=> 'In total there are <strong>%1$d</strong> users online :: %2$s and %3$s',
 	),
 	// "... :: x registered, y hidden and z guests"
 	'ONLINE_USERS_TOTAL_GUESTS'	=> array(
-		0	=> 'In total there are <strong>0</strong> users online :: %2$s, %3$s and %4$s',
 		1	=> 'In total there is <strong>%1$d</strong> user online :: %2$s, %3$s and %4$s',
 		2	=> 'In total there are <strong>%1$d</strong> users online :: %2$s, %3$s and %4$s',
 	),
@@ -453,7 +444,6 @@ $lang = array_merge($lang, array(
 	'PASSWORD'				=> 'Password',
 	'PIXEL'					=> 'px',
 	'PIXELS'				=> array(
-		0	=> '%d pixels',
 		1	=> '%d pixel',
 		2	=> '%d pixels',
 	),
@@ -506,12 +496,10 @@ $lang = array_merge($lang, array(
 	'REGISTERED_USERS'			=> 'Registered users:',
 	// "... and 2 hidden users online"
 	'REG_USERS_ONLINE'			=> array(
-		0	=> 'There are 0 registered users and %2$s online',
 		1	=> 'There is %1$d registered user and %2$s online',
 		2	=> 'There are %1$d registered users and %2$s online',
 	),
 	'REG_USERS_TOTAL'			=> array(
-		0	=> '0 registered',
 		1	=> '%d registered',
 		2	=> '%d registered',
 	),
@@ -667,12 +655,10 @@ $lang = array_merge($lang, array(
 	'TOPIC_UNAPPROVED'	=> 'This topic has not been approved',
 	'TOTAL_ATTACHMENTS'	=> 'Attachment(s)',
 	'TOTAL_LOGS'		=> array(
-		0	=> '0 logs',
 		1	=> '%d log',
 		2	=> '%d logs',
 	),
 	'TOTAL_PMS'		=> array(
-		0	=> '0 private messages in total',
 		1	=> '%d private message in total',
 		2	=> '%d private messages in total',
 	),
@@ -695,7 +681,6 @@ $lang = array_merge($lang, array(
 	'UNMARK_ALL'			=> 'Unmark all',
 	'UNREAD_MESSAGES'		=> 'Unread messages',
 	'UNREAD_PMS'			=> array(
-		0	=> '<strong>0</strong> unread messages',
 		1	=> '<strong>%d</strong> unread message',
 		2	=> '<strong>%d</strong> unread messages',
 	),
@@ -717,7 +702,6 @@ $lang = array_merge($lang, array(
 	'USER_AVATAR'			=> 'User avatar',
 	'USER_CANNOT_READ'		=> 'You cannot read posts in this forum.',
 	'USER_POSTS'			=> array(
-		0	=> '0 Posts',
 		1	=> '%d Post',
 		2	=> '%d Posts',
 	),
@@ -748,7 +732,6 @@ $lang = array_merge($lang, array(
 	'VIEW_NEWEST_POST'			=> 'View first unread post',
 	'VIEW_NOTES'				=> 'View user notes',
 	'VIEW_ONLINE_TIMES'			=> array(
-		0	=> 'based on users active over the past %d minutes',
 		1	=> 'based on users active over the past %d minute',
 		2	=> 'based on users active over the past %d minutes',
 	),
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 2d351eb9e0..9008f0327a 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -121,7 +121,6 @@ $lang = array_merge($lang, array(
 	'LATEST_WARNINGS'			=> 'Latest 5 warnings',
 	'LEAVE_SHADOW'				=> 'Leave shadow topic in place',
 	'LIST_REPORTS'				=> array(
-		0	=> '%d reports',
 		1	=> '%d report',
 		2	=> '%d reports',
 	),
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 8138b61ae2..9c36fbe4d0 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -94,7 +94,6 @@ $lang = array_merge($lang, array(
 	'LAST_ACTIVE'				=> 'Last active',
 	'LESS_THAN'					=> 'Less than',
 	'LIST_USERS'				=> array(
-		0	=> '0 users',
 		1	=> '%d user',
 		2	=> '%d users',
 	),
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index a7dbc1bc80..0c8824aabf 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -162,12 +162,10 @@ $lang = array_merge($lang, array(
 	'POLL_MAX_OPTIONS_EXPLAIN'	=> 'This is the number of options each user may select when voting.',
 	'POLL_OPTIONS'				=> 'Poll options',
 	'POLL_OPTIONS_EXPLAIN'		=> array(
-		0	=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options.',
 		1	=> 'Place each option on a new line. You may enter <strong>%d</strong> option.',
 		2	=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options.',
 	),
 	'POLL_OPTIONS_EDIT_EXPLAIN'		=> array(
-		0	=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options. If you remove or add options all previous votes will be reset.',
 		1	=> 'Place each option on a new line. You may enter <strong>%d</strong> option. If you remove or add options all previous votes will be reset.',
 		2	=> 'Place each option on a new line. You may enter up to <strong>%d</strong> options. If you remove or add options all previous votes will be reset.',
 	),
@@ -196,7 +194,6 @@ $lang = array_merge($lang, array(
 	'PROGRESS_BAR'				=> 'Progress bar',
 
 	'QUOTE_DEPTH_EXCEEDED'		=> array(
-		0	=> 'You may embed only %d quotes within each other.',
 		1	=> 'You may embed only %d quote within each other.',
 		2	=> 'You may embed only %d quotes within each other.',
 	),
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 3f09ccb826..59e5cb1952 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -209,7 +209,6 @@ $lang = array_merge($lang, array(
 	'FOES_UPDATED'				=> 'Your foes list has been updated successfully.',
 	'FOLDER_ADDED'				=> 'Folder successfully added.',
 	'FOLDER_MESSAGE_STATUS'		=> array(
-		0	=> '%2$d from %1$d messages stored',
 		1	=> '%2$d from %1$d message stored',
 		2	=> '%2$d from %1$d messages stored',
 	),
@@ -219,7 +218,6 @@ $lang = array_merge($lang, array(
 	'FOLDER_RENAMED'			=> 'Folder successfully renamed.',
 	'FOLDER_REMOVED'			=> 'Folder successfully removed.',
 	'FOLDER_STATUS_MSG'			=> array(
-		0	=> 'Folder is %3$d%% full (%2$d from %1$d messages stored)',
 		1	=> 'Folder is %3$d%% full (%2$d from %1$d message stored)',
 		2	=> 'Folder is %3$d%% full (%2$d from %1$d messages stored)',
 	),
-- 
cgit v1.2.1


From 2fac1d4c2323797dc4ef977cea4dc3fb894f895a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 27 Nov 2011 21:41:22 +0100
Subject: [ticket/10345] Fix parsing error in language/en/viewtopic.php

PHPBB3-10345
---
 phpBB/language/en/viewtopic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 5bfc4907ce..e59b33d0a8 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -56,7 +56,7 @@ $lang = array_merge($lang, array(
 	'EDITED_TIMES_TOTAL'	=> array(
 		1	=> 'Last edited by %2$s on %3$s, edited %1$d time in total.',
 		2	=> 'Last edited by %2$s on %3$s, edited %1$d times in total.',
-	)
+	),
 	'EMAIL_TOPIC'			=> 'E-mail friend',
 	'ERROR_NO_ATTACHMENT'	=> 'The selected attachment does not exist anymore.',
 
-- 
cgit v1.2.1


From 6472a270e0faf39c7dd9b73a8948f19254e0a17e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 27 Nov 2011 21:43:07 +0100
Subject: [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG
 sizes

PHPBB3-10345
---
 phpBB/language/en/posting.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 0c8824aabf..9119b97ebe 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -123,15 +123,19 @@ $lang = array_merge($lang, array(
 
 	'MAX_FONT_SIZE_EXCEEDED'	=> 'You may only use fonts up to size %d.',
 	'MAX_FLASH_HEIGHT_EXCEEDED'	=> array(
+		1	=> 'Your flash files may only be up to %d pixel high.',
 		2	=> 'Your flash files may only be up to %d pixels high.',
 	),
 	'MAX_FLASH_WIDTH_EXCEEDED'	=> array(
+		1	=> 'Your flash files may only be up to %d pixel wide.',
 		2	=> 'Your flash files may only be up to %d pixels wide.',
 	),
 	'MAX_IMG_HEIGHT_EXCEEDED'	=> array(
+		1	=> 'Your images may only be up to %1$d pixel high.',
 		2	=> 'Your images may only be up to %1$d pixels high.',
 	),
 	'MAX_IMG_WIDTH_EXCEEDED'	=> array(
+		1	=> 'Your images may only be up to %d pixel wide.',
 		2	=> 'Your images may only be up to %d pixels wide.',
 	),
 
-- 
cgit v1.2.1


From d73c3a297e1f31320c054685d5e38cb72a6357f3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 15 Dec 2011 23:15:24 +0000
Subject: [ticket/10535] Removed email confirm from UCP, removed unused
 language entries

PHPBB3-10535
---
 phpBB/language/en/ucp.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 59e5cb1952..227b1c92a3 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -123,8 +123,6 @@ $lang = array_merge($lang, array(
 	'CLICK_RETURN_FOLDER'		=> '%1$sReturn to your “%3$s” folder%2$s',
 	'CONFIRMATION'				=> 'Confirmation of registration',
 	'CONFIRM_CHANGES'			=> 'Confirm changes',
-	'CONFIRM_EMAIL'				=> 'Confirm e-mail address',
-	'CONFIRM_EMAIL_EXPLAIN'		=> 'You only need to specify this if you are changing your e-mail address.',
 	'CONFIRM_EXPLAIN'			=> 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
 	'VC_REFRESH'				=> 'Refresh confirmation code',
 	'VC_REFRESH_EXPLAIN'		=> 'If you cannot read the code you can request a new one by clicking the button.',
@@ -283,8 +281,6 @@ $lang = array_merge($lang, array(
 	'MOVE_TO_FOLDER'				=> 'Move to folder',
 	'MOVE_UP'						=> 'Move up',
 
-	'NEW_EMAIL_CONFIRM_EMPTY'		=> 'You did not enter a confirm e-mail address.',
-	'NEW_EMAIL_ERROR'				=> 'The e-mail addresses you entered do not match.',
 	'NEW_FOLDER_NAME'				=> 'New folder name',
 	'NEW_PASSWORD'					=> 'New password',
 	'NEW_PASSWORD_CONFIRM_EMPTY'	=> 'You did not enter a confirm password.',
-- 
cgit v1.2.1


From fc297a710e56d938afce83de401b103c72218a1b Mon Sep 17 00:00:00 2001
From: p <oleg@bsdpower.com>
Date: Fri, 23 Dec 2011 22:10:34 +0000
Subject: [ticket/10535] Delete email confirm from installer

PHPBB3-10535
---
 phpBB/language/en/install.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 57a5de07eb..2ceb14a3d8 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -72,7 +72,6 @@ $lang = array_merge($lang, array(
 	'CONFIG_FILE_WRITTEN'		=> 'The configuration file has been written. You may now proceed to the next step of the installation.',
 	'CONFIG_PHPBB_EMPTY'		=> 'The phpBB3 config variable for “%s” is empty.',
 	'CONFIG_RETRY'				=> 'Retry',
-	'CONTACT_EMAIL_CONFIRM'		=> 'Confirm contact e-mail',
 	'CONTINUE_CONVERT'			=> 'Continue conversion',
 	'CONTINUE_CONVERT_BODY'		=> 'A previous conversion attempt has been determined. You are now able to choose between starting a new conversion or continuing the conversion.',
 	'CONTINUE_LAST'				=> 'Continue last statements',
-- 
cgit v1.2.1


From 7a04c9048c110f0bd21ea3e9e869e17b408d640e Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sat, 31 Dec 2011 13:32:52 +0000
Subject: [ticket/9916] Updating header license and removing Version $Id$

PHPBB3-9916
---
 phpBB/language/en/acp/attachments.php       | 3 +--
 phpBB/language/en/acp/ban.php               | 3 +--
 phpBB/language/en/acp/board.php             | 3 +--
 phpBB/language/en/acp/bots.php              | 3 +--
 phpBB/language/en/acp/common.php            | 3 +--
 phpBB/language/en/acp/database.php          | 3 +--
 phpBB/language/en/acp/email.php             | 3 +--
 phpBB/language/en/acp/forums.php            | 3 +--
 phpBB/language/en/acp/groups.php            | 3 +--
 phpBB/language/en/acp/language.php          | 3 +--
 phpBB/language/en/acp/modules.php           | 3 +--
 phpBB/language/en/acp/permissions.php       | 3 +--
 phpBB/language/en/acp/permissions_phpbb.php | 3 +--
 phpBB/language/en/acp/posting.php           | 3 +--
 phpBB/language/en/acp/profile.php           | 3 +--
 phpBB/language/en/acp/prune.php             | 3 +--
 phpBB/language/en/acp/search.php            | 3 +--
 phpBB/language/en/acp/styles.php            | 3 +--
 phpBB/language/en/acp/users.php             | 3 +--
 phpBB/language/en/captcha_qa.php            | 3 +--
 phpBB/language/en/captcha_recaptcha.php     | 3 +--
 phpBB/language/en/common.php                | 3 +--
 phpBB/language/en/groups.php                | 3 +--
 phpBB/language/en/help_bbcode.php           | 3 +--
 phpBB/language/en/help_faq.php              | 3 +--
 phpBB/language/en/install.php               | 3 +--
 phpBB/language/en/mcp.php                   | 3 +--
 phpBB/language/en/memberlist.php            | 3 +--
 phpBB/language/en/posting.php               | 3 +--
 phpBB/language/en/search.php                | 3 +--
 phpBB/language/en/search_ignore_words.php   | 3 +--
 phpBB/language/en/search_synonyms.php       | 3 +--
 phpBB/language/en/ucp.php                   | 3 +--
 phpBB/language/en/viewforum.php             | 3 +--
 phpBB/language/en/viewtopic.php             | 3 +--
 35 files changed, 35 insertions(+), 70 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index eede2c5d50..e43bd1d3b0 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -4,9 +4,8 @@
 * acp_attachments [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index c763ae6dbd..77e8a93f3c 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -4,9 +4,8 @@
 * acp_ban [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index ff516a8146..0bb99b5449 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -4,9 +4,8 @@
 * acp_board [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php
index c9d0a6bad2..b8e1e9742f 100644
--- a/phpBB/language/en/acp/bots.php
+++ b/phpBB/language/en/acp/bots.php
@@ -4,9 +4,8 @@
 * acp_bots [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 3c51b02296..bee27d3c39 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -4,9 +4,8 @@
 * acp_common [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
index 2f9431462b..e98503ecf5 100644
--- a/phpBB/language/en/acp/database.php
+++ b/phpBB/language/en/acp/database.php
@@ -4,9 +4,8 @@
 * acp_database [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index 6ce8ddd59b..c39b8743e7 100644
--- a/phpBB/language/en/acp/email.php
+++ b/phpBB/language/en/acp/email.php
@@ -4,9 +4,8 @@
 * acp_email [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index bb5b361086..756cb7ae0f 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -4,9 +4,8 @@
 * acp_forums [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 8fc71f217d..a5c0af933c 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -4,9 +4,8 @@
 * acp_groups [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index 790997e8a6..6bac0a815b 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -4,9 +4,8 @@
 * acp_language [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php
index 7925f1644d..9c1c799720 100644
--- a/phpBB/language/en/acp/modules.php
+++ b/phpBB/language/en/acp/modules.php
@@ -4,9 +4,8 @@
 * acp_modules [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 5cc29021a9..7f7ecacfcf 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -4,9 +4,8 @@
 * acp_permissions [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 0a3cd53b1e..f8cb35ed6a 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -3,9 +3,8 @@
 * acp_permissions_phpbb (phpBB Permission Set) [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 */
 
 /**
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index ab8f57d08b..84cf640d1f 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -4,9 +4,8 @@
 * acp_posting [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index ea643157d8..92e642a993 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -4,9 +4,8 @@
 * acp_profile [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index bf006d9dce..b8c255e38d 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -4,9 +4,8 @@
 * acp_prune [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index c7db788bb0..3dc89570bf 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -4,9 +4,8 @@
 * acp_search [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 16b499e7f0..ed69e96ea0 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -4,9 +4,8 @@
 * acp_styles [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 6ba333e507..852f68bcd7 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -4,9 +4,8 @@
 * acp_users [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php
index 6c5379923e..90e919064e 100644
--- a/phpBB/language/en/captcha_qa.php
+++ b/phpBB/language/en/captcha_qa.php
@@ -4,9 +4,8 @@
 * captcha_qa [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php
index e0550ffcfb..c72957ca16 100644
--- a/phpBB/language/en/captcha_recaptcha.php
+++ b/phpBB/language/en/captcha_recaptcha.php
@@ -4,9 +4,8 @@
 * recaptcha [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b51d34335f..631805afc2 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -4,9 +4,8 @@
 * common [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php
index be11ec7609..6155d34a8c 100644
--- a/phpBB/language/en/groups.php
+++ b/phpBB/language/en/groups.php
@@ -4,9 +4,8 @@
 * groups [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index 6df877aab7..7b2672ad94 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -4,9 +4,8 @@
 * help_bbcode [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 6ca9589913..fa536e5b91 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -4,9 +4,8 @@
 * help_faq [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 57a5de07eb..858065b643 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -4,9 +4,8 @@
 * install [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 9008f0327a..664365b1ec 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -4,9 +4,8 @@
 * mcp [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 9c36fbe4d0..c3ab27871e 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -4,9 +4,8 @@
 * memberlist [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 9119b97ebe..933287dde3 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -4,9 +4,8 @@
 * posting [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index d3801a58be..5b6fdce0e7 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -4,9 +4,8 @@
 * search [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php
index 365591d0cd..afdbe6eecb 100644
--- a/phpBB/language/en/search_ignore_words.php
+++ b/phpBB/language/en/search_ignore_words.php
@@ -4,9 +4,8 @@
 * search_ignore_words [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php
index 49fb2069ce..18f938258c 100644
--- a/phpBB/language/en/search_synonyms.php
+++ b/phpBB/language/en/search_synonyms.php
@@ -4,9 +4,8 @@
 * search_synonyms [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 59e5cb1952..38f202b392 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -4,9 +4,8 @@
 * ucp [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
index 90f40ecdfc..1dee5d2e57 100644
--- a/phpBB/language/en/viewforum.php
+++ b/phpBB/language/en/viewforum.php
@@ -4,9 +4,8 @@
 * viewforum [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index e59b33d0a8..2b20938afe 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -4,9 +4,8 @@
 * viewtopic [English]
 *
 * @package language
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-- 
cgit v1.2.1


From 656a8ece6f2d52d35dfecb4a27c3709379583f48 Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sat, 31 Dec 2011 13:32:52 +0000
Subject: [ticket/9916] Updating header license and removing Version $Id$

PHPBB3-9916
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 38f202b392..264b6ed4d8 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -38,7 +38,7 @@ if (empty($lang) || !is_array($lang))
 $lang = array_merge($lang, array(
 	'TERMS_OF_USE_CONTENT'	=> 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended.<br />
 	<br />
-	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://opensource.org/licenses/gpl-license.php">General Public License</a>” (hereinafter “GPL”) and can be downloaded from <a href="http://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet based discussions, the phpBB Group are not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="http://www.phpbb.com/">http://www.phpbb.com/</a>.<br />
+	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>” (hereinafter “GPL”) and can be downloaded from <a href="http://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet based discussions, the phpBB Group are not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="http://www.phpbb.com/">http://www.phpbb.com/</a>.<br />
 	<br />
 	You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised.
 	',
-- 
cgit v1.2.1


From d035dc3eef617adbd9dc7ba09e088f5dcc3cb905 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 3 Feb 2012 16:00:03 -0500
Subject: [ticket/10618] Replace phpBB 3.0 with phpBB 3 for 3.1.

PHPBB3-10618
---
 phpBB/language/en/install.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 858065b643..c8cf257f37 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -78,7 +78,7 @@ $lang = array_merge($lang, array(
 	'CONTINUE_OLD_CONVERSION'	=> 'Continue previously started conversion',
 	'CONVERT'					=> 'Convert',
 	'CONVERT_COMPLETE'			=> 'Conversion completed',
-	'CONVERT_COMPLETE_EXPLAIN'	=> 'You have now successfully converted your board to phpBB 3.0. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>.',
+	'CONVERT_COMPLETE_EXPLAIN'	=> 'You have now successfully converted your board to phpBB 3. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>.',
 	'CONVERT_INTRO'				=> 'Welcome to the phpBB Unified Convertor Framework',
 	'CONVERT_INTRO_BODY'		=> 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.',
 	'CONVERT_NEW_CONVERSION'	=> 'New conversion',
@@ -155,7 +155,7 @@ $lang = array_merge($lang, array(
 	'DLL_XML'					=> 'XML support [ Jabber ]',
 	'DLL_ZLIB'					=> 'zlib compression support [ gz, .tar.gz, .zip ]',
 	'DL_CONFIG'					=> 'Download config',
-	'DL_CONFIG_EXPLAIN'			=> 'You may download the complete config.php to your own PC. You will then need to upload the file manually, replacing any existing config.php in your phpBB 3.0 root directory. Please remember to upload the file in ASCII format (see your FTP application documentation if you are unsure how to achieve this). When you have uploaded the config.php please click “Done” to move to the next stage.',
+	'DL_CONFIG_EXPLAIN'			=> 'You may download the complete config.php to your own PC. You will then need to upload the file manually, replacing any existing config.php in your phpBB 3 root directory. Please remember to upload the file in ASCII format (see your FTP application documentation if you are unsure how to achieve this). When you have uploaded the config.php please click “Done” to move to the next stage.',
 	'DL_DOWNLOAD'				=> 'Download',
 	'DONE'						=> 'Done',
 
@@ -331,7 +331,7 @@ $lang = array_merge($lang, array(
 	'STAGE_ADVANCED_EXPLAIN'	=> 'The settings on this page are only necessary to set if you know that you require something different from the default. If you are unsure, just proceed to the next page, as these settings can be altered from the Administration Control Panel later.',
 	'STAGE_CONFIG_FILE'			=> 'Configuration file',
 	'STAGE_CREATE_TABLE'		=> 'Create database tables',
-	'STAGE_CREATE_TABLE_EXPLAIN'	=> 'The database tables used by phpBB 3.0 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.',
+	'STAGE_CREATE_TABLE_EXPLAIN'	=> 'The database tables used by phpBB 3 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.',
 	'STAGE_DATABASE'			=> 'Database settings',
 	'STAGE_FINAL'				=> 'Final stage',
 	'STAGE_INTRO'				=> 'Introduction',
-- 
cgit v1.2.1


From ccf0cf649daabc600e8a79680e29c7bfbba32cac Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 3 Feb 2012 15:55:44 -0500
Subject: [ticket/10535] Delete no longer needed email confirm language
 entries.

PHPBB3-10535
---
 phpBB/language/en/common.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b51d34335f..bec4bd9ef7 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -614,7 +614,6 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_USER_PASSWORD'		=> 'The password you entered is too long.',
 	'TOO_LONG_USERNAME'				=> 'The username you entered is too long.',
 	'TOO_LONG_EMAIL'				=> 'The e-mail address you entered is too long.',
-	'TOO_LONG_EMAIL_CONFIRM'		=> 'The e-mail address confirmation you entered is too long.',
 	'TOO_LONG_WEBSITE'				=> 'The website address you entered is too long.',
 	'TOO_LONG_YIM'					=> 'The Yahoo! Messenger name you entered is too long.',
 
@@ -636,7 +635,6 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_USER_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_USERNAME'			=> 'The username you entered is too short.',
 	'TOO_SHORT_EMAIL'				=> 'The e-mail address you entered is too short.',
-	'TOO_SHORT_EMAIL_CONFIRM'		=> 'The e-mail address confirmation you entered is too short.',
 	'TOO_SHORT_WEBSITE'				=> 'The website address you entered is too short.',
 	'TOO_SHORT_YIM'					=> 'The Yahoo! Messenger name you entered is too short.',
 	
-- 
cgit v1.2.1


From 6e207e3f691d309bf00deb0c44818fb9072b4a13 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 6 Mar 2012 19:42:33 -0500
Subject: [ticket/10618] Change phpBB 3 to phpBB 3.1.

PHPBB3-10618
---
 phpBB/language/en/install.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index c8cf257f37..82ea95011a 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -78,7 +78,7 @@ $lang = array_merge($lang, array(
 	'CONTINUE_OLD_CONVERSION'	=> 'Continue previously started conversion',
 	'CONVERT'					=> 'Convert',
 	'CONVERT_COMPLETE'			=> 'Conversion completed',
-	'CONVERT_COMPLETE_EXPLAIN'	=> 'You have now successfully converted your board to phpBB 3. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>.',
+	'CONVERT_COMPLETE_EXPLAIN'	=> 'You have now successfully converted your board to phpBB 3.1. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>.',
 	'CONVERT_INTRO'				=> 'Welcome to the phpBB Unified Convertor Framework',
 	'CONVERT_INTRO_BODY'		=> 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.',
 	'CONVERT_NEW_CONVERSION'	=> 'New conversion',
@@ -155,7 +155,7 @@ $lang = array_merge($lang, array(
 	'DLL_XML'					=> 'XML support [ Jabber ]',
 	'DLL_ZLIB'					=> 'zlib compression support [ gz, .tar.gz, .zip ]',
 	'DL_CONFIG'					=> 'Download config',
-	'DL_CONFIG_EXPLAIN'			=> 'You may download the complete config.php to your own PC. You will then need to upload the file manually, replacing any existing config.php in your phpBB 3 root directory. Please remember to upload the file in ASCII format (see your FTP application documentation if you are unsure how to achieve this). When you have uploaded the config.php please click “Done” to move to the next stage.',
+	'DL_CONFIG_EXPLAIN'			=> 'You may download the complete config.php to your own PC. You will then need to upload the file manually, replacing any existing config.php in your phpBB 3.1 root directory. Please remember to upload the file in ASCII format (see your FTP application documentation if you are unsure how to achieve this). When you have uploaded the config.php please click “Done” to move to the next stage.',
 	'DL_DOWNLOAD'				=> 'Download',
 	'DONE'						=> 'Done',
 
@@ -331,7 +331,7 @@ $lang = array_merge($lang, array(
 	'STAGE_ADVANCED_EXPLAIN'	=> 'The settings on this page are only necessary to set if you know that you require something different from the default. If you are unsure, just proceed to the next page, as these settings can be altered from the Administration Control Panel later.',
 	'STAGE_CONFIG_FILE'			=> 'Configuration file',
 	'STAGE_CREATE_TABLE'		=> 'Create database tables',
-	'STAGE_CREATE_TABLE_EXPLAIN'	=> 'The database tables used by phpBB 3 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.',
+	'STAGE_CREATE_TABLE_EXPLAIN'	=> 'The database tables used by phpBB 3.1 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.',
 	'STAGE_DATABASE'			=> 'Database settings',
 	'STAGE_FINAL'				=> 'Final stage',
 	'STAGE_INTRO'				=> 'Introduction',
-- 
cgit v1.2.1


From 33dce916e2ed58f1823f3b3fc1b2d72ae3c6686a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 14 Mar 2012 22:22:22 +0100
Subject: [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue

PHPBB3-10690
---
 phpBB/language/en/mcp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 664365b1ec..bd25d403ab 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -238,6 +238,7 @@ $lang = array_merge($lang, array(
 	'NO_POST'						=> 'You have to select a post in order to warn the user for a post.',
 	'NO_POST_REPORT'				=> 'This post was not reported.',
 	'NO_POST_SELECTED'				=> 'You must select at least one post to perform this action.',
+	'NO_POSTS_QUEUE'				=> 'There are no posts waiting for approval.',
 	'NO_REASON_DISAPPROVAL'			=> 'Please give an appropriate reason for disapproval.',
 	'NO_REPORT'						=> 'No report found',
 	'NO_REPORTS'					=> 'No reports found',
-- 
cgit v1.2.1


From 0c6955e73c72d69c91548bb0c3106e39ce166b70 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Wed, 14 Mar 2012 23:45:54 +0200
Subject: [feature/merging-style-components] Adding new language variables

Adding new language variables for acp_styles and removing some unused variables

PHPBB3-10632
---
 phpBB/language/en/acp/common.php |  2 ++
 phpBB/language/en/acp/styles.php | 64 ++++++++++++++++------------------------
 2 files changed, 28 insertions(+), 38 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 7f1ecb5c01..254cd473a5 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -168,6 +168,8 @@ $lang = array_merge($lang, array(
 	'ACP_STYLE_COMPONENTS'		=> 'Style components',
 	'ACP_STYLE_MANAGEMENT'		=> 'Style management',
 	'ACP_STYLES'				=> 'Styles',
+	'ACP_STYLES_CACHE'			=> 'Purge Cache',
+	'ACP_STYLES_INSTALL'		=> 'Install Styles',
 
 	'ACP_SUBMIT_CHANGES'		=> 'Submit changes',
 
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 59df82477e..fe7fae5808 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -35,15 +35,9 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 $lang = array_merge($lang, array(
-	'ACP_STYLES_EXPLAIN'	=> 'Here you can manage the available styles on your board. A style consists of a template and theme. You may alter existing styles, delete, deactivate, reactivate, create or import new ones. You can also see what a style will look like using the preview function. The current default style is noted by the presence of an asterisk (*). Also listed is the total user count for each style, note that overriding user styles will not be reflected here.',
-	'ACP_TEMPLATES_EXPLAIN'	=> 'A template set comprises all the markup used to generate the layout of your board. Here you can edit existing template sets, delete, export, import and preview sets. You can also modify the templating code used to generate BBCode.',
-	'ACP_THEMES_EXPLAIN'	=> 'From here you can create, install, edit, delete and export themes. A theme is the combination of colours and images that are applied to your templates to define the basic look of your board. The range of options open to you depends on the configuration of your server and phpBB installation, see the manual for further details. Please note that when creating new themes the use of an existing theme as a basis is optional.',
-	'ADD_STYLE'				=> 'Create style',
-	'ADD_STYLE_EXPLAIN'		=> 'Here you can create a new style. Depending on your server configuration and file permissions you may have additional options. For example you may be able to base this style on an existing one. You may also be able to upload or import (from the store directory) a style archive. If you upload or import an archive the style name will be determined automatically.',
+	'ACP_STYLES_EXPLAIN'	=> 'Here you can manage the available styles on your board. You may alter existing styles, delete, deactivate, reactivate, install new ones. You can also see what a style will look like using the preview function. Also listed is the total user count for each style, note that overriding user styles will not be reflected here.',
 	'ADD_TEMPLATE'			=> 'Create template',
 	'ADD_TEMPLATE_EXPLAIN'	=> 'Here you can add a new template. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this template set on an existing one. You may also be able to upload or import (from the store directory) a template archive. If you upload or import an archive the template name can be optionally taken from the archive name (to do this leave the template name blank).',
-	'ADD_THEME'				=> 'Create theme',
-	'ADD_THEME_EXPLAIN'		=> 'Here you can add a new theme. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this theme on an existing one. You may also be able to upload or import (from the store directory) a theme archive. If you upload or import an archive the theme name can be optionally taken from the archive name (to do this leave the theme name blank).',
 	'ARCHIVE_FORMAT'		=> 'Archive file type',
 	'AUTOMATIC_EXPLAIN'		=> 'Leave blank to attempt automatic detection.',
 
@@ -58,7 +52,9 @@ $lang = array_merge($lang, array(
 	'CACHE_FILENAME'				=> 'Template file',
 	'CACHE_FILESIZE'				=> 'File size',
 	'CACHE_MODIFIED'				=> 'Modified',
+	'CANNOT_BE_INSTALLED'			=> 'Cannot be installed',
 	'CONFIRM_TEMPLATE_CLEAR_CACHE'	=> 'Are you sure you wish to clear all cached versions of your template files?',
+	'CONFIRM_DELETE_STYLES'			=> 'Are you sure you wish to delete selected styles?',
 	'COPYRIGHT'						=> 'Copyright',
 	'CREATE_STYLE'					=> 'Create new style',
 	'CREATE_TEMPLATE'				=> 'Create new template set',
@@ -66,13 +62,14 @@ $lang = array_merge($lang, array(
 	'CURRENT_IMAGE'					=> 'Current image',
 
 	'DEACTIVATE_DEFAULT'		=> 'You cannot deactivate the default style.',
+	'DELETE_DEFAULT'			=> 'You cannot delete the default style.',
 	'DELETE_FROM_FS'			=> 'Delete from filesystem',
 	'DELETE_STYLE'				=> 'Delete style',
 	'DELETE_STYLE_EXPLAIN'		=> 'Here you can remove the selected style. Take care in deleting styles, there is no undo capability.',
+	'DELETE_STYLE_FILES_FAILED'	=> 'Error deleting files for style "%s".',
+	'DELETE_STYLE_FILES_SUCCESS'	=> 'Files for style "%s" have been deleted.',
 	'DELETE_TEMPLATE'			=> 'Delete template',
 	'DELETE_TEMPLATE_EXPLAIN'	=> 'Here you can remove the selected template set from the database. Please note that there is no undo capability. It is recommended that you first export your set for possible future use.',
-	'DELETE_THEME'				=> 'Delete theme',
-	'DELETE_THEME_EXPLAIN'		=> 'Here you can remove the selected theme from the database. Please note that there is no undo capability. It is recommended that you first export your theme for possible future use.',
 	'DETAILS'					=> 'Details',
 	'DIMENSIONS_EXPLAIN'		=> 'Selecting yes here will include width/height parameters.',
 
@@ -239,17 +236,10 @@ $lang = array_merge($lang, array(
 	'INCLUDE_THEME'				=> 'Include theme',
 	'INHERITING_FROM'			=> 'Inherits from',
 	'INSTALL_STYLE'				=> 'Install style',
-	'INSTALL_STYLE_EXPLAIN'		=> 'Here you can install a new style and if appropriate the corresponding style elements. If you already have the relevant style elements installed they will not be overwritten. Some styles require existing style elements to already be installed. If you try installing such a style and do not have the required elements you will be notified.',
-	'INSTALL_TEMPLATE'			=> 'Install Template',
-	'INSTALL_TEMPLATE_EXPLAIN'	=> 'Here you can install a new template set. Depending on your server configuration you may have a number of options here.',
-	'INSTALL_THEME'				=> 'Install theme',
-	'INSTALL_THEME_EXPLAIN'		=> 'Here you can install your selected theme. You can edit certain details if you wish or use the installation defaults.',
+	'INSTALL_STYLES'			=> 'Install styles',
+	'INSTALL_STYLES_EXPLAIN'	=> 'Here you can install new styles.<br />If you cannot find a specific style in list below, check if that style is already installed. If it is not installed, check if it was uploaded correctly.',
 	'INSTALLED_STYLE'			=> 'Installed styles',
-	'INSTALLED_TEMPLATE'		=> 'Installed templates',
-	'INSTALLED_THEME'			=> 'Installed themes',
-
-	'KEEP_TEMPLATE'				=> 'Keep “%s” template',
-	'KEEP_THEME'				=> 'Keep “%s” theme',
+	'INVALID_STYLE_ID'			=> 'Invalid style ID.',
 
 	'LINE_SPACING'				=> 'Line spacing',
 	'LOCALISED_IMAGES'			=> 'Localised',
@@ -257,18 +247,17 @@ $lang = array_merge($lang, array(
 	'NO_CLASS'					=> 'Cannot find class in stylesheet.',
 	'NO_IMAGE'					=> 'No image',
 	'NO_IMAGE_ERROR'			=> 'Cannot find image on filesystem.',
+	'NO_MATCHING_STYLES_FOUND'	=> 'No styles match your query.',
 	'NO_STYLE'					=> 'Cannot find style on filesystem.',
 	'NO_TEMPLATE'				=> 'Cannot find template on filesystem.',
 	'NO_THEME'					=> 'Cannot find theme on filesystem.',
 	'NO_UNINSTALLED_STYLE'		=> 'No uninstalled styles detected.',
-	'NO_UNINSTALLED_TEMPLATE'	=> 'No uninstalled templates detected.',
-	'NO_UNINSTALLED_THEME'		=> 'No uninstalled themes detected.',
 	'NO_UNIT'					=> 'None',
 
 	'ONLY_STYLE'			=> 'This is the only remaining style, you cannot delete it.',
-	'ONLY_TEMPLATE'			=> 'This is the only remaining template set, you cannot delete it.',
-	'ONLY_THEME'			=> 'This is the only remaining theme, you cannot delete it.',
-	'OPTIONAL_BASIS'		=> 'Optional basis',
+	
+	'PARENT_STYLE_NOT_FOUND'	=> 'Parent style was not found. This style may not work correctly. Please uninstall it.',
+	'PURGED_CACHE'				=> 'Cache was purged.',
 
 	'REFRESH'					=> 'Refresh',
 	'REPEAT_NO'					=> 'None',
@@ -282,8 +271,7 @@ $lang = array_merge($lang, array(
 	'REPLACE_THEME'				=> 'Replace theme with',
 	'REPLACE_THEME_EXPLAIN'		=> 'This theme will replace the one you are deleting in any styles that use it.',
 	'REPLACE_WITH_OPTION'		=> 'Replace with “%s”',
-	'REQUIRES_TEMPLATE'			=> 'This style requires the %s template set to be installed.',
-	'REQUIRES_THEME'			=> 'This style requires the %s theme to be installed.',
+	'REQUIRES_STYLE'			=> 'This style requires the style "%s" to be installed.',
 
 	'SELECT_IMAGE'				=> 'Select image',
 	'SELECT_TEMPLATE'			=> 'Select template file',
@@ -299,21 +287,31 @@ $lang = array_merge($lang, array(
 	'STYLE_ADDED'				=> 'Style added successfully.',
 	'STYLE_DEACTIVATE'			=> 'Deactivate',
 	'STYLE_DEFAULT'				=> 'Make default style',
-	'STYLE_DELETED'				=> 'Style deleted successfully.',
+	'STYLE_DEFAULT_CHANGE'		=> 'Change default style',
+	'STYLE_DEFAULT_CHANGE_INACTIVE'	=> 'You must activate style before making it default style.',
+	'STYLE_DELETE_DEPENDENT'	=> 'Style "%s" cannot be deleted because it has one or more child styles.',
+	'STYLE_DELETED'				=> 'Style "%s" deleted successfully.',
 	'STYLE_DETAILS_UPDATED'		=> 'Style edited successfully.',
 	'STYLE_ERR_ARCHIVE'			=> 'Please select an archive method.',
 	'STYLE_ERR_COPY_LONG'		=> 'The copyright can be no longer than 60 characters.',
+	'STYLE_ERR_INVALID_PARENT'	=> 'Invalid parent style.',
 	'STYLE_ERR_MORE_ELEMENTS'	=> 'You must select at least one style element.',
 	'STYLE_ERR_NAME_CHARS'		=> 'The style name can only contain alphanumeric characters, -, +, _ and space.',
 	'STYLE_ERR_NAME_EXIST'		=> 'A style with that name already exists.',
 	'STYLE_ERR_NAME_LONG'		=> 'The style name can be no longer than 30 characters.',
-	'STYLE_ERR_NO_IDS'			=> 'You must select a template and theme for this style.',
 	'STYLE_ERR_NOT_STYLE'		=> 'The imported or uploaded file did not contain a valid style archive.',
 	'STYLE_ERR_STYLE_NAME'		=> 'You must supply a name for this style.',
 	'STYLE_EXPORT'				=> 'Export style',
 	'STYLE_EXPORT_EXPLAIN'		=> 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme for a commonly used template you could simply export the theme and omit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
 	'STYLE_EXPORTED'			=> 'Style exported successfully and stored in %s.',
+	'STYLE_INSTALLED'			=> 'Style "%s" has been installed.',
+	'STYLE_INSTALLED_EDIT_DETAILS'	=> '<a href="%s">Click here</a> to edit style details or to change default style.',
+	'STYLE_INSTALLED_RETURN_STYLES'	=> '<a href="%s">Click here</a> to return to installed styles list.',
+	'STYLE_INSTALLED_RETURN_UNINSTALLED'	=> '<a href="%s">Click here</a> to install more styles.',
 	'STYLE_NAME'				=> 'Style name',
+	'STYLE_NOT_INSTALLED'		=> 'Style "%s" was not installed.',
+	'STYLE_PATH'				=> 'Style path:',
+	'STYLE_PARENT'				=> 'Parent style:',
 	'STYLE_TEMPLATE'			=> 'Template',
 	'STYLE_THEME'				=> 'Theme',
 	'STYLE_USED_BY'				=> 'Used by (including robots)',
@@ -323,8 +321,6 @@ $lang = array_merge($lang, array(
 	'TEMPLATE_CACHE_EXPLAIN'	=> 'By default phpBB caches the compiled version of its templates. This decreases the load on the server each time a page is viewed and thus may reduce the page generation time. Here you can view the cache status of each file and delete individual files or the entire cache.',
 	'TEMPLATE_CACHE_CLEARED'	=> 'Template cache cleared successfully.',
 	'TEMPLATE_CACHE_EMPTY'		=> 'There are no cached templates.',
-	'TEMPLATE_DELETED'			=> 'Template set deleted successfully.',
-	'TEMPLATE_DELETE_DEPENDENT'	=> 'The template set cannot be deleted as there are one or more other template sets inheriting from it:',
 	'TEMPLATE_DELETED_FS'		=> 'Template set removed from database but files remain on the filesystem.',
 	'TEMPLATE_DETAILS_UPDATED'	=> 'Template details successfully updated.',
 	'TEMPLATE_EDITOR'			=> 'Raw HTML template editor',
@@ -333,17 +329,12 @@ $lang = array_merge($lang, array(
 	'TEMPLATE_ERR_CACHE_READ'	=> 'The cache directory used to store cached versions of template files could not be opened.',
 	'TEMPLATE_ERR_COPY_LONG'	=> 'The copyright can be no longer than 60 characters.',
 	'TEMPLATE_ERR_NAME_CHARS'	=> 'The template name can only contain alphanumeric characters, -, +, _ and space.',
-	'TEMPLATE_ERR_NAME_EXIST'	=> 'A template set with that name already exists.',
 	'TEMPLATE_ERR_NAME_LONG'	=> 'The template name can be no longer than 30 characters.',
-	'TEMPLATE_ERR_NOT_TEMPLATE'	=> 'The archive you specified does not contain a valid template set.',
-	'TEMPLATE_ERR_REQUIRED_OR_INCOMPLETE' => 'The new template set requires the template %s to be installed and not inheriting itself.',
 	'TEMPLATE_ERR_STYLE_NAME'	=> 'You must supply a name for this template.',
-	'TEMPLATE_EXPORT'			=> 'Export templates',
 	'TEMPLATE_EXPORT_EXPLAIN'	=> 'Here you can export a template set in the form of an archive. This archive will contain all the files necessary to install the templates on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
 	'TEMPLATE_EXPORTED'			=> 'Templates exported successfully and stored in %s.',
 	'TEMPLATE_FILE'				=> 'Template file',
 	'TEMPLATE_FILE_UPDATED'		=> 'Template file updated successfully.',
-	'TEMPLATE_INHERITS'			=> 'This template sets inherits from %s and thus cannot have a different storage setting than its super template.',
 	'TEMPLATE_NAME'				=> 'Template name',
 	'TEMPLATE_FILE_NOT_WRITABLE'=> 'Unable to write to template file %s. Please check the permissions for the directory and the files.',
 
@@ -371,9 +362,6 @@ $lang = array_merge($lang, array(
 	'THEME_UPDATED'				=> 'Theme updated successfully.',
 
 	'UNDERLINE'				=> 'Underline',
-	'UNINSTALLED_STYLE'		=> 'Uninstalled styles',
-	'UNINSTALLED_TEMPLATE'	=> 'Uninstalled templates',
-	'UNINSTALLED_THEME'		=> 'Uninstalled themes',
 	'UNSET'					=> 'Undefined',
 
 ));
-- 
cgit v1.2.1


From da8009603d05acdccaff15cd610353d85c365220 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 15 Mar 2011 07:45:43 -0400
Subject: [feature/new-tz-handling] Preselect a timezone in registration.

Use Javascript to obtain client's timezone offset and select the
first timezone in our list with that offset.

Changes for prosilver only. The javascript file should be shared
between styles.

PHPBB3-9558
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index c8ffbf31c0..9cbca4b740 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -399,6 +399,7 @@ $lang = array_merge($lang, array(
 	'SIGNATURE_EXPLAIN'			=> 'This is a block of text that can be added to posts you make. There is a %d character limit.',
 	'SIGNATURE_PREVIEW'			=> 'Your signature will appear like this in posts',
 	'SIGNATURE_TOO_LONG'		=> 'Your signature is too long.',
+	'SELECT_TIMEZONE'			=> 'Select timezone',
 	'SORT'						=> 'Sort',
 	'SORT_COMMENT'				=> 'File comment',
 	'SORT_DOWNLOADS'			=> 'Downloads',
-- 
cgit v1.2.1


From e8e5d2b2c000e8a91897b4044c6a3005f60b86ab Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 15 Mar 2011 17:37:15 -0400
Subject: [feature/new-tz-handling] Removed DST and numeric timezone-related
 language.

PHPBB3-9558
---
 phpBB/language/en/acp/board.php |  1 -
 phpBB/language/en/common.php    | 87 -----------------------------------------
 phpBB/language/en/help_faq.php  |  2 +-
 phpBB/language/en/ucp.php       |  1 -
 4 files changed, 1 insertion(+), 90 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index ff516a8146..0be4c0df6d 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -49,7 +49,6 @@ $lang = array_merge($lang, array(
 	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
 	'SITE_DESC'						=> 'Site description',
 	'SITE_NAME'						=> 'Site name',
-	'SYSTEM_DST'					=> 'Enable Summer Time/<abbr title="Daylight Saving Time">DST</abbr>',
 	'SYSTEM_TIMEZONE'				=> 'Guest timezone',
 	'SYSTEM_TIMEZONE_EXPLAIN'			=> 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.',
 	'WARNINGS_EXPIRE'				=> 'Warning duration',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 44a63a6acb..bcb08a8b73 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -786,93 +786,6 @@ $lang = array_merge($lang, array(
 		'Dec'		=> 'Dec',
 	),
 
-	'tz'				=> array(
-		'-12'	=> 'UTC - 12 hours',
-		'-11'	=> 'UTC - 11 hours',
-		'-10'	=> 'UTC - 10 hours',
-		'-9.5'	=> 'UTC - 9:30 hours',
-		'-9'	=> 'UTC - 9 hours',
-		'-8'	=> 'UTC - 8 hours',
-		'-7'	=> 'UTC - 7 hours',
-		'-6'	=> 'UTC - 6 hours',
-		'-5'	=> 'UTC - 5 hours',
-		'-4.5'	=> 'UTC - 4:30 hours',
-		'-4'	=> 'UTC - 4 hours',
-		'-3.5'	=> 'UTC - 3:30 hours',
-		'-3'	=> 'UTC - 3 hours',
-		'-2'	=> 'UTC - 2 hours',
-		'-1'	=> 'UTC - 1 hour',
-		'0'		=> 'UTC',
-		'1'		=> 'UTC + 1 hour',
-		'2'		=> 'UTC + 2 hours',
-		'3'		=> 'UTC + 3 hours',
-		'3.5'	=> 'UTC + 3:30 hours',
-		'4'		=> 'UTC + 4 hours',
-		'4.5'	=> 'UTC + 4:30 hours',
-		'5'		=> 'UTC + 5 hours',
-		'5.5'	=> 'UTC + 5:30 hours',
-		'5.75'	=> 'UTC + 5:45 hours',
-		'6'		=> 'UTC + 6 hours',
-		'6.5'	=> 'UTC + 6:30 hours',
-		'7'		=> 'UTC + 7 hours',
-		'8'		=> 'UTC + 8 hours',
-		'8.75'	=> 'UTC + 8:45 hours',
-		'9'		=> 'UTC + 9 hours',
-		'9.5'	=> 'UTC + 9:30 hours',
-		'10'	=> 'UTC + 10 hours',
-		'10.5'	=> 'UTC + 10:30 hours',
-		'11'	=> 'UTC + 11 hours',
-		'11.5'	=> 'UTC + 11:30 hours',
-		'12'	=> 'UTC + 12 hours',
-		'12.75'	=> 'UTC + 12:45 hours',
-		'13'	=> 'UTC + 13 hours',
-		'14'	=> 'UTC + 14 hours',
-		'dst'	=> '[ <abbr title="Daylight Saving Time">DST</abbr> ]',
-	),
-
-	'tz_zones'	=> array(
-		'-12'	=> '[UTC - 12] Baker Island Time',
-		'-11'	=> '[UTC - 11] Niue Time, Samoa Standard Time',
-		'-10'	=> '[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time',
-		'-9.5'	=> '[UTC - 9:30] Marquesas Islands Time',
-		'-9'	=> '[UTC - 9] Alaska Standard Time, Gambier Island Time',
-		'-8'	=> '[UTC - 8] Pacific Standard Time',
-		'-7'	=> '[UTC - 7] Mountain Standard Time',
-		'-6'	=> '[UTC - 6] Central Standard Time',
-		'-5'	=> '[UTC - 5] Eastern Standard Time',
-		'-4.5'	=> '[UTC - 4:30] Venezuelan Standard Time',
-		'-4'	=> '[UTC - 4] Atlantic Standard Time',
-		'-3.5'	=> '[UTC - 3:30] Newfoundland Standard Time',
-		'-3'	=> '[UTC - 3] Amazon Standard Time, Central Greenland Time',
-		'-2'	=> '[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time',
-		'-1'	=> '[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time',
-		'0'		=> '[UTC] Western European Time, Greenwich Mean Time',
-		'1'		=> '[UTC + 1] Central European Time, West African Time',
-		'2'		=> '[UTC + 2] Eastern European Time, Central African Time',
-		'3'		=> '[UTC + 3] Moscow Standard Time, Eastern African Time',
-		'3.5'	=> '[UTC + 3:30] Iran Standard Time',
-		'4'		=> '[UTC + 4] Gulf Standard Time, Samara Standard Time',
-		'4.5'	=> '[UTC + 4:30] Afghanistan Time',
-		'5'		=> '[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time',
-		'5.5'	=> '[UTC + 5:30] Indian Standard Time, Sri Lanka Time',
-		'5.75'	=> '[UTC + 5:45] Nepal Time',
-		'6'		=> '[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time',
-		'6.5'	=> '[UTC + 6:30] Cocos Islands Time, Myanmar Time',
-		'7'		=> '[UTC + 7] Indochina Time, Krasnoyarsk Standard Time',
-		'8'		=> '[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time',
-		'8.75'	=> '[UTC + 8:45] Southeastern Western Australia Standard Time',
-		'9'		=> '[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time',
-		'9.5'	=> '[UTC + 9:30] Australian Central Standard Time',
-		'10'	=> '[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time',
-		'10.5'	=> '[UTC + 10:30] Lord Howe Standard Time',
-		'11'	=> '[UTC + 11] Solomon Island Time, Magadan Standard Time',
-		'11.5'	=> '[UTC + 11:30] Norfolk Island Time',
-		'12'	=> '[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time',
-		'12.75'	=> '[UTC + 12:45] Chatham Islands Time',
-		'13'	=> '[UTC + 13] Tonga Time, Phoenix Islands Time',
-		'14'	=> '[UTC + 14] Line Island Time',
-	),
-
 	// The value is only an example and will get replaced by the current time on view
 	'dateformats'	=> array(
 		'd M Y, H:i'			=> '01 Jan 2007, 13:37',
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 6ca9589913..5f9af2d721 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -88,7 +88,7 @@ $help = array(
 	),
 	array(
 		0 => 'I changed the timezone and the time is still wrong!',
-		1 => 'If you are sure you have set the timezone and Summer Time/DST correctly and the time is still incorrect, then the time stored on the server clock is incorrect. Please notify an administrator to correct the problem.'
+		1 => 'If you are sure you have set the timezone correctly and the time is still incorrect, then the time stored on the server clock is incorrect. Please notify an administrator to correct the problem.'
 	),
 	array(
 		0 => 'My language is not in the list!',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 9cbca4b740..3925005968 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -103,7 +103,6 @@ $lang = array_merge($lang, array(
 	'BIRTHDAY_EXPLAIN'			=> 'Setting a year will list your age when it is your birthday.',
 	'BOARD_DATE_FORMAT'			=> 'My date format',
 	'BOARD_DATE_FORMAT_EXPLAIN'	=> 'The syntax used is identical to the PHP <a href="http://www.php.net/date">date()</a> function.',
-	'BOARD_DST'					=> 'Summer Time/<abbr title="Daylight Saving Time">DST</abbr> is in effect',
 	'BOARD_LANGUAGE'			=> 'My language',
 	'BOARD_STYLE'				=> 'My board style',
 	'BOARD_TIMEZONE'			=> 'My timezone',
-- 
cgit v1.2.1


From a0131b45f56847f7e5c44a6db66cd7359967585f Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 8 Feb 2012 00:08:17 -0500
Subject: [ticket/10586] Extension front controller

Handle extension front pages

PHPBB3-10586
---
 phpBB/language/en/common.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 7741ff8d1f..94edddc6f5 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -185,7 +185,11 @@ $lang = array_merge($lang, array(
 	'ERR_WRONG_PATH_TO_PHPBB'			=> 'The phpBB path specified appears to be invalid.',
 	'EXPAND_VIEW'						=> 'Expand view',
 	'EXTENSION'							=> 'Extension',
+	'EXTENSION_CONTROLLER_MISSING'		=> 'The extension <strong>%s</strong> is missing a controller class and cannot be accessed through the front-end.',
+	'EXTENSION_CLASS_WRONG_TYPE'		=> 'The extension controller class <strong>%s</strong> is not an instance of the phpbb_extension_controller_interface.',
+	'EXTENSION_DISABLED'				=> 'The extension <strong>%s</strong> is not enabled.',
 	'EXTENSION_DISABLED_AFTER_POSTING'	=> 'The extension <strong>%s</strong> has been deactivated and can no longer be displayed.',
+	'EXTENSION_DOES_NOT_EXIST'			=> 'The extension <strong>%s</strong> does not exist.',
 
 	'FAQ'					=> 'FAQ',
 	'FAQ_EXPLAIN'			=> 'Frequently Asked Questions',
-- 
cgit v1.2.1


From cfb8f01040ca9fded20d8f3dd4620cd7477d60fc Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 24 Mar 2012 22:03:03 -0400
Subject: [ticket/10727] Do not hide Quick Reply with javascript on prosilver

PHPBB3-10727
---
 phpBB/language/en/viewtopic.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 2b20938afe..f47f8a076b 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -47,7 +47,6 @@ $lang = array_merge($lang, array(
 	'BUMP_TOPIC'			=> 'Bump topic',
 
 	'CODE'					=> 'Code',
-	'COLLAPSE_QR'			=> 'Hide Quick Reply',
 
 	'DELETE_TOPIC'			=> 'Delete topic',
 	'DOWNLOAD_NOTICE'		=> 'You do not have the required permissions to view the files attached to this post.',
@@ -97,7 +96,6 @@ $lang = array_merge($lang, array(
 	'REPLY_TO_TOPIC'		=> 'Reply to topic',
 	'RETURN_POST'			=> '%sReturn to the post%s',
 
-	'SHOW_QR'				=> 'Quick Reply',
 	'SUBMIT_VOTE'			=> 'Submit vote',
 
 	'TOTAL_VOTES'			=> 'Total votes',
-- 
cgit v1.2.1


From 75e731e14b219d5b926755e01b957a5640f26ac8 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 8 Mar 2012 17:31:19 -0500
Subject: [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2

PHPBB3-10693
---
 phpBB/language/en/install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 254db4a5c1..ca6045a921 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -300,10 +300,10 @@ $lang = array_merge($lang, array(
 	'PHP_REGISTER_GLOBALS_EXPLAIN'	=> 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.',
 	'PHP_SAFE_MODE'					=> 'Safe mode',
 	'PHP_SETTINGS'					=> 'PHP version and settings',
-	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.2.0 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
+	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.3.2 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
 	'PHP_URL_FOPEN_SUPPORT'			=> 'PHP setting <var>allow_url_fopen</var> is enabled',
 	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it.',
-	'PHP_VERSION_REQD'				=> 'PHP version >= 5.2.0',
+	'PHP_VERSION_REQD'				=> 'PHP version >= 5.3.2',
 	'POST_ID'						=> 'Post ID',
 	'PREFIX_FOUND'					=> 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
 	'PREPROCESS_STEP'				=> 'Executing pre-processing functions/queries',
-- 
cgit v1.2.1


From 28fac327426de08b7a5476b2417fef4f03be6908 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 29 Mar 2012 15:51:06 +0100
Subject: [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language

Located the WARNINGS_ZERO_TOTAL in the language and replaced it with
NO_WARNINGS

PHPBB3-10705
---
 phpBB/language/en/mcp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 664365b1ec..d57036cc0e 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -388,7 +388,7 @@ $lang = array_merge($lang, array(
 	'WARNING_PM_BODY'		=> 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]',
 	'WARNING_PM_SUBJECT'	=> 'Board warning issued',
 	'WARNING_POST_DEFAULT'	=> 'This is a warning regarding the following post made by you: %s .',
-	'WARNINGS_ZERO_TOTAL'	=> 'No warnings exist.',
+	'NO_WARNINGS'	=> 'No warnings exist.',
 
 	'YOU_SELECTED_TOPIC'	=> 'You selected topic number %d: %s.',
 
-- 
cgit v1.2.1


From 506951e8aff98582ebc56fcda9ed0626497ade77 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Fri, 30 Mar 2012 16:13:16 +0300
Subject: [feature/merging-style-components] Changing acp_styles text

Changing acp styles welcome message a little bit.

PHPBB3-10632
---
 phpBB/language/en/acp/styles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index fe7fae5808..8a4a8e7308 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -237,7 +237,7 @@ $lang = array_merge($lang, array(
 	'INHERITING_FROM'			=> 'Inherits from',
 	'INSTALL_STYLE'				=> 'Install style',
 	'INSTALL_STYLES'			=> 'Install styles',
-	'INSTALL_STYLES_EXPLAIN'	=> 'Here you can install new styles.<br />If you cannot find a specific style in list below, check if that style is already installed. If it is not installed, check if it was uploaded correctly.',
+	'INSTALL_STYLES_EXPLAIN'	=> 'Here you can install new styles.<br />If you cannot find a specific style in list below, check to make sure style is already installed. If it is not installed, check if it was uploaded correctly.',
 	'INSTALLED_STYLE'			=> 'Installed styles',
 	'INVALID_STYLE_ID'			=> 'Invalid style ID.',
 
-- 
cgit v1.2.1


From 8a28456f759747fc34aaf9a6589102fcace3acb6 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sat, 16 Jul 2011 17:53:22 +0100
Subject: [ticket/10273] AJAXified approve / disapprove posts (in viewtopic).

This commit AJAXifies the moderator approval functionality, and adds it to
viewtopic instead of the MCP. This commit has involved some language changes,
which may affect fallbacks.

PHPBB3-10273
---
 phpBB/language/en/common.php    | 2 +-
 phpBB/language/en/viewtopic.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 94edddc6f5..19b801e585 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -476,7 +476,7 @@ $lang = array_merge($lang, array(
 	'POST_SUBJECT'			=> 'Post subject',
 	'POST_TIME'				=> 'Post time',
 	'POST_TOPIC'			=> 'Post a new topic',
-	'POST_UNAPPROVED'		=> 'This post is waiting for approval',
+	'POST_UNAPPROVED'		=> 'Post awaiting approval:',
 	'PREVIEW'				=> 'Preview',
 	'PREVIOUS'				=> 'Previous',		// Used in pagination
 	'PREVIOUS_STEP'			=> 'Previous',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index f47f8a076b..1460490672 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -35,6 +35,7 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 $lang = array_merge($lang, array(
+	'APPROVE'								=> 'Approve',
 	'ATTACHMENT'						=> 'Attachment',
 	'ATTACHMENT_FUNCTIONALITY_DISABLED'	=> 'The attachments feature has been disabled.',
 
@@ -49,6 +50,7 @@ $lang = array_merge($lang, array(
 	'CODE'					=> 'Code',
 
 	'DELETE_TOPIC'			=> 'Delete topic',
+	'DISAPPROVE'					=> 'Disapprove',
 	'DOWNLOAD_NOTICE'		=> 'You do not have the required permissions to view the files attached to this post.',
 
 	'EDITED_TIMES_TOTAL'	=> array(
-- 
cgit v1.2.1


From 420de9c9a0a638135da147a498436dbe7abfd4bd Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 11:42:39 +0100
Subject: [ticket/10270] Moved some HTML from the JavaScript to overall_footer.

PHPBB3-10270
---
 phpBB/language/en/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 19b801e585..e8fff96e5a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -314,6 +314,7 @@ $lang = array_merge($lang, array(
 	'LDAP_NO_SERVER_CONNECTION'			=> 'Could not connect to LDAP server.',
 	'LDAP_SEARCH_FAILED'				=> 'An error occured while searching the LDAP directory.',
 	'LEGEND'							=> 'Legend',
+	'LOADING'							=> 'Loading',
 	'LOCATION'							=> 'Location',
 	'LOCK_POST'							=> 'Lock post',
 	'LOCK_POST_EXPLAIN'					=> 'Prevent editing',
@@ -451,6 +452,7 @@ $lang = array_merge($lang, array(
 		2	=> '%d pixels',
 	),
 	'PLAY_QUICKTIME_FILE'	=> 'Play Quicktime file',
+	'PLEASE_WAIT'			=> 'Please wait.',
 	'PM'					=> 'PM',
 	'PM_REPORTED'			=> 'Click to view report',
 	'POSTING_MESSAGE'		=> 'Posting message in %s',
-- 
cgit v1.2.1


From 11112314f757f4a6c65852817fba0f1a2f4526d2 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 12:46:33 +0100
Subject: [ticket/10271] AJAXified various deletions in the ACP.

The following places have had deletion AJAXified:
* Smilies and icons
* Word censors
* BBCodes
* Attachment groups
* Groups
* Admin / User / Moderator / Forum roles
* Report / denial reasons
* Module management
* Custom profile fields

PHPBB3-10271
---
 phpBB/language/en/acp/posting.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 84cf640d1f..76d4869990 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -45,6 +45,7 @@ $lang = array_merge($lang, array(
 
 	'BBCODE_ADDED'				=> 'BBCode added successfully.',
 	'BBCODE_EDITED'				=> 'BBCode edited successfully.',
+	'BBCODE_DELETED'			=> 'The BBCode has been removed successfully.',
 	'BBCODE_NOT_EXIST'			=> 'The BBCode you selected does not exist.',
 	'BBCODE_HELPLINE'			=> 'Help line',
 	'BBCODE_HELPLINE_EXPLAIN'	=> 'This field contains the mouse over text of the BBCode.',
-- 
cgit v1.2.1


From 1cb3b595ec70730429a9c8654b248fc6d50cf1b3 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 15:45:51 +0100
Subject: [ticket/10271] AJAXified the styles tab in the ACP.

PHPBB3-10271
---
 phpBB/language/en/acp/styles.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 59df82477e..3a96100947 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -295,9 +295,11 @@ $lang = array_merge($lang, array(
 	'SELECTED_THEME_FILE'		=> 'Selected theme file',
 	'STORE_FILESYSTEM'			=> 'Filesystem',
 	'STYLE_ACTIVATE'			=> 'Activate',
+	'STYLE_ACTIVATED'			=> 'Style activated successfully',
 	'STYLE_ACTIVE'				=> 'Active',
 	'STYLE_ADDED'				=> 'Style added successfully.',
 	'STYLE_DEACTIVATE'			=> 'Deactivate',
+	'STYLE_DEACTIVATED'			=> 'Style deactivated successfully',
 	'STYLE_DEFAULT'				=> 'Make default style',
 	'STYLE_DELETED'				=> 'Style deleted successfully.',
 	'STYLE_DETAILS_UPDATED'		=> 'Style edited successfully.',
-- 
cgit v1.2.1


From 4ae74cd4b450ae4cca956f6f3e2371429f67deec Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Wed, 24 Aug 2011 16:06:06 +0100
Subject: [ticket/10271] AJAXified buttons on acp_main.

PHPBB3-10271
---
 phpBB/language/en/acp/common.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 242329a041..f96947b580 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -368,25 +368,32 @@ $lang = array_merge($lang, array(
 	'PURGE_CACHE'			=> 'Purge the cache',
 	'PURGE_CACHE_CONFIRM'	=> 'Are you sure you wish to purge the cache?',
 	'PURGE_CACHE_EXPLAIN'	=> 'Purge all cache related items, this includes any cached template files or queries.',
+	'PURGE_CACHE_SUCCESS'	=> 'Cache successfully purged.',
 
 	'PURGE_SESSIONS'			=> 'Purge all sessions',
 	'PURGE_SESSIONS_CONFIRM'	=> 'Are you sure you wish to purge all sessions? This will log out all users.',
 	'PURGE_SESSIONS_EXPLAIN'	=> 'Purge all sessions. This will log out all users by truncating the session table.',
+	'PURGE_SESSIONS_SUCCESS'	=> 'Sessions successfully purged.',
 
 	'RESET_DATE'					=> 'Reset board’s start date',
 	'RESET_DATE_CONFIRM'			=> 'Are you sure you wish to reset the board’s start date?',
+	'RESET_DATE_SUCCESS'				=> 'Board’s start date reset',
 	'RESET_ONLINE'					=> 'Reset most users ever online',
 	'RESET_ONLINE_CONFIRM'			=> 'Are you sure you wish to reset the most users ever online counter?',
+	'RESET_ONLINE_SUCCESS'				=> 'Most users ever online reset',
 	'RESYNC_FILES_STATS_CONFIRM'	=> 'Are you sure you wish to resynchronise files statistics?',
 	'RESYNC_POSTCOUNTS'				=> 'Resynchronise post counts',
 	'RESYNC_POSTCOUNTS_EXPLAIN'		=> 'Only existing posts will be taken into consideration. Pruned posts will not be counted.',
 	'RESYNC_POSTCOUNTS_CONFIRM'		=> 'Are you sure you wish to resynchronise post counts?',
+	'RESYNC_POSTCOUNTS_SUCCESS'			=> 'Resynchronised post counts',
 	'RESYNC_POST_MARKING'			=> 'Resynchronise dotted topics',
 	'RESYNC_POST_MARKING_CONFIRM'	=> 'Are you sure you wish to resynchronise dotted topics?',
 	'RESYNC_POST_MARKING_EXPLAIN'	=> 'First unmarks all topics and then correctly marks topics that have seen any activity during the past six months.',
+	'RESYNC_POST_MARKING_SUCCESS'	=> 'Resynchronised dotted topics',
 	'RESYNC_STATS'					=> 'Resynchronise statistics',
 	'RESYNC_STATS_CONFIRM'			=> 'Are you sure you wish to resynchronise statistics?',
 	'RESYNC_STATS_EXPLAIN'			=> 'Recalculates the total number of posts, topics, users and files.',
+	'RESYNC_STATS_SUCCESS'			=> 'Resynchronised statistics',
 	'RUN'							=> 'Run now',
 
 	'STATISTIC'					=> 'Statistic',
-- 
cgit v1.2.1


From 0e55b2393dffa269a724f3090469dad563217dff Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Sun, 25 Sep 2011 16:02:26 +0100
Subject: [ticket/10270] Removed all the inline language and HTML from the JS.

PHPBB3-10270
---
 phpBB/language/en/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index e8fff96e5a..ff3d229915 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -179,10 +179,12 @@ $lang = array_merge($lang, array(
 	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',
 	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
 	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
+	'ERR_PROCESSING_REQ'			=> 'There was an error processing your request. Please try again.',
 	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
 	'ERR_UNWATCHING'					=> 'An error occured while trying to unsubscribe.',
 	'ERR_WATCHING'						=> 'An error occured while trying to subscribe.',
 	'ERR_WRONG_PATH_TO_PHPBB'			=> 'The phpBB path specified appears to be invalid.',
+	'ERROR'									=> 'Error',
 	'EXPAND_VIEW'						=> 'Expand view',
 	'EXTENSION'							=> 'Extension',
 	'EXTENSION_CONTROLLER_MISSING'		=> 'The extension <strong>%s</strong> is missing a controller class and cannot be accessed through the front-end.',
-- 
cgit v1.2.1


From f9ddeacd8e25f74845704d1186dbc4edde6a71d7 Mon Sep 17 00:00:00 2001
From: Callum Macrae <callum@lynxphp.com>
Date: Thu, 17 Nov 2011 17:32:56 +0000
Subject: [ticket/10272] Renamed l-err-processing-req to
 l-timeout-processing-req.

PHPBB3-10272
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index ff3d229915..4983aaca69 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -179,7 +179,6 @@ $lang = array_merge($lang, array(
 	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',
 	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
 	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
-	'ERR_PROCESSING_REQ'			=> 'There was an error processing your request. Please try again.',
 	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
 	'ERR_UNWATCHING'					=> 'An error occured while trying to unsubscribe.',
 	'ERR_WATCHING'						=> 'An error occured while trying to subscribe.',
@@ -601,6 +600,7 @@ $lang = array_merge($lang, array(
 	'TEST_CONNECTION'	=> 'Test connection',
 	'THE_TEAM'			=> 'The team',
 	'TIME'				=> 'Time',
+	'TIMEOUT_PROCESSING_REQ'			=> 'Request timed out.',
 	
 	'TOO_LARGE'						=> 'The value you entered is too large.',
 	'TOO_LARGE_MAX_RECIPIENTS'		=> 'The value of <strong>Maximum number of allowed recipients per private message</strong> setting you entered is too large.',
-- 
cgit v1.2.1


From 27199bb50954e22416e64154032e08801d0fbb6d Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 15 Feb 2012 20:58:00 +0100
Subject: [feature/ajax] Generic error handling with a phpbb.alert box

PHPBB3-10270
---
 phpBB/language/en/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 4983aaca69..b92b915623 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -67,6 +67,8 @@ $lang = array_merge($lang, array(
 	'ADMINISTRATORS'				=> 'Administrators',
 	'AGE'							=> 'Age',
 	'AIM'							=> 'AIM',
+	'AJAX_ERROR_TITLE'				=> 'AJAX error',
+	'AJAX_ERROR_TEXT'				=> 'Something went wrong when processing your request.',
 	'ALLOWED'						=> 'Allowed',
 	'ALL_FILES'						=> 'All files',
 	'ALL_FORUMS'					=> 'All forums',
-- 
cgit v1.2.1


From a7045e65724481002e232a7d143b7cc2ed6acb3a Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 30 Mar 2012 21:43:00 -0400
Subject: [feature/qrpreview] Preview from Quick Reply

PHPBB3-10726
---
 phpBB/language/en/viewtopic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 1460490672..184f88ed3c 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -62,7 +62,7 @@ $lang = array_merge($lang, array(
 
 	'FILE_NOT_FOUND_404'	=> 'The file <strong>%s</strong> does not exist.',
 	'FORK_TOPIC'			=> 'Copy topic',
-	'FULL_EDITOR'			=> 'Full Editor',
+	'FULL_EDITOR'			=> 'Full Editor &amp; Preview',
 	
 	'LINKAGE_FORBIDDEN'		=> 'You are not authorised to view, download or link from/to this site.',
 	'LOGIN_NOTIFY_TOPIC'	=> 'You have been notified about this topic, please login to view it.',
-- 
cgit v1.2.1


From 0540509f145d7eb9ba1fd4468399b48edcf46d23 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 31 Mar 2012 17:58:17 +0300
Subject: [feature/merging-style-components] Renaming "delete" to "uninstall"
 for styles

Changing from "delete" to "uninstall" in acp_styles to avoid confusing users

PHPBB3-10632
---
 phpBB/language/en/acp/styles.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 1a6335cdbf..f5bab1d76f 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -55,6 +55,7 @@ $lang = array_merge($lang, array(
 	'CANNOT_BE_INSTALLED'			=> 'Cannot be installed',
 	'CONFIRM_TEMPLATE_CLEAR_CACHE'	=> 'Are you sure you wish to clear all cached versions of your template files?',
 	'CONFIRM_DELETE_STYLES'			=> 'Are you sure you wish to delete selected styles?',
+	'CONFIRM_UNINSTALL_STYLES'		=> 'Are you sure you wish to uninstall selected styles?',
 	'COPYRIGHT'						=> 'Copyright',
 	'CREATE_STYLE'					=> 'Create new style',
 	'CREATE_TEMPLATE'				=> 'Create new template set',
@@ -62,7 +63,6 @@ $lang = array_merge($lang, array(
 	'CURRENT_IMAGE'					=> 'Current image',
 
 	'DEACTIVATE_DEFAULT'		=> 'You cannot deactivate the default style.',
-	'DELETE_DEFAULT'			=> 'You cannot delete the default style.',
 	'DELETE_FROM_FS'			=> 'Delete from filesystem',
 	'DELETE_STYLE'				=> 'Delete style',
 	'DELETE_STYLE_EXPLAIN'		=> 'Here you can remove the selected style. Take care in deleting styles, there is no undo capability.',
@@ -291,7 +291,6 @@ $lang = array_merge($lang, array(
 	'STYLE_DEFAULT'				=> 'Make default style',
 	'STYLE_DEFAULT_CHANGE'		=> 'Change default style',
 	'STYLE_DEFAULT_CHANGE_INACTIVE'	=> 'You must activate style before making it default style.',
-	'STYLE_DELETE_DEPENDENT'	=> 'Style "%s" cannot be deleted because it has one or more child styles.',
 	'STYLE_DELETED'				=> 'Style "%s" deleted successfully.',
 	'STYLE_DETAILS_UPDATED'		=> 'Style edited successfully.',
 	'STYLE_ERR_ARCHIVE'			=> 'Please select an archive method.',
@@ -316,6 +315,9 @@ $lang = array_merge($lang, array(
 	'STYLE_PARENT'				=> 'Parent style:',
 	'STYLE_TEMPLATE'			=> 'Template',
 	'STYLE_THEME'				=> 'Theme',
+	'STYLE_UNINSTALL'			=> 'Uninstall',
+	'STYLE_UNINSTALL_DEPENDENT'	=> 'Style "%s" cannot be uninstalled because it has one or more child styles.',
+	'STYLE_UNINSTALLED'			=> 'Style "%s" uninstalled successfully.',
 	'STYLE_USED_BY'				=> 'Used by (including robots)',
 
 	'TEMPLATE_ADDED'			=> 'Template set added.',
@@ -364,6 +366,7 @@ $lang = array_merge($lang, array(
 	'THEME_UPDATED'				=> 'Theme updated successfully.',
 
 	'UNDERLINE'				=> 'Underline',
+	'UNINSTALL_DEFAULT'		=> 'You cannot uninstall the default style.',
 	'UNSET'					=> 'Undefined',
 
 ));
-- 
cgit v1.2.1


From f32547c2150a3e6201edf0f856a93229040c73be Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sat, 24 Mar 2012 12:57:28 +0530
Subject: [ticket/10650] Displaying last topic on forum list

The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
---
 phpBB/language/en/acp/forums.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 756cb7ae0f..d456e8693d 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -57,6 +57,8 @@ $lang = array_merge($lang, array(
 	'DELETE_ALL_POSTS'					=> 'Delete posts',
 	'DELETE_SUBFORUMS'					=> 'Delete subforums and posts',
 	'DISPLAY_ACTIVE_TOPICS'				=> 'Enable active topics',
+	'DISPLAY_LAST_SUBJECT'				=> 'Display last added post title on forum list',
+	'DISPLAY_LAST_SUBJECT_EXPLAIN'		=> 'If set to yes the title of the last added post will be displayed in the forum list with a hyperlink to the post.',
 	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'		=> 'If set to yes active topics in selected subforums will be displayed under this category.',
 
 	'EDIT_FORUM'					=> 'Edit forum',
-- 
cgit v1.2.1


From 01e6254ccca0536a43703c118496b189654d3904 Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sat, 31 Mar 2012 22:41:41 +0530
Subject: [ticket/10650] Changed language files and forumlist

The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
---
 phpBB/language/en/acp/forums.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index d456e8693d..9141abc8eb 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -57,8 +57,8 @@ $lang = array_merge($lang, array(
 	'DELETE_ALL_POSTS'					=> 'Delete posts',
 	'DELETE_SUBFORUMS'					=> 'Delete subforums and posts',
 	'DISPLAY_ACTIVE_TOPICS'				=> 'Enable active topics',
-	'DISPLAY_LAST_SUBJECT'				=> 'Display last added post title on forum list',
-	'DISPLAY_LAST_SUBJECT_EXPLAIN'		=> 'If set to yes the title of the last added post will be displayed in the forum list with a hyperlink to the post.',
+	'DISPLAY_LAST_SUBJECT'				=> 'Display subject of last added post on forum list',
+	'DISPLAY_LAST_SUBJECT_EXPLAIN'		=> 'If set to yes the subject of the last added post will be displayed in the forum list with a hyperlink to the post.',
 	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'		=> 'If set to yes active topics in selected subforums will be displayed under this category.',
 
 	'EDIT_FORUM'					=> 'Edit forum',
-- 
cgit v1.2.1


From 98964a913cb22761553d04170aa4830e324f7488 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 4 Apr 2012 18:28:36 -0400
Subject: [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop

The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.

PHPBB3-10650
---
 phpBB/language/en/acp/forums.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 9141abc8eb..756cb7ae0f 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -57,8 +57,6 @@ $lang = array_merge($lang, array(
 	'DELETE_ALL_POSTS'					=> 'Delete posts',
 	'DELETE_SUBFORUMS'					=> 'Delete subforums and posts',
 	'DISPLAY_ACTIVE_TOPICS'				=> 'Enable active topics',
-	'DISPLAY_LAST_SUBJECT'				=> 'Display subject of last added post on forum list',
-	'DISPLAY_LAST_SUBJECT_EXPLAIN'		=> 'If set to yes the subject of the last added post will be displayed in the forum list with a hyperlink to the post.',
 	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'		=> 'If set to yes active topics in selected subforums will be displayed under this category.',
 
 	'EDIT_FORUM'					=> 'Edit forum',
-- 
cgit v1.2.1


From 9b30bd639201ffbbf1d1b3ae32fda7e75d3253dd Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sat, 24 Mar 2012 12:57:28 +0530
Subject: [ticket/10650] Displaying last topic on forum list

The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
---
 phpBB/language/en/acp/forums.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 756cb7ae0f..d456e8693d 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -57,6 +57,8 @@ $lang = array_merge($lang, array(
 	'DELETE_ALL_POSTS'					=> 'Delete posts',
 	'DELETE_SUBFORUMS'					=> 'Delete subforums and posts',
 	'DISPLAY_ACTIVE_TOPICS'				=> 'Enable active topics',
+	'DISPLAY_LAST_SUBJECT'				=> 'Display last added post title on forum list',
+	'DISPLAY_LAST_SUBJECT_EXPLAIN'		=> 'If set to yes the title of the last added post will be displayed in the forum list with a hyperlink to the post.',
 	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'		=> 'If set to yes active topics in selected subforums will be displayed under this category.',
 
 	'EDIT_FORUM'					=> 'Edit forum',
-- 
cgit v1.2.1


From 492c27a6935aa1fe3165ee3cd89897496fa153d1 Mon Sep 17 00:00:00 2001
From: Rahul <rahulr92@phpbb.com>
Date: Sat, 31 Mar 2012 22:41:41 +0530
Subject: [ticket/10650] Changed language files and forumlist

The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
---
 phpBB/language/en/acp/forums.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index d456e8693d..9141abc8eb 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -57,8 +57,8 @@ $lang = array_merge($lang, array(
 	'DELETE_ALL_POSTS'					=> 'Delete posts',
 	'DELETE_SUBFORUMS'					=> 'Delete subforums and posts',
 	'DISPLAY_ACTIVE_TOPICS'				=> 'Enable active topics',
-	'DISPLAY_LAST_SUBJECT'				=> 'Display last added post title on forum list',
-	'DISPLAY_LAST_SUBJECT_EXPLAIN'		=> 'If set to yes the title of the last added post will be displayed in the forum list with a hyperlink to the post.',
+	'DISPLAY_LAST_SUBJECT'				=> 'Display subject of last added post on forum list',
+	'DISPLAY_LAST_SUBJECT_EXPLAIN'		=> 'If set to yes the subject of the last added post will be displayed in the forum list with a hyperlink to the post.',
 	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'		=> 'If set to yes active topics in selected subforums will be displayed under this category.',
 
 	'EDIT_FORUM'					=> 'Edit forum',
-- 
cgit v1.2.1


From c524236ef6d84f6ef78f684aeb7bb469ca844db4 Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Fri, 6 Apr 2012 01:07:23 +0530
Subject: [ticket/10650] Changed acp option from per forum to global

Changed the display last subject acp toggle option from
per forum to global. Modified associated database entries.
New option is available in ACP General->Board Features.
Also corrected <br /> in forumlist_body.html.

PHPBB3-10650
---
 phpBB/language/en/acp/board.php  | 2 ++
 phpBB/language/en/acp/forums.php | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 0bb99b5449..187d823fd0 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -44,6 +44,8 @@ $lang = array_merge($lang, array(
 	'DEFAULT_STYLE'					=> 'Default style',
 	'DISABLE_BOARD'					=> 'Disable board',
 	'DISABLE_BOARD_EXPLAIN'			=> 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
+	'DISPLAY_LAST_SUBJECT'			=> 'Display subject of last added post on forum list',
+	'DISPLAY_LAST_SUBJECT_EXPLAIN'	=> 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and ones in which user doesnt have read access are not shown.',	
 	'OVERRIDE_STYLE'				=> 'Override user style',
 	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
 	'SITE_DESC'						=> 'Site description',
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 9141abc8eb..756cb7ae0f 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -57,8 +57,6 @@ $lang = array_merge($lang, array(
 	'DELETE_ALL_POSTS'					=> 'Delete posts',
 	'DELETE_SUBFORUMS'					=> 'Delete subforums and posts',
 	'DISPLAY_ACTIVE_TOPICS'				=> 'Enable active topics',
-	'DISPLAY_LAST_SUBJECT'				=> 'Display subject of last added post on forum list',
-	'DISPLAY_LAST_SUBJECT_EXPLAIN'		=> 'If set to yes the subject of the last added post will be displayed in the forum list with a hyperlink to the post.',
 	'DISPLAY_ACTIVE_TOPICS_EXPLAIN'		=> 'If set to yes active topics in selected subforums will be displayed under this category.',
 
 	'EDIT_FORUM'					=> 'Edit forum',
-- 
cgit v1.2.1


From 2dec700aabcb8b5bebf707b41378ede61512e745 Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Sun, 8 Apr 2012 22:52:49 +0530
Subject: [ticket/10650] Added ellipsis to language file

Added ELLIPSIS to language file common.php and also corrected
language explanation of ACP option.

PHPBB3-10650
---
 phpBB/language/en/acp/board.php | 2 +-
 phpBB/language/en/common.php    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 187d823fd0..7329f8dcaf 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -45,7 +45,7 @@ $lang = array_merge($lang, array(
 	'DISABLE_BOARD'					=> 'Disable board',
 	'DISABLE_BOARD_EXPLAIN'			=> 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
 	'DISPLAY_LAST_SUBJECT'			=> 'Display subject of last added post on forum list',
-	'DISPLAY_LAST_SUBJECT_EXPLAIN'	=> 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and ones in which user doesnt have read access are not shown.',	
+	'DISPLAY_LAST_SUBJECT_EXPLAIN'	=> 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesnt have read access are not shown.',	
 	'OVERRIDE_STYLE'				=> 'Override user style',
 	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
 	'SITE_DESC'						=> 'Site description',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 12f8edad9e..f46e5df4db 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -169,6 +169,7 @@ $lang = array_merge($lang, array(
 	),
 
 	'EDIT_POST'							=> 'Edit post',
+	'ELLIPSIS'							=>	' &#133;', // ...
 	'EMAIL'								=> 'E-mail', // Short form for EMAIL_ADDRESS
 	'EMAIL_ADDRESS'						=> 'E-mail address',
 	'EMAIL_SMTP_ERROR_RESPONSE'			=> 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',
-- 
cgit v1.2.1


From 303748b02db2aa76391f60770c292edf45cee360 Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Mon, 9 Apr 2012 01:43:44 +0530
Subject: [ticket/10650] Added space after if and comment

Added space in proper places in database_update.php. Also
corrected language entry of ELLIPSIS to utf8

PHPBB3-10650
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index f46e5df4db..bf44ba0796 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -169,7 +169,7 @@ $lang = array_merge($lang, array(
 	),
 
 	'EDIT_POST'							=> 'Edit post',
-	'ELLIPSIS'							=>	' &#133;', // ...
+	'ELLIPSIS'							=>	' ...',
 	'EMAIL'								=> 'E-mail', // Short form for EMAIL_ADDRESS
 	'EMAIL_ADDRESS'						=> 'E-mail address',
 	'EMAIL_SMTP_ERROR_RESPONSE'			=> 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',
-- 
cgit v1.2.1


From db275d0a907f60fc437710b099b21061ef3b0daf Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Mon, 9 Apr 2012 02:51:18 +0530
Subject: [ticket/10650] Inserted correct utf ELLIPSIS character

Inserted the correct utf-8 ellipsis to the language file.

PHPBB3-10650
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index bf44ba0796..91c37e82bd 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -169,7 +169,7 @@ $lang = array_merge($lang, array(
 	),
 
 	'EDIT_POST'							=> 'Edit post',
-	'ELLIPSIS'							=>	' ...',
+	'ELLIPSIS'							=>	'…',
 	'EMAIL'								=> 'E-mail', // Short form for EMAIL_ADDRESS
 	'EMAIL_ADDRESS'						=> 'E-mail address',
 	'EMAIL_SMTP_ERROR_RESPONSE'			=> 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',
-- 
cgit v1.2.1


From 6661c92dd3ce4dc9b414bb39706298725057b7c0 Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Mon, 9 Apr 2012 03:22:35 +0530
Subject: [ticket/10650] Added apostrophe in explanation in language file

A missing apostrophe was added to the language file entry
of DISPLAY_LAST_SUBJECT_EXPLAIN

PHPBB3-10650
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 7329f8dcaf..a448c0ee7d 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -45,7 +45,7 @@ $lang = array_merge($lang, array(
 	'DISABLE_BOARD'					=> 'Disable board',
 	'DISABLE_BOARD_EXPLAIN'			=> 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
 	'DISPLAY_LAST_SUBJECT'			=> 'Display subject of last added post on forum list',
-	'DISPLAY_LAST_SUBJECT_EXPLAIN'	=> 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesnt have read access are not shown.',	
+	'DISPLAY_LAST_SUBJECT_EXPLAIN'	=> 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesn\'t have read access are not shown.',	
 	'OVERRIDE_STYLE'				=> 'Override user style',
 	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
 	'SITE_DESC'						=> 'Site description',
-- 
cgit v1.2.1


From bab32bd56afefb97634f7c9ac336c7ac2fe3f7c1 Mon Sep 17 00:00:00 2001
From: Rahul R <rahulr92@gmail.com>
Date: Wed, 11 Apr 2012 06:23:56 +0530
Subject: [ticket/10650] Changed apostrophe to utf8 single quote

The apostrophe in language entry DISPLAY_LAST_SUBJECT_EXPLAIN
was changed to utf8 single quote character.

PHPBB3-10650
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index a448c0ee7d..19c380e0a6 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -45,7 +45,7 @@ $lang = array_merge($lang, array(
 	'DISABLE_BOARD'					=> 'Disable board',
 	'DISABLE_BOARD_EXPLAIN'			=> 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
 	'DISPLAY_LAST_SUBJECT'			=> 'Display subject of last added post on forum list',
-	'DISPLAY_LAST_SUBJECT_EXPLAIN'	=> 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesn\'t have read access are not shown.',	
+	'DISPLAY_LAST_SUBJECT_EXPLAIN'	=> 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesn’t have read access are not shown.',	
 	'OVERRIDE_STYLE'				=> 'Override user style',
 	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
 	'SITE_DESC'						=> 'Site description',
-- 
cgit v1.2.1


From 3741e99aab94fc903db82c1c4d3d6b1f7b1e2a1a Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Sun, 15 Apr 2012 20:10:51 +0200
Subject: [ticket/10161] all "e-mail" strings in language files changed to
 "email"

according to Oleg's comment:
email is preferred by RFCs and probably the way of the future

PHPBB3-10161
---
 phpBB/language/en/acp/ban.php                      | 14 ++---
 phpBB/language/en/acp/board.php                    | 60 +++++++++++-----------
 phpBB/language/en/acp/common.php                   | 32 ++++++------
 phpBB/language/en/acp/email.php                    |  6 +--
 phpBB/language/en/acp/language.php                 |  2 +-
 phpBB/language/en/acp/permissions.php              |  2 +-
 phpBB/language/en/acp/permissions_phpbb.php        | 10 ++--
 phpBB/language/en/acp/posting.php                  |  2 +-
 phpBB/language/en/acp/styles.php                   |  4 +-
 phpBB/language/en/acp/users.php                    |  6 +--
 phpBB/language/en/common.php                       | 28 +++++-----
 phpBB/language/en/email/admin_send_email.txt       |  4 +-
 phpBB/language/en/email/admin_welcome_inactive.txt |  2 +-
 phpBB/language/en/email/coppa_resend_inactive.txt  |  2 +-
 phpBB/language/en/email/coppa_welcome_inactive.txt |  2 +-
 phpBB/language/en/email/email_notify.txt           |  6 +--
 phpBB/language/en/email/installed.txt              |  2 +-
 phpBB/language/en/email/profile_send_email.txt     |  4 +-
 .../language/en/email/user_reactivate_account.txt  |  2 +-
 phpBB/language/en/email/user_resend_inactive.txt   |  2 +-
 phpBB/language/en/email/user_welcome.txt           |  2 +-
 phpBB/language/en/email/user_welcome_inactive.txt  |  2 +-
 phpBB/language/en/help_bbcode.php                  |  2 +-
 phpBB/language/en/help_faq.php                     | 12 ++---
 phpBB/language/en/install.php                      |  4 +-
 phpBB/language/en/mcp.php                          |  2 +-
 phpBB/language/en/memberlist.php                   | 20 ++++----
 phpBB/language/en/ucp.php                          | 46 ++++++++---------
 phpBB/language/en/viewtopic.php                    |  4 +-
 29 files changed, 143 insertions(+), 143 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 77e8a93f3c..2dc0489030 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -40,7 +40,7 @@ $lang = array_merge($lang, array(
 	'30_MINS'		=> '30 minutes',
 	'6_HOURS'		=> '6 hours',
 
-	'ACP_BAN_EXPLAIN'	=> 'Here you can control the banning of users by name, IP or e-mail address. These methods prevent a user reaching any part of the board. You can give a short (maximum 3000 characters) reason for the ban if you wish. This will be displayed in the admin log. The duration of a ban can also be specified. If you want the ban to end on a specific date rather than after a set time period select <span style="text-decoration: underline;">Until -&gt;</span> for the ban length and enter a date in <kbd>YYYY-MM-DD</kbd> format.',
+	'ACP_BAN_EXPLAIN'	=> 'Here you can control the banning of users by name, IP or email address. These methods prevent a user reaching any part of the board. You can give a short (maximum 3000 characters) reason for the ban if you wish. This will be displayed in the admin log. The duration of a ban can also be specified. If you want the ban to end on a specific date rather than after a set time period select <span style="text-decoration: underline;">Until -&gt;</span> for the ban length and enter a date in <kbd>YYYY-MM-DD</kbd> format.',
 
 	'BAN_EXCLUDE'			=> 'Exclude from banning',
 	'BAN_LENGTH'			=> 'Length of ban',
@@ -50,12 +50,12 @@ $lang = array_merge($lang, array(
 	'BANNED_UNTIL_DATE'		=> 'until %s', // Example: "until Mon 13.Jul.2009, 14:44"
 	'BANNED_UNTIL_DURATION'	=> '%1$s (until %2$s)', // Example: "7 days (until Tue 14.Jul.2009, 14:44)"
 
-	'EMAIL_BAN'					=> 'Ban one or more e-mail addresses',
-	'EMAIL_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered e-mail address from all current bans.',
-	'EMAIL_BAN_EXPLAIN'			=> 'To specify more than one e-mail address enter each on a new line. To match partial addresses use * as the wildcard, e.g. <samp>*@hotmail.com</samp>, <samp>*@*.domain.tld</samp>, etc.',
-	'EMAIL_NO_BANNED'			=> 'No banned e-mail addresses',
-	'EMAIL_UNBAN'				=> 'Un-ban or un-exclude e-mails',
-	'EMAIL_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple e-mail addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded e-mail addresses are emphasised.',
+	'EMAIL_BAN'					=> 'Ban one or more email addresses',
+	'EMAIL_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered email address from all current bans.',
+	'EMAIL_BAN_EXPLAIN'			=> 'To specify more than one email address enter each on a new line. To match partial addresses use * as the wildcard, e.g. <samp>*@hotmail.com</samp>, <samp>*@*.domain.tld</samp>, etc.',
+	'EMAIL_NO_BANNED'			=> 'No banned email addresses',
+	'EMAIL_UNBAN'				=> 'Un-ban or un-exclude emails',
+	'EMAIL_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded email addresses are emphasised.',
 
 	'IP_BAN'					=> 'Ban one or more IPs',
 	'IP_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered IP from all current bans.',
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 0bb99b5449..758ef8ed82 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -207,7 +207,7 @@ $lang = array_merge($lang, array(
 	'ACP_REGISTER_SETTINGS_EXPLAIN'		=> 'Here you are able to define registration and profile related settings.',
 
 	'ACC_ACTIVATION'				=> 'Account activation',
-	'ACC_ACTIVATION_EXPLAIN'		=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. “Board-wide e-mail” must be enabled in order to use user or admin activation.',
+	'ACC_ACTIVATION_EXPLAIN'		=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. “Board-wide email” must be enabled in order to use user or admin activation.',
 	'NEW_MEMBER_POST_LIMIT'			=> 'New member post limit',
 	'NEW_MEMBER_POST_LIMIT_EXPLAIN'	=> 'New members are within the <em>Newly Registered Users</em> group until they reach this number of posts. You can use this group to keep them from using the PM system or to review their posts. <strong>A value of 0 disables this feature.</strong>',
 	'NEW_MEMBER_GROUP_DEFAULT'		=> 'Set Newly Registered Users group to default',
@@ -216,10 +216,10 @@ $lang = array_merge($lang, array(
 	'ACC_ADMIN'					=> 'By admin',
 	'ACC_DISABLE'				=> 'Disable registration',
 	'ACC_NONE'					=> 'No activation (immediate access)',
-	'ACC_USER'					=> 'By user (e-mail verification)',
+	'ACC_USER'					=> 'By user (email verification)',
 //	'ACC_USER_ADMIN'			=> 'User + Admin',
-	'ALLOW_EMAIL_REUSE'			=> 'Allow e-mail address re-use',
-	'ALLOW_EMAIL_REUSE_EXPLAIN'	=> 'Different users can register with the same e-mail address.',
+	'ALLOW_EMAIL_REUSE'			=> 'Allow email address re-use',
+	'ALLOW_EMAIL_REUSE_EXPLAIN'	=> 'Different users can register with the same email address.',
 	'COPPA'						=> 'COPPA',
 	'COPPA_FAX'					=> 'COPPA fax number',
 	'COPPA_MAIL'				=> 'COPPA mailing address',
@@ -390,10 +390,10 @@ $lang = array_merge($lang, array(
 
 	'LDAP_DN'						=> 'LDAP base <var>dn</var>',
 	'LDAP_DN_EXPLAIN'				=> 'This is the Distinguished Name, locating the user information, e.g. <samp>o=My Company,c=US</samp>.',
-	'LDAP_EMAIL'					=> 'LDAP e-mail attribute',
-	'LDAP_EMAIL_EXPLAIN'			=> 'Set this to the name of your user entry e-mail attribute (if one exists) in order to automatically set the e-mail address for new users. Leaving this empty results in empty e-mail address for users who log in for the first time.',
+	'LDAP_EMAIL'					=> 'LDAP email attribute',
+	'LDAP_EMAIL_EXPLAIN'			=> 'Set this to the name of your user entry email attribute (if one exists) in order to automatically set the email address for new users. Leaving this empty results in empty email address for users who log in for the first time.',
 	'LDAP_INCORRECT_USER_PASSWORD'	=> 'Binding to LDAP server failed with specified user/password.',
-	'LDAP_NO_EMAIL'					=> 'The specified e-mail attribute does not exist.',
+	'LDAP_NO_EMAIL'					=> 'The specified email attribute does not exist.',
 	'LDAP_NO_IDENTITY'				=> 'Could not find a login identity for %s.',
 	'LDAP_PASSWORD'					=> 'LDAP password',
 	'LDAP_PASSWORD_EXPLAIN'			=> 'Leave blank to use anonymous binding, otherwise fill in the password for the above user. Required for Active Directory Servers.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
@@ -411,7 +411,7 @@ $lang = array_merge($lang, array(
 
 // Server Settings
 $lang = array_merge($lang, array(
-	'ACP_SERVER_SETTINGS_EXPLAIN'	=> 'Here you define server and domain dependant settings. Please ensure the data you enter is accurate, errors will result in e-mails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.',
+	'ACP_SERVER_SETTINGS_EXPLAIN'	=> 'Here you define server and domain dependant settings. Please ensure the data you enter is accurate, errors will result in emails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.',
 
 	'ENABLE_GZIP'				=> 'Enable GZip compression',
 	'ENABLE_GZIP_EXPLAIN'		=> 'Generated content will be compressed prior to sending it to the user. This can reduce network traffic but will also increase CPU usage on both server and client side. Requires zlib PHP extension to be loaded.',
@@ -454,8 +454,8 @@ $lang = array_merge($lang, array(
 	'CHECK_DNSBL_EXPLAIN'			=> 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: <a href="http://spamcop.net">spamcop.net</a> and <a href="http://www.spamhaus.org">www.spamhaus.org</a>. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.',
 	'CLASS_B'						=> 'A.B',
 	'CLASS_C'						=> 'A.B.C',
-	'EMAIL_CHECK_MX'				=> 'Check e-mail domain for valid MX record',
-	'EMAIL_CHECK_MX_EXPLAIN'		=> 'If enabled, the e-mail domain provided on registration and profile changes is checked for a valid MX record.',
+	'EMAIL_CHECK_MX'				=> 'Check email domain for valid MX record',
+	'EMAIL_CHECK_MX_EXPLAIN'		=> 'If enabled, the email domain provided on registration and profile changes is checked for a valid MX record.',
 	'FORCE_PASS_CHANGE'				=> 'Force password change',
 	'FORCE_PASS_CHANGE_EXPLAIN'		=> 'Require user to change their password after a set number of days. Setting this value to 0 disables this behaviour.',
 	'FORM_TIME_MAX'					=> 'Maximum time to submit forms',
@@ -492,24 +492,24 @@ $lang = array_merge($lang, array(
 
 // Email Settings
 $lang = array_merge($lang, array(
-	'ACP_EMAIL_SETTINGS_EXPLAIN'	=> 'This information is used when the board sends e-mails to your users. Please ensure the e-mail address you specify is valid, any bounced or undeliverable messages will likely be sent to that address. If your host does not provide a native (PHP based) e-mail service you can instead send messages directly using SMTP. This requires the address of an appropriate server (ask your provider if necessary). If the server requires authentication (and only if it does) enter the necessary username, password and authentication method.',
-
-	'ADMIN_EMAIL'					=> 'Return e-mail address',
-	'ADMIN_EMAIL_EXPLAIN'			=> 'This will be used as the return address on all e-mails, the technical contact e-mail address. It will always be used as the <samp>Return-Path</samp> and <samp>Sender</samp> address in e-mails.',
-	'BOARD_EMAIL_FORM'				=> 'Users send e-mail via board',
-	'BOARD_EMAIL_FORM_EXPLAIN'		=> 'Instead of showing the users e-mail address users are able to send e-mails via the board.',
-	'BOARD_HIDE_EMAILS'				=> 'Hide e-mail addresses',
-	'BOARD_HIDE_EMAILS_EXPLAIN'		=> 'This function keeps e-mail addresses completely private.',
-	'CONTACT_EMAIL'					=> 'Contact e-mail address',
-	'CONTACT_EMAIL_EXPLAIN'			=> 'This address will be used whenever a specific contact point is needed, e.g. spam, error output, etc. It will always be used as the <samp>From</samp> and <samp>Reply-To</samp> address in e-mails.',
-	'EMAIL_FUNCTION_NAME'			=> 'E-mail function name',
-	'EMAIL_FUNCTION_NAME_EXPLAIN'	=> 'The e-mail function used to send mails through PHP.',
-	'EMAIL_PACKAGE_SIZE'			=> 'E-mail package size',
-	'EMAIL_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of maximum e-mails sent out in one package. This setting is applied to the internal message queue; set this value to 0 if you have problems with non-delivered notification e-mails.',
-	'EMAIL_SIG'						=> 'E-mail signature',
-	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all e-mails the board sends.',
-	'ENABLE_EMAIL'					=> 'Enable board-wide e-mails',
-	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no e-mails will be sent by the board at all. <em>Note the user and admin account activation settings require this setting to be enabled. If currently using “user” or “admin” activation in the activation settings, disabling this setting will require no activation of new accounts.</em>',
+	'ACP_EMAIL_SETTINGS_EXPLAIN'	=> 'This information is used when the board sends emails to your users. Please ensure the email address you specify is valid, any bounced or undeliverable messages will likely be sent to that address. If your host does not provide a native (PHP based) email service you can instead send messages directly using SMTP. This requires the address of an appropriate server (ask your provider if necessary). If the server requires authentication (and only if it does) enter the necessary username, password and authentication method.',
+
+	'ADMIN_EMAIL'					=> 'Return email address',
+	'ADMIN_EMAIL_EXPLAIN'			=> 'This will be used as the return address on all emails, the technical contact email address. It will always be used as the <samp>Return-Path</samp> and <samp>Sender</samp> address in emails.',
+	'BOARD_EMAIL_FORM'				=> 'Users send email via board',
+	'BOARD_EMAIL_FORM_EXPLAIN'		=> 'Instead of showing the users email address users are able to send emails via the board.',
+	'BOARD_HIDE_EMAILS'				=> 'Hide email addresses',
+	'BOARD_HIDE_EMAILS_EXPLAIN'		=> 'This function keeps email addresses completely private.',
+	'CONTACT_EMAIL'					=> 'Contact email address',
+	'CONTACT_EMAIL_EXPLAIN'			=> 'This address will be used whenever a specific contact point is needed, e.g. spam, error output, etc. It will always be used as the <samp>From</samp> and <samp>Reply-To</samp> address in emails.',
+	'EMAIL_FUNCTION_NAME'			=> 'Email function name',
+	'EMAIL_FUNCTION_NAME_EXPLAIN'	=> 'The email function used to send mails through PHP.',
+	'EMAIL_PACKAGE_SIZE'			=> 'Email package size',
+	'EMAIL_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of maximum emails sent out in one package. This setting is applied to the internal message queue; set this value to 0 if you have problems with non-delivered notification emails.',
+	'EMAIL_SIG'						=> 'Email signature',
+	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all emails the board sends.',
+	'ENABLE_EMAIL'					=> 'Enable board-wide emails',
+	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no emails will be sent by the board at all. <em>Note the user and admin account activation settings require this setting to be enabled. If currently using “user” or “admin” activation in the activation settings, disabling this setting will require no activation of new accounts.</em>',
 	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
 	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
 	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',
@@ -525,8 +525,8 @@ $lang = array_merge($lang, array(
 	'SMTP_SETTINGS'					=> 'SMTP settings',
 	'SMTP_USERNAME'					=> 'SMTP username',
 	'SMTP_USERNAME_EXPLAIN'			=> 'Only enter a username if your SMTP server requires it.',
-	'USE_SMTP'						=> 'Use SMTP server for e-mail',
-	'USE_SMTP_EXPLAIN'				=> 'Select “Yes” if you want or have to send e-mail via a named server instead of the local mail function.',
+	'USE_SMTP'						=> 'Use SMTP server for email',
+	'USE_SMTP_EXPLAIN'				=> 'Select “Yes” if you want or have to send email via a named server instead of the local mail function.',
 ));
 
 // Jabber settings
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 6012c59483..dc35969955 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -47,7 +47,7 @@ $lang = array_merge($lang, array(
 
 	'ACP_BACKUP'				=> 'Backup',
 	'ACP_BAN'					=> 'Banning',
-	'ACP_BAN_EMAILS'			=> 'Ban e-mails',
+	'ACP_BAN_EMAILS'			=> 'Ban emails',
 	'ACP_BAN_IPS'				=> 'Ban IPs',
 	'ACP_BAN_USERNAMES'			=> 'Ban usernames',
 	'ACP_BBCODES'				=> 'BBCodes',
@@ -79,7 +79,7 @@ $lang = array_merge($lang, array(
 	'ACP_DISALLOW'				=> 'Disallow',
 	'ACP_DISALLOW_USERNAMES'	=> 'Disallow usernames',
 
-	'ACP_EMAIL_SETTINGS'		=> 'E-mail settings',
+	'ACP_EMAIL_SETTINGS'		=> 'Email settings',
 	'ACP_EXTENSION_GROUPS'		=> 'Manage extension groups',
 
 	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
@@ -123,7 +123,7 @@ $lang = array_merge($lang, array(
 	'ACP_MANAGE_RANKS'			=> 'Manage ranks',
 	'ACP_MANAGE_REASONS'		=> 'Manage report/denial reasons',
 	'ACP_MANAGE_USERS'			=> 'Manage users',
-	'ACP_MASS_EMAIL'			=> 'Mass e-mail',
+	'ACP_MASS_EMAIL'			=> 'Mass email',
 	'ACP_MESSAGES'				=> 'Messages',
 	'ACP_MESSAGE_SETTINGS'		=> 'Private message settings',
 	'ACP_MODULE_MANAGEMENT'		=> 'Module management',
@@ -265,7 +265,7 @@ $lang = array_merge($lang, array(
 
 	'NOTIFY'				=> 'Notification',
 	'NO_ADMIN'				=> 'You are not authorised to administer this board.',
-	'NO_EMAILS_DEFINED'		=> 'No valid e-mail addresses found.',
+	'NO_EMAILS_DEFINED'		=> 'No valid email addresses found.',
 	'NO_FILES_TO_DELETE'	=> 'Attachments you selected for deletion do not exist.',
 	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',
 
@@ -314,7 +314,7 @@ $lang = array_merge($lang, array(
 // Logs
 $lang = array_merge($lang, array(
 	'ACP_ADMIN_LOGS_EXPLAIN'	=> 'This lists all the actions carried out by board administrators. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
-	'ACP_CRITICAL_LOGS_EXPLAIN'	=> 'This lists the actions carried out by the board itself. This log provides you with information you are able to use for solving specific problems, for example non-delivery of e-mails. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
+	'ACP_CRITICAL_LOGS_EXPLAIN'	=> 'This lists the actions carried out by the board itself. This log provides you with information you are able to use for solving specific problems, for example non-delivery of emails. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
 	'ACP_MOD_LOGS_EXPLAIN'		=> 'This lists all actions done on forums, topics and posts as well as actions carried out on users by moderators, including banning. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
 	'ACP_USERS_LOGS_EXPLAIN'	=> 'This lists all actions carried out by users or on users (reports, warnings and user notes).',
 	'ALL_ENTRIES'				=> 'All entries',
@@ -426,8 +426,8 @@ $lang = array_merge($lang, array(
 	'INACTIVE_REASON_REMIND'		=> 'Forced user account reactivation',
 	'INACTIVE_REASON_UNKNOWN'		=> 'Unknown',
 	'INACTIVE_USERS'				=> 'Inactive users',
-	'INACTIVE_USERS_EXPLAIN'		=> 'This is a list of users who have registered but whose accounts are inactive. You can activate, delete or remind (by sending an e-mail) these users if you wish.',
-	'INACTIVE_USERS_EXPLAIN_INDEX'	=> 'This is a list of the last 10 registered users who have inactive accounts. Accounts are inactive either because account activation was enabled in user registration settings and these users’ accounts have not yet been activated, or because these accounts have been deactivated. A full list is available by following the link below from where you can activate, delete or remind (by sending an e-mail) these users if you wish.',
+	'INACTIVE_USERS_EXPLAIN'		=> 'This is a list of users who have registered but whose accounts are inactive. You can activate, delete or remind (by sending an email) these users if you wish.',
+	'INACTIVE_USERS_EXPLAIN_INDEX'	=> 'This is a list of the last 10 registered users who have inactive accounts. Accounts are inactive either because account activation was enabled in user registration settings and these users’ accounts have not yet been activated, or because these accounts have been deactivated. A full list is available by following the link below from where you can activate, delete or remind (by sending an email) these users if you wish.',
 
 	'NO_INACTIVE_USERS'	=> 'No inactive users',
 
@@ -497,13 +497,13 @@ $lang = array_merge($lang, array(
 
 	'LOG_BAN_EXCLUDE_USER'	=> '<strong>Excluded user from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
 	'LOG_BAN_EXCLUDE_IP'	=> '<strong>Excluded IP from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_EXCLUDE_EMAIL' => '<strong>Excluded e-mail from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
+	'LOG_BAN_EXCLUDE_EMAIL' => '<strong>Excluded email from ban</strong> for reason “<em>%1$s</em>”<br />» %2$s',
 	'LOG_BAN_USER'			=> '<strong>Banned user</strong> for reason “<em>%1$s</em>”<br />» %2$s',
 	'LOG_BAN_IP'			=> '<strong>Banned IP</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_BAN_EMAIL'			=> '<strong>Banned e-mail</strong> for reason “<em>%1$s</em>”<br />» %2$s',
+	'LOG_BAN_EMAIL'			=> '<strong>Banned email</strong> for reason “<em>%1$s</em>”<br />» %2$s',
 	'LOG_UNBAN_USER'		=> '<strong>Unbanned user</strong><br />» %s',
 	'LOG_UNBAN_IP'			=> '<strong>Unbanned IP</strong><br />» %s',
-	'LOG_UNBAN_EMAIL'		=> '<strong>Unbanned e-mail</strong><br />» %s',
+	'LOG_UNBAN_EMAIL'		=> '<strong>Unbanned email</strong><br />» %s',
 
 	'LOG_BBCODE_ADD'		=> '<strong>Added new BBCode</strong><br />» %s',
 	'LOG_BBCODE_EDIT'		=> '<strong>Edited BBCode</strong><br />» %s',
@@ -523,7 +523,7 @@ $lang = array_merge($lang, array(
 	'LOG_CONFIG_AUTH'			=> '<strong>Altered authentication settings</strong>',
 	'LOG_CONFIG_AVATAR'			=> '<strong>Altered avatar settings</strong>',
 	'LOG_CONFIG_COOKIE'			=> '<strong>Altered cookie settings</strong>',
-	'LOG_CONFIG_EMAIL'			=> '<strong>Altered e-mail settings</strong>',
+	'LOG_CONFIG_EMAIL'			=> '<strong>Altered email settings</strong>',
 	'LOG_CONFIG_FEATURES'		=> '<strong>Altered board features</strong>',
 	'LOG_CONFIG_LOAD'			=> '<strong>Altered load settings</strong>',
 	'LOG_CONFIG_MESSAGE'		=> '<strong>Altered private message settings</strong>',
@@ -576,7 +576,7 @@ $lang = array_merge($lang, array(
 	'LOG_DOWNLOAD_REMOVE_IP'	=> '<strong>Removed IP/hostname from download list</strong><br />» %s',
 
 	'LOG_ERROR_JABBER'		=> '<strong>Jabber error</strong><br />» %s',
-	'LOG_ERROR_EMAIL'		=> '<strong>E-mail error</strong><br />» %s',
+	'LOG_ERROR_EMAIL'		=> '<strong>Email error</strong><br />» %s',
 
 	'LOG_FORUM_ADD'							=> '<strong>Created new forum</strong><br />» %s',
 	'LOG_FORUM_COPIED_PERMISSIONS'			=> '<strong>Copied forum permissions</strong> from %1$s<br />» %2$s',
@@ -612,7 +612,7 @@ $lang = array_merge($lang, array(
 
 	'LOG_INACTIVE_ACTIVATE'	=> '<strong>Activated inactive users</strong><br />» %s',
 	'LOG_INACTIVE_DELETE'	=> '<strong>Deleted inactive users</strong><br />» %s',
-	'LOG_INACTIVE_REMIND'	=> '<strong>Sent reminder e-mails to inactive users</strong><br />» %s',
+	'LOG_INACTIVE_REMIND'	=> '<strong>Sent reminder emails to inactive users</strong><br />» %s',
 	'LOG_INSTALL_CONVERTED'	=> '<strong>Converted from %1$s to phpBB %2$s</strong>',
 	'LOG_INSTALL_INSTALLED'	=> '<strong>Installed phpBB %s</strong>',
 
@@ -629,7 +629,7 @@ $lang = array_merge($lang, array(
 	'LOG_LANGUAGE_FILE_REPLACED'	=> '<strong>Replaced language file</strong><br />» %s',
 	'LOG_LANGUAGE_FILE_SUBMITTED'	=> '<strong>Submitted language file and placed in store folder</strong><br />» %s',
 
-	'LOG_MASS_EMAIL'		=> '<strong>Sent mass e-mail</strong><br />» %s',
+	'LOG_MASS_EMAIL'		=> '<strong>Sent mass email</strong><br />» %s',
 
 	'LOG_MCP_CHANGE_POSTER'	=> '<strong>Changed poster in topic “%1$s”</strong><br />» from %2$s to %3$s',
 
@@ -723,7 +723,7 @@ $lang = array_merge($lang, array(
 	'LOG_USER_ACTIVE'		=> '<strong>User activated</strong><br />» %s',
 	'LOG_USER_BAN_USER'		=> '<strong>Banned User via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
 	'LOG_USER_BAN_IP'		=> '<strong>Banned IP via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
-	'LOG_USER_BAN_EMAIL'	=> '<strong>Banned e-mail via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
+	'LOG_USER_BAN_EMAIL'	=> '<strong>Banned email via user management</strong> for reason “<em>%1$s</em>”<br />» %2$s',
 	'LOG_USER_DELETED'		=> '<strong>Deleted user</strong><br />» %s',
 	'LOG_USER_DEL_ATTACH'	=> '<strong>Removed all attachments made by the user</strong><br />» %s',
 	'LOG_USER_DEL_AVATAR'	=> '<strong>Removed user avatar</strong><br />» %s',
@@ -736,7 +736,7 @@ $lang = array_merge($lang, array(
 	'LOG_USER_REACTIVATE'	=> '<strong>Forced user account reactivation</strong><br />» %s',
 	'LOG_USER_REMOVED_NR'	=> '<strong>Removed newly registered flag from user</strong><br />» %s',
 
-	'LOG_USER_UPDATE_EMAIL'	=> '<strong>User “%1$s” changed e-mail</strong><br />» from “%2$s” to “%3$s”',
+	'LOG_USER_UPDATE_EMAIL'	=> '<strong>User “%1$s” changed email</strong><br />» from “%2$s” to “%3$s”',
 	'LOG_USER_UPDATE_NAME'	=> '<strong>Changed username</strong><br />» from “%1$s” to “%2$s”',
 	'LOG_USER_USER_UPDATE'	=> '<strong>Updated user details</strong><br />» %s',
 
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index c39b8743e7..aacb35b9bb 100644
--- a/phpBB/language/en/acp/email.php
+++ b/phpBB/language/en/acp/email.php
@@ -36,12 +36,12 @@ if (empty($lang) || !is_array($lang))
 
 // Email settings
 $lang = array_merge($lang, array(
-	'ACP_MASS_EMAIL_EXPLAIN'		=> 'Here you can e-mail a message to either all of your users or all users of a specific group <strong>having the option to receive mass e-mails enabled</strong>. To achieve this an e-mail will be sent out to the administrative e-mail address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an e-mail, for more recipients more e-mails will be sent. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed.',
+	'ACP_MASS_EMAIL_EXPLAIN'		=> 'Here you can email a message to either all of your users or all users of a specific group <strong>having the option to receive mass emails enabled</strong>. To achieve this an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an email, for more recipients more emails will be sent. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed.',
 	'ALL_USERS'						=> 'All users',
 
 	'COMPOSE'				=> 'Compose',
 
-	'EMAIL_SEND_ERROR'		=> 'There were one or more errors while sending the e-mail. Please check the %sError log%s for detailed error messages.',
+	'EMAIL_SEND_ERROR'		=> 'There were one or more errors while sending the email. Please check the %sError log%s for detailed error messages.',
 	'EMAIL_SENT'			=> 'This message has been sent.',
 	'EMAIL_SENT_QUEUE'		=> 'This message has been queued for sending.',
 
@@ -53,7 +53,7 @@ $lang = array_merge($lang, array(
 	'SEND_TO_USERS_EXPLAIN'	=> 'Entering names here will override any group selected above. Enter each username on a new line.',
 
 	'MAIL_BANNED'			=> 'Mail banned users',
-	'MAIL_BANNED_EXPLAIN'	=> 'When sending a mass e-mail to a group you can select here whether banned users will also receive the e-mail.',
+	'MAIL_BANNED_EXPLAIN'	=> 'When sending a mass email to a group you can select here whether banned users will also receive the email.',
 	'MAIL_HIGH_PRIORITY'	=> 'High',
 	'MAIL_LOW_PRIORITY'		=> 'Low',
 	'MAIL_NORMAL_PRIORITY'	=> 'Normal',
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index 6bac0a815b..154551bd6e 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -38,7 +38,7 @@ $lang = array_merge($lang, array(
 	'ACP_FILES'						=> 'Admin language files',
 	'ACP_LANGUAGE_PACKS_EXPLAIN'	=> 'Here you are able to install/remove language packs. The default language pack is marked with an asterisk (*).',
 
-	'EMAIL_FILES'			=> 'E-mail templates',
+	'EMAIL_FILES'			=> 'Email templates',
 
 	'FILE_CONTENTS'				=> 'File contents',
 	'FILE_FROM_STORAGE'			=> 'File from storage folder',
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 2a8d857197..cf5ad33bab 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -202,7 +202,7 @@ $lang = array_merge($lang, array(
 	'ROLE_DESCRIPTION_MOD_SIMPLE'			=> 'Can only use basic topic actions. Cannot send warnings or use moderation queue.',
 	'ROLE_DESCRIPTION_MOD_STANDARD'			=> 'Can use most moderating tools, but cannot ban users or change the post author.',
 	'ROLE_DESCRIPTION_USER_FULL'			=> 'Can use all available forum features for users, including changing the user name or ignoring the flood limit.<br />Not recommended.',
-	'ROLE_DESCRIPTION_USER_LIMITED'			=> 'Can access some of the user features. Attachments, e-mails, or instant messages are not allowed.',
+	'ROLE_DESCRIPTION_USER_LIMITED'			=> 'Can access some of the user features. Attachments, emails, or instant messages are not allowed.',
 	'ROLE_DESCRIPTION_USER_NOAVATAR'		=> 'Has a limited feature set and is not allowed to use the Avatar feature.',
 	'ROLE_DESCRIPTION_USER_NOPM'			=> 'Has a limited feature set, and is not allowed to use Private Messages.',
 	'ROLE_DESCRIPTION_USER_STANDARD'		=> 'Can access most but not all user features. Cannot change user name or ignore the flood limit, for instance.',
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index f8cb35ed6a..17649693fa 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -99,7 +99,7 @@ $lang = array_merge($lang, array(
 	'acl_u_viewprofile'	=> array('lang' => 'Can view profiles, memberlist and online list', 'cat' => 'profile'),
 	'acl_u_chgname'		=> array('lang' => 'Can change username', 'cat' => 'profile'),
 	'acl_u_chgpasswd'	=> array('lang' => 'Can change password', 'cat' => 'profile'),
-	'acl_u_chgemail'	=> array('lang' => 'Can change e-mail address', 'cat' => 'profile'),
+	'acl_u_chgemail'	=> array('lang' => 'Can change email address', 'cat' => 'profile'),
 	'acl_u_chgavatar'	=> array('lang' => 'Can change avatar', 'cat' => 'profile'),
 	'acl_u_chggrp'		=> array('lang' => 'Can change default usergroup', 'cat' => 'profile'),
 
@@ -116,7 +116,7 @@ $lang = array_merge($lang, array(
 	'acl_u_pm_edit'		=> array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
 	'acl_u_pm_delete'	=> array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),
 	'acl_u_pm_forward'	=> array('lang' => 'Can forward private messages', 'cat' => 'pm'),
-	'acl_u_pm_emailpm'	=> array('lang' => 'Can e-mail private messages', 'cat' => 'pm'),
+	'acl_u_pm_emailpm'	=> array('lang' => 'Can email private messages', 'cat' => 'pm'),
 	'acl_u_pm_printpm'	=> array('lang' => 'Can print private messages', 'cat' => 'pm'),
 	'acl_u_pm_attach'	=> array('lang' => 'Can attach files in private messages', 'cat' => 'pm'),
 	'acl_u_pm_download'	=> array('lang' => 'Can download files in private messages', 'cat' => 'pm'),
@@ -125,7 +125,7 @@ $lang = array_merge($lang, array(
 	'acl_u_pm_img'		=> array('lang' => 'Can use [img] BBCode tag in private messages', 'cat' => 'pm'),
 	'acl_u_pm_flash'	=> array('lang' => 'Can use [flash] BBCode tag in private messages', 'cat' => 'pm'),
 
-	'acl_u_sendemail'	=> array('lang' => 'Can send e-mails', 'cat' => 'misc'),
+	'acl_u_sendemail'	=> array('lang' => 'Can send emails', 'cat' => 'misc'),
 	'acl_u_sendim'		=> array('lang' => 'Can send instant messages', 'cat' => 'misc'),
 	'acl_u_ignoreflood'	=> array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
 	'acl_u_hideonline'	=> array('lang' => 'Can hide online status', 'cat' => 'misc'),
@@ -162,7 +162,7 @@ $lang = array_merge($lang, array(
 	'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
 	'acl_f_subscribe'	=> array('lang' => 'Can subscribe forum', 'cat' => 'actions'),
 	'acl_f_print'		=> array('lang' => 'Can print topics', 'cat' => 'actions'),
-	'acl_f_email'		=> array('lang' => 'Can e-mail topics', 'cat' => 'actions'),
+	'acl_f_email'		=> array('lang' => 'Can email topics', 'cat' => 'actions'),
 
 	'acl_f_search'		=> array('lang' => 'Can search the forum', 'cat' => 'misc'),
 	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
@@ -230,7 +230,7 @@ $lang = array_merge($lang, array(
 	'acl_a_clearlogs'	=> array('lang' => 'Can clear logs', 'cat' => 'misc'),
 	'acl_a_modules'		=> array('lang' => 'Can manage modules', 'cat' => 'misc'),
 	'acl_a_language'	=> array('lang' => 'Can manage language packs', 'cat' => 'misc'),
-	'acl_a_email'		=> array('lang' => 'Can send mass e-mail', 'cat' => 'misc'),
+	'acl_a_email'		=> array('lang' => 'Can send mass email', 'cat' => 'misc'),
 	'acl_a_bots'		=> array('lang' => 'Can manage bots', 'cat' => 'misc'),
 	'acl_a_reasons'		=> array('lang' => 'Can manage report/denial reasons', 'cat' => 'misc'),
 	'acl_a_backup'		=> array('lang' => 'Can backup/restore database', 'cat' => 'misc'),
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 76d4869990..89e171744f 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -81,7 +81,7 @@ $lang = array_merge($lang, array(
 		'INTTEXT'		=> 'Unicode letter characters, numbers, spaces, commas, dots, minus, plus, hyphen, underscore and whitespaces.',
 		'IDENTIFIER'	=> 'Characters from the latin alphabet (A-Z), numbers, hyphen and underscore',
 		'NUMBER'		=> 'Any series of digits',
-		'EMAIL'			=> 'A valid e-mail address',
+		'EMAIL'			=> 'A valid email address',
 		'URL'			=> 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, “http://” is prefixed to the string.',
 		'LOCAL_URL'		=> 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol.',
 		'COLOR'			=> 'A HTML colour, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>'
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index f5bab1d76f..e7954ff148 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -183,7 +183,7 @@ $lang = array_merge($lang, array(
 	'IMG_ICON_BACK_TOP'		=> 'Top',
 
 	'IMG_ICON_CONTACT_AIM'		=> 'AIM',
-	'IMG_ICON_CONTACT_EMAIL'	=> 'Send e-mail',
+	'IMG_ICON_CONTACT_EMAIL'	=> 'Send email',
 	'IMG_ICON_CONTACT_ICQ'		=> 'ICQ',
 	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
 	'IMG_ICON_CONTACT_MSNM'		=> 'WLM',
@@ -255,7 +255,7 @@ $lang = array_merge($lang, array(
 	'NO_UNIT'					=> 'None',
 
 	'ONLY_STYLE'			=> 'This is the only remaining style, you cannot delete it.',
-	
+
 	'PARENT_STYLE_NOT_FOUND'	=> 'Parent style was not found. This style may not work correctly. Please uninstall it.',
 	'PURGED_CACHE'				=> 'Cache was purged.',
 
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 852f68bcd7..4496fdba7c 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -54,7 +54,7 @@ $lang = array_merge($lang, array(
 	'CANNOT_REMOVE_YOURSELF'		=> 'You are not allowed to remove your own user account.',
 	'CANNOT_SET_FOUNDER_IGNORED'	=> 'You are not able to promote ignored users to be founders.',
 	'CANNOT_SET_FOUNDER_INACTIVE'	=> 'You need to activate users before you promote them to founders, only activated users are able to be promoted.',
-	'CONFIRM_EMAIL_EXPLAIN'			=> 'You only need to specify this if you are changing the users e-mail address.',
+	'CONFIRM_EMAIL_EXPLAIN'			=> 'You only need to specify this if you are changing the users email address.',
 
 	'DELETE_POSTS'			=> 'Delete posts',
 	'DELETE_USER'			=> 'Delete user',
@@ -93,8 +93,8 @@ $lang = array_merge($lang, array(
 	'USER_ADMIN_ACTIVATE'			=> 'Activate account',
 	'USER_ADMIN_ACTIVATED'			=> 'User activated successfully.',
 	'USER_ADMIN_AVATAR_REMOVED'		=> 'Successfully removed avatar from user account.',
-	'USER_ADMIN_BAN_EMAIL'			=> 'Ban by e-mail',
-	'USER_ADMIN_BAN_EMAIL_REASON'	=> 'E-mail address banned via user management',
+	'USER_ADMIN_BAN_EMAIL'			=> 'Ban by email',
+	'USER_ADMIN_BAN_EMAIL_REASON'	=> 'Email address banned via user management',
 	'USER_ADMIN_BAN_IP'				=> 'Ban by IP',
 	'USER_ADMIN_BAN_IP_REASON'		=> 'IP banned via user management',
 	'USER_ADMIN_BAN_NAME_REASON'	=> 'Username banned via user management',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 12f8edad9e..75717e1807 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -101,7 +101,7 @@ $lang = array_merge($lang, array(
 
 	'BACK_TO_TOP'			=> 'Top',
 	'BACK_TO_PREV'			=> 'Back to previous page',
-	'BAN_TRIGGERED_BY_EMAIL'=> 'A ban has been issued on your e-mail address.',
+	'BAN_TRIGGERED_BY_EMAIL'=> 'A ban has been issued on your email address.',
 	'BAN_TRIGGERED_BY_IP'	=> 'A ban has been issued on your IP address.',
 	'BAN_TRIGGERED_BY_USER'	=> 'A ban has been issued on your username.',
 	'BBCODE_GUIDE'			=> 'BBCode guide',
@@ -169,9 +169,9 @@ $lang = array_merge($lang, array(
 	),
 
 	'EDIT_POST'							=> 'Edit post',
-	'EMAIL'								=> 'E-mail', // Short form for EMAIL_ADDRESS
-	'EMAIL_ADDRESS'						=> 'E-mail address',
-	'EMAIL_SMTP_ERROR_RESPONSE'			=> 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.',
+	'EMAIL'								=> 'Email', // Short form for EMAIL_ADDRESS
+	'EMAIL_ADDRESS'						=> 'Email address',
+	'EMAIL_SMTP_ERROR_RESPONSE'			=> 'Ran into problems sending email at <strong>Line %1$s</strong>. Response: %2$s.',
 	'EMPTY_SUBJECT'						=> 'You must specify a subject when posting a new topic.',
 	'EMPTY_MESSAGE_SUBJECT'				=> 'You must specify a subject when composing a new message.',
 	'ENABLED'							=> 'Enabled',
@@ -296,7 +296,7 @@ $lang = array_merge($lang, array(
 	'INFORMATION'				=> 'Information',
 	'INTERESTS'					=> 'Interests',
 	'INVALID_DIGEST_CHALLENGE'	=> 'Invalid digest challenge.',
-	'INVALID_EMAIL_LOG'			=> '<strong>%s</strong> possibly an invalid e-mail address?',
+	'INVALID_EMAIL_LOG'			=> '<strong>%s</strong> possibly an invalid email address?',
 	'INVALID_PLURAL_RULE'		=> 'The chosen plural rule is invalid. Valid values are integers between 0 and 15.',
 	'IP'						=> 'IP',
 	'IP_BLACKLISTED'			=> 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.',
@@ -391,9 +391,9 @@ $lang = array_merge($lang, array(
 	'NO_AUTH_OPERATION'			=> 'You do not have the necessary permissions to complete this operation.',
 	'NO_CONNECT_TO_SMTP_HOST'	=> 'Could not connect to smtp host : %1$s : %2$s',
 	'NO_BIRTHDAYS'				=> 'No birthdays today',
-	'NO_EMAIL_MESSAGE'			=> 'E-mail message was blank.',
+	'NO_EMAIL_MESSAGE'			=> 'Email message was blank.',
 	'NO_EMAIL_RESPONSE_CODE'	=> 'Could not get mail server response codes.',
-	'NO_EMAIL_SUBJECT'			=> 'No e-mail subject specified.',
+	'NO_EMAIL_SUBJECT'			=> 'No email subject specified.',
 	'NO_FORUM'					=> 'The forum you selected does not exist.',
 	'NO_FORUMS'					=> 'This board has no forums.',
 	'NO_GROUP'					=> 'The requested usergroup does not exist.',
@@ -521,7 +521,7 @@ $lang = array_merge($lang, array(
 	'REPORT_BY'					=> 'Report by',
 	'REPORT_POST'				=> 'Report this post',
 	'REPORTING_POST'			=> 'Reporting post',
-	'RESEND_ACTIVATION'			=> 'Resend activation e-mail',
+	'RESEND_ACTIVATION'			=> 'Resend activation email',
 	'RESET'						=> 'Reset',
 	'RESTORE_PERMISSIONS'		=> 'Restore permissions',
 	'RETURN_INDEX'				=> '%sReturn to the index page%s',
@@ -571,8 +571,8 @@ $lang = array_merge($lang, array(
 	'SELECT_ALL_CODE'			=> 'Select all',
 	'SELECT_DESTINATION_FORUM'	=> 'Please select a destination forum',
 	'SELECT_FORUM'				=> 'Select a forum',
-	'SEND_EMAIL'				=> 'E-mail',				// Used for submit buttons
-	'SEND_EMAIL_USER'			=> 'E-mail',				// Used as: {L_SEND_EMAIL_USER} {USERNAME} -> E-mail UserX
+	'SEND_EMAIL'				=> 'Email',				// Used for submit buttons
+	'SEND_EMAIL_USER'			=> 'Email',				// Used as: {L_SEND_EMAIL_USER} {USERNAME} -> Email UserX
 	'SEND_PRIVATE_MESSAGE'		=> 'Send private message',
 	'SETTINGS'					=> 'Settings',
 	'SIGNATURE'					=> 'Signature',
@@ -604,7 +604,7 @@ $lang = array_merge($lang, array(
 	'THE_TEAM'			=> 'The team',
 	'TIME'				=> 'Time',
 	'TIMEOUT_PROCESSING_REQ'			=> 'Request timed out.',
-	
+
 	'TOO_LARGE'						=> 'The value you entered is too large.',
 	'TOO_LARGE_MAX_RECIPIENTS'		=> 'The value of <strong>Maximum number of allowed recipients per private message</strong> setting you entered is too large.',
 
@@ -623,7 +623,7 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
 	'TOO_LONG_USER_PASSWORD'		=> 'The password you entered is too long.',
 	'TOO_LONG_USERNAME'				=> 'The username you entered is too long.',
-	'TOO_LONG_EMAIL'				=> 'The e-mail address you entered is too long.',
+	'TOO_LONG_EMAIL'				=> 'The email address you entered is too long.',
 	'TOO_LONG_WEBSITE'				=> 'The website address you entered is too long.',
 	'TOO_LONG_YIM'					=> 'The Yahoo! Messenger name you entered is too long.',
 
@@ -644,10 +644,10 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
 	'TOO_SHORT_USER_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_USERNAME'			=> 'The username you entered is too short.',
-	'TOO_SHORT_EMAIL'				=> 'The e-mail address you entered is too short.',
+	'TOO_SHORT_EMAIL'				=> 'The email address you entered is too short.',
 	'TOO_SHORT_WEBSITE'				=> 'The website address you entered is too short.',
 	'TOO_SHORT_YIM'					=> 'The Yahoo! Messenger name you entered is too short.',
-	
+
 	'TOO_SMALL'						=> 'The value you entered is too small.',
 	'TOO_SMALL_MAX_RECIPIENTS'		=> 'The value of <strong>Maximum number of allowed recipients per private message</strong> setting you entered is too small.',
 
diff --git a/phpBB/language/en/email/admin_send_email.txt b/phpBB/language/en/email/admin_send_email.txt
index 6687404527..b778496258 100644
--- a/phpBB/language/en/email/admin_send_email.txt
+++ b/phpBB/language/en/email/admin_send_email.txt
@@ -1,9 +1,9 @@
 
-The following is an e-mail sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
+The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
 
 {CONTACT_EMAIL}
 
-Include this full e-mail (particularly the headers). 
+Include this full email (particularly the headers). 
 
 Message sent to you follows:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt
index 30b3aae852..8605956318 100644
--- a/phpBB/language/en/email/admin_welcome_inactive.txt
+++ b/phpBB/language/en/email/admin_welcome_inactive.txt
@@ -2,7 +2,7 @@ Subject: Welcome to "{SITENAME}"
 
 {WELCOME_MSG}
 
-Please keep this e-mail for your records. Your account information is as follows:
+Please keep this email for your records. Your account information is as follows:
 
 ----------------------------
 Username: {USERNAME}
diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt
index c3e4af576d..915534a13e 100644
--- a/phpBB/language/en/email/coppa_resend_inactive.txt
+++ b/phpBB/language/en/email/coppa_resend_inactive.txt
@@ -16,7 +16,7 @@ OR mail it to:
 Permission to participate at "{SITENAME}" - {U_BOARD}
 
 Username: {USERNAME}
-E-mail: {EMAIL_ADDRESS}
+Email: {EMAIL_ADDRESS}
 
 I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION. 
 I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. 
diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt
index c3e4af576d..915534a13e 100644
--- a/phpBB/language/en/email/coppa_welcome_inactive.txt
+++ b/phpBB/language/en/email/coppa_welcome_inactive.txt
@@ -16,7 +16,7 @@ OR mail it to:
 Permission to participate at "{SITENAME}" - {U_BOARD}
 
 Username: {USERNAME}
-E-mail: {EMAIL_ADDRESS}
+Email: {EMAIL_ADDRESS}
 
 I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION. 
 I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. 
diff --git a/phpBB/language/en/email/email_notify.txt b/phpBB/language/en/email/email_notify.txt
index 0d0ac7fc28..725b52f0cc 100644
--- a/phpBB/language/en/email/email_notify.txt
+++ b/phpBB/language/en/email/email_notify.txt
@@ -1,8 +1,8 @@
-Subject: "{SITENAME}" - E-mail a friend
+Subject: "{SITENAME}" - Email a friend
 
 Hello {TO_USERNAME},
 
-This e-mail was sent from "{SITENAME}" by {FROM_USERNAME} who thought you may be interested in the following topic:
+This email was sent from "{SITENAME}" by {FROM_USERNAME} who thought you may be interested in the following topic:
 
 {TOPIC_NAME}
 
@@ -10,7 +10,7 @@ You can find it at:
 
 {U_TOPIC}
 
-A message from {FROM_USERNAME} may also be included below. Please note that this message has not been seen or approved by the board administrators. If you wish to complain about having received this e-mail please contact the board administrator at {BOARD_CONTACT}. Please quote the message headers when contacting this address.
+A message from {FROM_USERNAME} may also be included below. Please note that this message has not been seen or approved by the board administrators. If you wish to complain about having received this email please contact the board administrator at {BOARD_CONTACT}. Please quote the message headers when contacting this address.
 
 ----------
 
diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt
index 2aa03a7f33..9ec93484e1 100644
--- a/phpBB/language/en/email/installed.txt
+++ b/phpBB/language/en/email/installed.txt
@@ -4,7 +4,7 @@ Congratulations,
 
 You have successfully installed phpBB on your server.
 
-This e-mail contains important information regarding your installation and should be kept for reference. Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
+This email contains important information regarding your installation and should be kept for reference. Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
 ----------------------------
 Username: {USERNAME}
diff --git a/phpBB/language/en/email/profile_send_email.txt b/phpBB/language/en/email/profile_send_email.txt
index 9fb19e7eb1..3e63777c9f 100644
--- a/phpBB/language/en/email/profile_send_email.txt
+++ b/phpBB/language/en/email/profile_send_email.txt
@@ -1,11 +1,11 @@
 
 Hello {TO_USERNAME},
 
-The following is an e-mail sent to you by {FROM_USERNAME} via your account on "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
+The following is an email sent to you by {FROM_USERNAME} via your account on "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address:
 
 {BOARD_CONTACT}
 
-Include this full e-mail (particularly the headers). Please note that the reply address to this e-mail has been set to that of {FROM_USERNAME}.
+Include this full email (particularly the headers). Please note that the reply address to this email has been set to that of {FROM_USERNAME}.
 
 Message sent to you follows
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt
index 4ef7dd899a..7e25018f4d 100644
--- a/phpBB/language/en/email/user_reactivate_account.txt
+++ b/phpBB/language/en/email/user_reactivate_account.txt
@@ -3,7 +3,7 @@ Subject: Reactivate your account on "{SITENAME}"
 A board administrator requested that your account be reactivated. Your account is currently inactive.
 Please follow the steps listed here to reactivate your account.
 
-Please keep this e-mail for your records. Your account information is as follows:
+Please keep this email for your records. Your account information is as follows:
 
 ----------------------------
 Username: {USERNAME}
diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt
index 4638d6df63..7879b914b9 100644
--- a/phpBB/language/en/email/user_resend_inactive.txt
+++ b/phpBB/language/en/email/user_resend_inactive.txt
@@ -2,7 +2,7 @@ Subject: Welcome to "{SITENAME}"
 
 {WELCOME_MSG}
 
-Please keep this e-mail for your records. Your account information is as follows:
+Please keep this email for your records. Your account information is as follows:
 
 ----------------------------
 Username: {USERNAME}
diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt
index 2648769dfd..aaead86afc 100644
--- a/phpBB/language/en/email/user_welcome.txt
+++ b/phpBB/language/en/email/user_welcome.txt
@@ -2,7 +2,7 @@ Subject: Welcome to "{SITENAME}"
 
 {WELCOME_MSG}
 
-Please keep this e-mail for your records. Your account information is as follows:
+Please keep this email for your records. Your account information is as follows:
 
 ----------------------------
 Username: {USERNAME}
diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt
index 1b72b1c5a8..5cbb3af3de 100644
--- a/phpBB/language/en/email/user_welcome_inactive.txt
+++ b/phpBB/language/en/email/user_welcome_inactive.txt
@@ -2,7 +2,7 @@ Subject: Welcome to "{SITENAME}"
 
 {WELCOME_MSG}
 
-Please keep this e-mail for your records. Your account information is as follows:
+Please keep this email for your records. Your account information is as follows:
 
 ----------------------------
 Username: {USERNAME}
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index 7b2672ad94..e0cda9df04 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -88,7 +88,7 @@ $help = array(
 	),
 	array(
 		0 => 'Linking to another site',
-		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to e-mail addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=http://www.google.com/][img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
+		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=http://www.google.com/][img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
 	),
 	array(
 		0 => '--',
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index b14f155f3a..f21a8d866e 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -55,7 +55,7 @@ $help = array(
 	),
 	array(
 		0 => 'I registered but cannot login!',
-		1 => 'First, check your username and password. If they are correct, then one of two things may have happened. If COPPA support is enabled and you specified being under 13 years old during registration, you will have to follow the instructions you received. Some boards will also require new registrations to be activated, either by yourself or by an administrator before you can logon; this information was present during registration. If you were sent an e-mail, follow the instructions. If you did not receive an e-mail, you may have provided an incorrect e-mail address or the e-mail may have been picked up by a spam filer. If you are sure the e-mail address you provided is correct, try contacting an administrator.'
+		1 => 'First, check your username and password. If they are correct, then one of two things may have happened. If COPPA support is enabled and you specified being under 13 years old during registration, you will have to follow the instructions you received. Some boards will also require new registrations to be activated, either by yourself or by an administrator before you can logon; this information was present during registration. If you were sent an email, follow the instructions. If you did not receive an email, you may have provided an incorrect email address or the email may have been picked up by a spam filer. If you are sure the email address you provided is correct, try contacting an administrator.'
 	),
 	array(
 		0 => 'I registered in the past but cannot login any more?!',
@@ -102,8 +102,8 @@ $help = array(
 		1 => 'Ranks, which appear below your username, indicate the number of posts you have made or identify certain users, e.g. moderators and administrators. In general, you cannot directly change the wording of any board ranks as they are set by the board administrator. Please do not abuse the board by posting unnecessarily just to increase your rank. Most boards will not tolerate this and the moderator or administrator will simply lower your post count.'
 	),
 	array(
-		0 => 'When I click the e-mail link for a user it asks me to login?',
-		1 => 'Only registered users can send e-mail to other users via the built-in e-mail form, and only if the administrator has enabled this feature. This is to prevent malicious use of the e-mail system by anonymous users.'
+		0 => 'When I click the email link for a user it asks me to login?',
+		1 => 'Only registered users can send email to other users via the built-in email form, and only if the administrator has enabled this feature. This is to prevent malicious use of the email system by anonymous users.'
 	),
 	array(
 		0 => '--',
@@ -255,8 +255,8 @@ $help = array(
 		1 => 'You can block a user from sending you private messages by using message rules within your User Control Panel. If you are receiving abusive private messages from a particular user, inform a board administrator; they have the power to prevent a user from sending private messages.'
 	),
 	array(
-		0 => 'I have received a spamming or abusive e-mail from someone on this board!',
-		1 => 'We are sorry to hear that. The e-mail form feature of this board includes safeguards to try and track users who send such posts, so e-mail the board administrator with a full copy of the e-mail you received. It is very important that this includes the headers that contain the details of the user that sent the e-mail. The board administrator can then take action.'
+		0 => 'I have received a spamming or abusive email from someone on this board!',
+		1 => 'We are sorry to hear that. The email form feature of this board includes safeguards to try and track users who send such posts, so email the board administrator with a full copy of the email you received. It is very important that this includes the headers that contain the details of the user that sent the email. The board administrator can then take action.'
 	),
 	array(
 		0 => '--',
@@ -336,6 +336,6 @@ $help = array(
 	),
 	array(
 		0 => 'Who do I contact about abusive and/or legal matters related to this board?',
-		1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a <a href="http://www.google.com/search?q=whois">whois lookup</a>) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Group has <strong>absolutely no jurisdiction</strong> and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter <strong>not directly related</strong> to the phpBB.com website or the discrete software of phpBB itself. If you do e-mail phpBB Group <strong>about any third party</strong> use of this software then you should expect a terse response or no response at all.'
+		1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a <a href="http://www.google.com/search?q=whois">whois lookup</a>) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Group has <strong>absolutely no jurisdiction</strong> and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter <strong>not directly related</strong> to the phpBB.com website or the discrete software of phpBB itself. If you do email phpBB Group <strong>about any third party</strong> use of this software then you should expect a terse response or no response at all.'
 	)
 );
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index ca6045a921..03f2e964ec 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -240,8 +240,8 @@ $lang = array_merge($lang, array(
 	'INST_ERR_DB_NO_FIREBIRD_PS'=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
 	'INST_ERR_DB_NO_POSTGRES'	=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
 	'INST_ERR_DB_NO_NAME'		=> 'No database name specified.',
-	'INST_ERR_EMAIL_INVALID'	=> 'The e-mail address you entered is invalid.',
-	'INST_ERR_EMAIL_MISMATCH'	=> 'The e-mails you entered did not match.',
+	'INST_ERR_EMAIL_INVALID'	=> 'The email address you entered is invalid.',
+	'INST_ERR_EMAIL_MISMATCH'	=> 'The emails you entered did not match.',
 	'INST_ERR_FATAL'			=> 'Fatal installation error',
 	'INST_ERR_FATAL_DB'			=> 'A fatal and unrecoverable database error has occurred. This may be because the specified user does not have appropriate permissions to <code>CREATE TABLES</code> or <code>INSERT</code> data, etc. Further information may be given below. Please contact your hosting provider in the first instance or the support forums of phpBB for further assistance.',
 	'INST_ERR_FTP_PATH'			=> 'Could not change to the given directory, please check the path.',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 3ee619ea16..eaa2d7e3a5 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -144,7 +144,7 @@ $lang = array_merge($lang, array(
 	'MCP_ADD'						=> 'Add a warning',
 
 	'MCP_BAN'					=> 'Banning',
-	'MCP_BAN_EMAILS'			=> 'Ban e-mails',
+	'MCP_BAN_EMAILS'			=> 'Ban emails',
 	'MCP_BAN_IPS'				=> 'Ban IPs',
 	'MCP_BAN_USERNAMES'			=> 'Ban Usernames',
 
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index c3ab27871e..cdbedebefc 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -46,25 +46,25 @@ $lang = array_merge($lang, array(
 
 	'BEFORE'				=> 'Before',
 
-	'CC_EMAIL'				=> 'Send a copy of this e-mail to yourself.',
+	'CC_EMAIL'				=> 'Send a copy of this email to yourself.',
 	'CONTACT_USER'			=> 'Contact',
 
 	'DEST_LANG'				=> 'Language',
 	'DEST_LANG_EXPLAIN'		=> 'Select an appropriate language (if available) for the recipient of this message.',
 
-	'EMAIL_BODY_EXPLAIN'	=> 'This message will be sent as plain text, do not include any HTML or BBCode. The return address for this message will be set to your e-mail address.',
-	'EMAIL_DISABLED'		=> 'Sorry but all e-mail related functions have been disabled.',
-	'EMAIL_SENT'			=> 'The e-mail has been sent.',
-	'EMAIL_TOPIC_EXPLAIN'	=> 'This message will be sent as plain text, do not include any HTML or BBCode. Please note that the topic information is already included in the message. The return address for this message will be set to your e-mail address.',
-	'EMPTY_ADDRESS_EMAIL'	=> 'You must provide a valid e-mail address for the recipient.',
+	'EMAIL_BODY_EXPLAIN'	=> 'This message will be sent as plain text, do not include any HTML or BBCode. The return address for this message will be set to your email address.',
+	'EMAIL_DISABLED'		=> 'Sorry but all email related functions have been disabled.',
+	'EMAIL_SENT'			=> 'The email has been sent.',
+	'EMAIL_TOPIC_EXPLAIN'	=> 'This message will be sent as plain text, do not include any HTML or BBCode. Please note that the topic information is already included in the message. The return address for this message will be set to your email address.',
+	'EMPTY_ADDRESS_EMAIL'	=> 'You must provide a valid email address for the recipient.',
 	'EMPTY_MESSAGE_EMAIL'	=> 'You must enter a message to be emailed.',
 	'EMPTY_MESSAGE_IM'		=> 'You must enter a message to be send.',
 	'EMPTY_NAME_EMAIL'		=> 'You must enter the real name of the recipient.',
-	'EMPTY_SUBJECT_EMAIL'	=> 'You must specify a subject for the e-mail.',
+	'EMPTY_SUBJECT_EMAIL'	=> 'You must specify a subject for the email.',
 	'EQUAL_TO'				=> 'Equal to',
 
 	'FIND_USERNAME_EXPLAIN'	=> 'Use this form to search for specific members. You do not need to fill out all fields. To match partial data use * as a wildcard. When entering dates use the format <kbd>YYYY-MM-DD</kbd>, e.g. <samp>2004-02-29</samp>. Use the mark checkboxes to select one or more usernames (several usernames may be accepted depending on the form itself) and click the Select Marked button to return to the previous form.',
-	'FLOOD_EMAIL_LIMIT'		=> 'You cannot send another e-mail at this time. Please try again later.',
+	'FLOOD_EMAIL_LIMIT'		=> 'You cannot send another email at this time. Please try again later.',
 
 	'GROUP_LEADER'			=> 'Group leader',
 
@@ -103,7 +103,7 @@ $lang = array_merge($lang, array(
 
 	'MORE_THAN'				=> 'More than',
 
-	'NO_EMAIL'				=> 'You are not permitted to send e-mail to this user.',
+	'NO_EMAIL'				=> 'You are not permitted to send email to this user.',
 	'NO_VIEW_USERS'			=> 'You are not authorised to view the member list or profiles.',
 
 	'ORDER'					=> 'Order',
@@ -126,7 +126,7 @@ $lang = array_merge($lang, array(
 	'SEND_MESSAGE'			=> 'Message',
 	'SEND_MSNM_MESSAGE'		=> 'Send WLM message',
 	'SEND_YIM_MESSAGE'		=> 'Send YIM message',
-	'SORT_EMAIL'			=> 'E-mail',
+	'SORT_EMAIL'			=> 'Email',
 	'SORT_LAST_ACTIVE'		=> 'Last active',
 	'SORT_POST_COUNT'		=> 'Post count',
 
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index aa1e9c27ce..2212e44628 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -49,9 +49,9 @@ $lang = array_merge($lang, array(
 	<br />
 	We may also create cookies external to the phpBB software whilst browsing “%1$s”, though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”) and posts submitted by you after registration and whilst logged in (hereinafter “your posts”).<br />
 	<br />
-	Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid e-mail address (hereinafter “your e-mail”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password, and your e-mail address required by “%1$s” during the registration process is either mandatory or optional, at the discretion of “%1$s”. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated e-mails from the phpBB software.<br />
+	Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid email address (hereinafter “your email”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password, and your email address required by “%1$s” during the registration process is either mandatory or optional, at the discretion of “%1$s”. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated emails from the phpBB software.<br />
 	<br />
-	Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your e-mail, then the phpBB software will generate a new password to reclaim your account.<br />
+	Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your email, then the phpBB software will generate a new password to reclaim your account.<br />
 	',
 ));
 
@@ -61,13 +61,13 @@ $lang = array_merge($lang, array(
 	'ACCOUNT_ACTIVE_ADMIN'			=> 'The account has now been activated.',
 	'ACCOUNT_ACTIVE_PROFILE'		=> 'Your account has now been successfully reactivated.',
 	'ACCOUNT_ADDED'					=> 'Thank you for registering, your account has been created. You may now login with your username and password.',
-	'ACCOUNT_COPPA'					=> 'Your account has been created but has to be approved, please check your e-mail for details.',
-	'ACCOUNT_EMAIL_CHANGED'			=> 'Your account has been updated. However, this board requires account reactivation on e-mail changes. An activation key has been sent to the new e-mail address you provided. Please check your e-mail for further information.',
-	'ACCOUNT_EMAIL_CHANGED_ADMIN'	=> 'Your account has been updated. However, this board requires account reactivation by the administrators on e-mail changes. An e-mail has been sent to them and you will be informed when your account has been reactivated.',
-	'ACCOUNT_INACTIVE'				=> 'Your account has been created. However, this board requires account activation, an activation key has been sent to the e-mail address you provided. Please check your e-mail for further information.',
-	'ACCOUNT_INACTIVE_ADMIN'		=> 'Your account has been created. However, this board requires account activation by the administrator group. An e-mail has been sent to them and you will be informed when your account has been activated.',
-	'ACTIVATION_EMAIL_SENT'			=> 'The activation e-mail has been sent to your e-mail address.',
-	'ACTIVATION_EMAIL_SENT_ADMIN'	=> 'The activation e-mail has been sent to the administrators e-mail addresses.',
+	'ACCOUNT_COPPA'					=> 'Your account has been created but has to be approved, please check your email for details.',
+	'ACCOUNT_EMAIL_CHANGED'			=> 'Your account has been updated. However, this board requires account reactivation on email changes. An activation key has been sent to the new email address you provided. Please check your email for further information.',
+	'ACCOUNT_EMAIL_CHANGED_ADMIN'	=> 'Your account has been updated. However, this board requires account reactivation by the administrators on email changes. An email has been sent to them and you will be informed when your account has been reactivated.',
+	'ACCOUNT_INACTIVE'				=> 'Your account has been created. However, this board requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information.',
+	'ACCOUNT_INACTIVE_ADMIN'		=> 'Your account has been created. However, this board requires account activation by the administrator group. An email has been sent to them and you will be informed when your account has been activated.',
+	'ACTIVATION_EMAIL_SENT'			=> 'The activation email has been sent to your email address.',
+	'ACTIVATION_EMAIL_SENT_ADMIN'	=> 'The activation email has been sent to the administrators email addresses.',
 	'ADD'							=> 'Add',
 	'ADD_BCC'						=> 'Add [BCC]',
 	'ADD_FOES'						=> 'Add new foes',
@@ -79,7 +79,7 @@ $lang = array_merge($lang, array(
 	'ADD_RULE'						=> 'Add rule',
 	'ADD_TO'						=> 'Add [To]',
 	'ADD_USERS_UCP_EXPLAIN'			=> 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Please enter each username on a separate line.',
-	'ADMIN_EMAIL'					=> 'Administrators can e-mail me information',
+	'ADMIN_EMAIL'					=> 'Administrators can email me information',
 	'AGREE'							=> 'I agree to these terms',
 	'ALLOW_PM'						=> 'Allow users to send you private messages',
 	'ALLOW_PM_EXPLAIN'				=> 'Note that administrators and moderators will always be able to send you messages.',
@@ -134,7 +134,7 @@ $lang = array_merge($lang, array(
 	'CREATE_FOLDER'				=> 'Add folder…',
 	'CURRENT_IMAGE'				=> 'Current image',
 	'CURRENT_PASSWORD'			=> 'Current password',
-	'CURRENT_PASSWORD_EXPLAIN'	=> 'You must confirm your current password if you wish to change it, alter your e-mail address or username.',
+	'CURRENT_PASSWORD_EXPLAIN'	=> 'You must confirm your current password if you wish to change it, alter your email address or username.',
 	'CUR_PASSWORD_EMPTY'		=> 'You did not enter your current password.',
 	'CUR_PASSWORD_ERROR'		=> 'The current password you entered is incorrect.',
 	'CUSTOM_DATEFORMAT'			=> 'Custom…',
@@ -164,17 +164,17 @@ $lang = array_merge($lang, array(
 	'DEMOTE_SELECTED'			=> 'Demote selected',
 	'DISABLE_CENSORS'			=> 'Enable word censoring',
 	'DISPLAY_GALLERY'			=> 'Display gallery',
-	'DOMAIN_NO_MX_RECORD_EMAIL'	=> 'The entered e-mail domain has no valid MX record.',
+	'DOMAIN_NO_MX_RECORD_EMAIL'	=> 'The entered email domain has no valid MX record.',
 	'DOWNLOADS'					=> 'Downloads',
 	'DRAFTS_DELETED'			=> 'All selected drafts were successfully deleted.',
 	'DRAFTS_EXPLAIN'			=> 'Here you can view, edit and delete your saved drafts.',
 	'DRAFT_UPDATED'				=> 'Draft successfully updated.',
 
 	'EDIT_DRAFT_EXPLAIN'		=> 'Here you are able to edit your draft. Drafts do not contain attachment and poll information.',
-	'EMAIL_BANNED_EMAIL'		=> 'The e-mail address you entered is not allowed to be used.',
-	'EMAIL_INVALID_EMAIL'		=> 'The e-mail address you entered is invalid.',
-	'EMAIL_REMIND'				=> 'This must be the e-mail address associated with your account. If you have not changed this via your user control panel then it is the e-mail address you registered your account with.',
-	'EMAIL_TAKEN_EMAIL'			=> 'The entered e-mail address is already in use.',
+	'EMAIL_BANNED_EMAIL'		=> 'The email address you entered is not allowed to be used.',
+	'EMAIL_INVALID_EMAIL'		=> 'The email address you entered is invalid.',
+	'EMAIL_REMIND'				=> 'This must be the email address associated with your account. If you have not changed this via your user control panel then it is the email address you registered your account with.',
+	'EMAIL_TAKEN_EMAIL'			=> 'The entered email address is already in use.',
 	'EMPTY_DRAFT'				=> 'You must enter a message to submit your changes.',
 	'EMPTY_DRAFT_TITLE'			=> 'You must enter a draft title.',
 	'EXPORT_AS_XML'				=> 'Export as XML',
@@ -286,7 +286,7 @@ $lang = array_merge($lang, array(
 	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
 	'NOTIFY_METHOD'					=> 'Notification method',
 	'NOTIFY_METHOD_BOTH'			=> 'Both',
-	'NOTIFY_METHOD_EMAIL'			=> 'E-mail only',
+	'NOTIFY_METHOD_EMAIL'			=> 'Email only',
 	'NOTIFY_METHOD_EXPLAIN'			=> 'Method for sending messages sent via this board.',
 	'NOTIFY_METHOD_IM'				=> 'Jabber only',
 	'NOTIFY_ON_PM'					=> 'Notify me on new private messages',
@@ -324,7 +324,7 @@ $lang = array_merge($lang, array(
 	'NO_BOOKMARKS'				=> 'You have no bookmarks.',
 	'NO_BOOKMARKS_SELECTED'		=> 'You have selected no bookmarks.',
 	'NO_EDIT_READ_MESSAGE'		=> 'Private message cannot be edited because it has already been read.',
-	'NO_EMAIL_USER'				=> 'The e-mail/username information submitted could not be found.',
+	'NO_EMAIL_USER'				=> 'The email/username information submitted could not be found.',
 	'NO_FOES'					=> 'No foes currently defined',
 	'NO_FRIENDS'				=> 'No friends currently defined',
 	'NO_FRIENDS_OFFLINE'		=> 'No friends offline',
@@ -350,7 +350,7 @@ $lang = array_merge($lang, array(
 	'PASS_TYPE_SYMBOL_EXPLAIN'	=> 'Password must be between %1$s and %2$s long, must contain letters in mixed case, must contain numbers and must contain symbols.',
 	'PASSWORD'					=> 'Password',
 	'PASSWORD_ACTIVATED'		=> 'Your new password has been activated.',
-	'PASSWORD_UPDATED'			=> 'A new password was sent to your registered e-mail address.',
+	'PASSWORD_UPDATED'			=> 'A new password was sent to your registered email address.',
 	'PERMISSIONS_RESTORED'		=> 'Successfully restored original permissions.',
 	'PERMISSIONS_TRANSFERRED'	=> 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
 	'PM_DISABLED'				=> 'Private messaging has been disabled on this board.',
@@ -408,7 +408,7 @@ $lang = array_merge($lang, array(
 	'SEARCH_YOUR_POSTS'			=> 'Show your posts',
 	'SEND_PASSWORD'				=> 'Send password',
 	'SENT_AT'					=> 'Sent',			// Used before dates in private messages
-	'SHOW_EMAIL'				=> 'Users can contact me by e-mail',
+	'SHOW_EMAIL'				=> 'Users can contact me by email',
 	'SIGNATURE_EXPLAIN'			=> 'This is a block of text that can be added to posts you make. There is a %d character limit.',
 	'SIGNATURE_PREVIEW'			=> 'Your signature will appear like this in posts',
 	'SIGNATURE_TOO_LONG'		=> 'Your signature is too long.',
@@ -427,12 +427,12 @@ $lang = array_merge($lang, array(
 
 	'UCP'						=> 'User Control Panel',
 	'UCP_ACTIVATE'				=> 'Activate account',
-	'UCP_ADMIN_ACTIVATE'		=> 'Please note that you will need to enter a valid e-mail address before your account is activated. The administrator will review your account and if approved you will receive an e-mail at the address you specified.',
+	'UCP_ADMIN_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will receive an email at the address you specified.',
 	'UCP_AIM'					=> 'AOL Instant Messenger',
 	'UCP_ATTACHMENTS'			=> 'Attachments',
 	'UCP_COPPA_BEFORE'			=> 'Before %s',
 	'UCP_COPPA_ON_AFTER'		=> 'On or after %s',
-	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid e-mail address before your account is activated. You will receive an e-mail at the address you provide that contains an account activation link.',
+	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. You will receive an email at the address you provide that contains an account activation link.',
 	'UCP_ICQ'					=> 'ICQ number',
 	'UCP_JABBER'				=> 'Jabber address',
 
@@ -472,7 +472,7 @@ $lang = array_merge($lang, array(
 
 	'UCP_REGISTER_DISABLE'			=> 'Creating a new account is currently not possible.',
 	'UCP_REMIND'					=> 'Send password',
-	'UCP_RESEND'					=> 'Send activation e-mail',
+	'UCP_RESEND'					=> 'Send activation email',
 	'UCP_WELCOME'					=> 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',
 	'UCP_YIM'						=> 'Yahoo Messenger',
 	'UCP_ZEBRA'						=> 'Friends &amp; Foes',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 184f88ed3c..278c064fe7 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -57,13 +57,13 @@ $lang = array_merge($lang, array(
 		1	=> 'Last edited by %2$s on %3$s, edited %1$d time in total.',
 		2	=> 'Last edited by %2$s on %3$s, edited %1$d times in total.',
 	),
-	'EMAIL_TOPIC'			=> 'E-mail friend',
+	'EMAIL_TOPIC'			=> 'Email friend',
 	'ERROR_NO_ATTACHMENT'	=> 'The selected attachment does not exist anymore.',
 
 	'FILE_NOT_FOUND_404'	=> 'The file <strong>%s</strong> does not exist.',
 	'FORK_TOPIC'			=> 'Copy topic',
 	'FULL_EDITOR'			=> 'Full Editor &amp; Preview',
-	
+
 	'LINKAGE_FORBIDDEN'		=> 'You are not authorised to view, download or link from/to this site.',
 	'LOGIN_NOTIFY_TOPIC'	=> 'You have been notified about this topic, please login to view it.',
 	'LOGIN_VIEWTOPIC'		=> 'The board requires you to be registered and logged in to view this topic.',
-- 
cgit v1.2.1


From 00172afa532c99329f4683ecaefb0ba851e46b94 Mon Sep 17 00:00:00 2001
From: riadhchtara <riadh.chtara@gmail.com>
Date: Sun, 15 Apr 2012 12:36:42 +0100
Subject: [ticket/10813] Installer now checks json extension

Installer now checks json extension and cannot continue without it.
Changes are made in phpBB/install/install_install.php where the
checking for json is added and to phpBB/language/en/install.php where
2 new keys for the messages that would be displayed are also added.

PHPBB3-10813
---
 phpBB/language/en/install.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index ca6045a921..29664ae5f0 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -292,6 +292,8 @@ $lang = array_merge($lang, array(
 	'PCRE_UTF_SUPPORT_EXPLAIN'		=> 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.',
 	'PHP_GETIMAGESIZE_SUPPORT'			=> 'PHP function getimagesize() is available',
 	'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN'	=> '<strong>Required</strong> - In order for phpBB to function correctly, the getimagesize function needs to be available.',
+	'PHP_JSON_SUPPORT'        		=> 'PHP JSON support',
+	'PHP_JSON_SUPPORT_EXPLAIN'    	=> '<strong>Required</strong> - In order for phpBB to function correctly, the PHP JSON extension needs to be available.',
 	'PHP_OPTIONAL_MODULE'			=> 'Optional modules',
 	'PHP_OPTIONAL_MODULE_EXPLAIN'	=> '<strong>Optional</strong> - These modules or applications are optional. However, if they are available they will enable extra features.',
 	'PHP_SUPPORTED_DB'				=> 'Supported databases',
-- 
cgit v1.2.1


From b83fa0349ad30eefed3e8064d29793a9b3dd17f7 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Mon, 30 Apr 2012 21:55:24 +0200
Subject: [ticket/10847] fixing all misspelled "dependant" to "dependent"

PHPBB3-10847
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 758ef8ed82..7e3c227893 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -411,7 +411,7 @@ $lang = array_merge($lang, array(
 
 // Server Settings
 $lang = array_merge($lang, array(
-	'ACP_SERVER_SETTINGS_EXPLAIN'	=> 'Here you define server and domain dependant settings. Please ensure the data you enter is accurate, errors will result in emails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.',
+	'ACP_SERVER_SETTINGS_EXPLAIN'	=> 'Here you define server and domain dependent settings. Please ensure the data you enter is accurate, errors will result in emails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.',
 
 	'ENABLE_GZIP'				=> 'Enable GZip compression',
 	'ENABLE_GZIP_EXPLAIN'		=> 'Generated content will be compressed prior to sending it to the user. This can reduce network traffic but will also increase CPU usage on both server and client side. Requires zlib PHP extension to be loaded.',
-- 
cgit v1.2.1


From 5ce46cc9603ccc153bf26168b18afee0f3b645af Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sat, 31 Mar 2012 00:16:28 +0530
Subject: [feature/delete-auto-logins] User can view/delete auto logins.

User has an extra option in UCP->Profile to view the auto logins and
clear them.

PHPBB3-9647
---
 phpBB/language/en/ucp.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 2212e44628..1e36b4e9f7 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -87,6 +87,7 @@ $lang = array_merge($lang, array(
 	'ATTACHMENTS_EXPLAIN'			=> 'This is a list of attachments you have made in posts to this board.',
 	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
 	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
+	'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected auto-login session keys were successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
 	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$s, height: %2$s, file size: %3$.2f KiB.',
 	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
@@ -376,6 +377,8 @@ $lang = array_merge($lang, array(
 	'PREFERENCES_UPDATED'		=> 'Your preferences have been updated.',
 	'PROFILE_INFO_NOTICE'		=> 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
 	'PROFILE_UPDATED'			=> 'Your profile has been updated.',
+	'PROFILE_AUTOLOGIN_KEYS'	=> 'The auto-login session keys can be selected and deleted.',
+	'PROFILE_NO_AUTOLOGIN_KEYS'	=> 'There are no saved auto-login session keys.',
 
 	'RECIPIENT'							=> 'Recipient',
 	'RECIPIENTS'						=> 'Recipients',
@@ -465,6 +468,7 @@ $lang = array_merge($lang, array(
 	'UCP_PROFILE_PROFILE_INFO'	=> 'Edit profile',
 	'UCP_PROFILE_REG_DETAILS'	=> 'Edit account settings',
 	'UCP_PROFILE_SIGNATURE'		=> 'Edit signature',
+	'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Edit auto-login session keys',
 
 	'UCP_USERGROUPS'			=> 'Usergroups',
 	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
-- 
cgit v1.2.1


From dfedc995ed04c777c933dc68d0da388d8214cb1b Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 10 Apr 2012 18:33:55 +0530
Subject: [feature/delete-auto-logins] Fixes language entries

Fixed language entries so that UI shows persistent login keys instead of
autologin keys.

PHPBB3-9647
---
 phpBB/language/en/ucp.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 1e36b4e9f7..926af99a12 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -87,7 +87,7 @@ $lang = array_merge($lang, array(
 	'ATTACHMENTS_EXPLAIN'			=> 'This is a list of attachments you have made in posts to this board.',
 	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
 	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
-	'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected auto-login session keys were successfully deleted.',
+	'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected persistent login keys were successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
 	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$s, height: %2$s, file size: %3$.2f KiB.',
 	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
@@ -377,8 +377,8 @@ $lang = array_merge($lang, array(
 	'PREFERENCES_UPDATED'		=> 'Your preferences have been updated.',
 	'PROFILE_INFO_NOTICE'		=> 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
 	'PROFILE_UPDATED'			=> 'Your profile has been updated.',
-	'PROFILE_AUTOLOGIN_KEYS'	=> 'The auto-login session keys can be selected and deleted.',
-	'PROFILE_NO_AUTOLOGIN_KEYS'	=> 'There are no saved auto-login session keys.',
+	'PROFILE_AUTOLOGIN_KEYS'	=> 'The persisten login keys can be selected and deleted.',
+	'PROFILE_NO_AUTOLOGIN_KEYS'	=> 'There are no saved persistent login keys.',
 
 	'RECIPIENT'							=> 'Recipient',
 	'RECIPIENTS'						=> 'Recipients',
@@ -468,7 +468,7 @@ $lang = array_merge($lang, array(
 	'UCP_PROFILE_PROFILE_INFO'	=> 'Edit profile',
 	'UCP_PROFILE_REG_DETAILS'	=> 'Edit account settings',
 	'UCP_PROFILE_SIGNATURE'		=> 'Edit signature',
-	'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Edit auto-login session keys',
+	'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Edit persistent login keys',
 
 	'UCP_USERGROUPS'			=> 'Usergroups',
 	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
-- 
cgit v1.2.1


From 71f84164805293a2ab5c70ec49799ee8bfa5eac3 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Fri, 13 Apr 2012 21:29:31 +0530
Subject: [feature/delete-auto-logins] improved styling and fixes language

Table ahs been styled. Date is now formatted properly instead of
the unix timestamp being displayed earlier. fixes small mistake in language
entry

PHPBB3-9647
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 926af99a12..44d14b2349 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -377,7 +377,7 @@ $lang = array_merge($lang, array(
 	'PREFERENCES_UPDATED'		=> 'Your preferences have been updated.',
 	'PROFILE_INFO_NOTICE'		=> 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
 	'PROFILE_UPDATED'			=> 'Your profile has been updated.',
-	'PROFILE_AUTOLOGIN_KEYS'	=> 'The persisten login keys can be selected and deleted.',
+	'PROFILE_AUTOLOGIN_KEYS'	=> 'The persistent login keys can be selected and deleted.',
 	'PROFILE_NO_AUTOLOGIN_KEYS'	=> 'There are no saved persistent login keys.',
 
 	'RECIPIENT'							=> 'Recipient',
-- 
cgit v1.2.1


From 124068b0b1c05df692a81b529e03f9a22702d270 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Fri, 20 Apr 2012 04:13:20 +0530
Subject: [feature/delete-auto-logins] explain persistent keys in the ucp.

a short explaination of persistent keys in edit persistent keys section

PHPBB3-9647
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 44d14b2349..398163f38a 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -377,7 +377,7 @@ $lang = array_merge($lang, array(
 	'PREFERENCES_UPDATED'		=> 'Your preferences have been updated.',
 	'PROFILE_INFO_NOTICE'		=> 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
 	'PROFILE_UPDATED'			=> 'Your profile has been updated.',
-	'PROFILE_AUTOLOGIN_KEYS'	=> 'The persistent login keys can be selected and deleted.',
+	'PROFILE_AUTOLOGIN_KEYS'	=> 'The persistent login keys keeps the user logged in till the user signs out. Logout does only delete the persistent key on the current machine. The persistent login keys for all machines can be viewed/deleted by the user.',
 	'PROFILE_NO_AUTOLOGIN_KEYS'	=> 'There are no saved persistent login keys.',
 
 	'RECIPIENT'							=> 'Recipient',
-- 
cgit v1.2.1


From 9db1ed6e804e1ebf536b81d1d68daf44d558c2e1 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sat, 21 Apr 2012 13:28:01 +0530
Subject: [feature/delete-auto-logins] fix language keys and styling

introduction of language variables instead of hardcoded language.

PHPBB3-9647
---
 phpBB/language/en/ucp.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 398163f38a..1ed978f788 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -256,6 +256,8 @@ $lang = array_merge($lang, array(
 	'LINK_REMOTE_SIZE'			=> 'Avatar dimensions',
 	'LINK_REMOTE_SIZE_EXPLAIN'	=> 'Specify the width and height of the avatar, leave blank to attempt automatic verification.',
 	'LOGIN_EXPLAIN_UCP'			=> 'Please login in order to access the User Control Panel.',
+	'LOGIN_KEY'					=> 'Login Key',
+	'LOGIN_TIME'				=> 'Login Time',
 	'LOGIN_REDIRECT'			=> 'You have been successfully logged in.',
 	'LOGOUT_FAILED'				=> 'You were not logged out, as the request did not match your session. Please contact the board administrator if you continue to experience problems.',
 	'LOGOUT_REDIRECT'			=> 'You have been successfully logged out.',
@@ -377,7 +379,7 @@ $lang = array_merge($lang, array(
 	'PREFERENCES_UPDATED'		=> 'Your preferences have been updated.',
 	'PROFILE_INFO_NOTICE'		=> 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
 	'PROFILE_UPDATED'			=> 'Your profile has been updated.',
-	'PROFILE_AUTOLOGIN_KEYS'	=> 'The persistent login keys keeps the user logged in till the user signs out. Logout does only delete the persistent key on the current machine. The persistent login keys for all machines can be viewed/deleted by the user.',
+	'PROFILE_AUTOLOGIN_KEYS'	=> 'The persistent login keys logins the user automatically on each visit until logout. Logout does only delete the persistent key on the current machine. The persistent login keys for all machines can be viewed/deleted by the user here.',
 	'PROFILE_NO_AUTOLOGIN_KEYS'	=> 'There are no saved persistent login keys.',
 
 	'RECIPIENT'							=> 'Recipient',
-- 
cgit v1.2.1


From 1cfb84e61e808a50b12e4686781eb85202b4e87b Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sat, 21 Apr 2012 15:29:44 +0530
Subject: [feature/delete-auto-logins] fixes language entry

PHPBB3-9647
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 1ed978f788..4c945140bb 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -379,7 +379,7 @@ $lang = array_merge($lang, array(
 	'PREFERENCES_UPDATED'		=> 'Your preferences have been updated.',
 	'PROFILE_INFO_NOTICE'		=> 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
 	'PROFILE_UPDATED'			=> 'Your profile has been updated.',
-	'PROFILE_AUTOLOGIN_KEYS'	=> 'The persistent login keys logins the user automatically on each visit until logout. Logout does only delete the persistent key on the current machine. The persistent login keys for all machines can be viewed/deleted by the user here.',
+	'PROFILE_AUTOLOGIN_KEYS'	=> 'The persistent login keys automatically log you in when you visit the board. If you logout, the persistent login key is deleted only on the computer you are using to logout. Here you can see persistent login keys created on other computers you used to access this site.',
 	'PROFILE_NO_AUTOLOGIN_KEYS'	=> 'There are no saved persistent login keys.',
 
 	'RECIPIENT'							=> 'Recipient',
-- 
cgit v1.2.1


From 0191e1313ca8179bb09a2fc6f3d06de95768bc96 Mon Sep 17 00:00:00 2001
From: wagnerch <wagnerch@code.phpbb.com>
Date: Sun, 22 Jul 2007 22:23:00 +0000
Subject: [feature/postgresql-fulltext-search] PostgreSQL fulltext search,
 version 1.

PHPBB3-9730
---
 phpBB/language/en/acp/search.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 3dc89570bf..5fa5acbe40 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -61,6 +61,20 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN'	=> 'Words with at least this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 	'FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'	=> 'Words with no more than this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 
+	'FULLTEXT_POSTGRES_INCOMPATIBLE_VERSION'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL.',
+	'FULLTEXT_POSTGRES_TS_NOT_FOUND'	=> 'The PostgreSQL fulltext backend can only be used with Tsearch2.',
+	'FULLTEXT_POSTGRES_TOTAL_POSTS'			=> 'Total number of indexed posts',
+	'FULLTEXT_POSTGRES_MBSTRING'				=> 'Support for non-latin UTF-8 characters using mbstring:',
+	'FULLTEXT_POSTGRES_PCRE'					=> 'Support for non-latin UTF-8 characters using PCRE:',
+	'FULLTEXT_POSTGRES_TS_NAME'				=> 'Tsearch2 Configuration Profile:',
+	'FULLTEXT_POSTGRES_MIN_WORD_LEN'			=> 'Minimum word length for keywords',
+	'FULLTEXT_POSTGRES_MAX_WORD_LEN'			=> 'Maximum word length for keywords',
+	'FULLTEXT_POSTGRES_MBSTRING_EXPLAIN'		=> 'If PCRE does not have unicode character properties, the search backend will try to use mbstring’s regular expression engine.',
+	'FULLTEXT_POSTGRES_PCRE_EXPLAIN'			=> 'This search backend requires PCRE unicode character properties, only available in PHP 4.4, 5.1 and above, if you want to search for non-latin characters.',
+	'FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'				=> 'The Tsearch2 configuration profile used to determine the parser and dictionary.',
+	'FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'			=> 'Words with at least this many characters will be included in the query to the database.',
+	'FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'			=> 'Words with no more than this many characters will be included in the query to the database.',
+
 	'GENERAL_SEARCH_SETTINGS'				=> 'General search settings',
 	'GO_TO_SEARCH_INDEX'					=> 'Go to search index page',
 
-- 
cgit v1.2.1


From e127ba17ea3259d1fa9a135b8ae5ab9136bc7712 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 12 Jun 2012 18:40:48 +0530
Subject: [ticket/10936] fix language key

Language key changes from INCOMPATIBLE_VERSION to INCOMPATIBLE_DATABASE to
make it more meaningfull.

PHPBB3-10936
---
 phpBB/language/en/acp/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 3dc89570bf..2badb082d6 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -51,7 +51,7 @@ $lang = array_merge($lang, array(
 	'DELETING_INDEX_IN_PROGRESS'			=> 'Deleting the index in progress',
 	'DELETING_INDEX_IN_PROGRESS_EXPLAIN'	=> 'The search backend is currently cleaning its index. This can take a few minutes.',
 
-	'FULLTEXT_MYSQL_INCOMPATIBLE_VERSION'	=> 'The MySQL fulltext backend can only be used with MySQL4 and above.',
+	'FULLTEXT_MYSQL_INCOMPATIBLE_DATABASE'	=> 'The MySQL fulltext backend can only be used with MySQL4 and above.',
 	'FULLTEXT_MYSQL_NOT_MYISAM'				=> 'MySQL fulltext indexes can only be used with MyISAM tables.',
 	'FULLTEXT_MYSQL_TOTAL_POSTS'			=> 'Total number of indexed posts',
 	'FULLTEXT_MYSQL_MBSTRING'				=> 'Support for non-latin UTF-8 characters using mbstring:',
-- 
cgit v1.2.1


From 96cb75dedb73dc0e36b842492f6a176db9147023 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Wed, 13 Jun 2012 01:43:32 +0530
Subject: [ticket/10936] remove PCRE and mbstring support check

Since PCRE UTF8 support already has a global check no need for mbstring
or PCRE check here.

PHPBB3-10936
---
 phpBB/language/en/acp/search.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 2badb082d6..2f46856557 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -54,10 +54,6 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_MYSQL_INCOMPATIBLE_DATABASE'	=> 'The MySQL fulltext backend can only be used with MySQL4 and above.',
 	'FULLTEXT_MYSQL_NOT_MYISAM'				=> 'MySQL fulltext indexes can only be used with MyISAM tables.',
 	'FULLTEXT_MYSQL_TOTAL_POSTS'			=> 'Total number of indexed posts',
-	'FULLTEXT_MYSQL_MBSTRING'				=> 'Support for non-latin UTF-8 characters using mbstring:',
-	'FULLTEXT_MYSQL_PCRE'					=> 'Support for non-latin UTF-8 characters using PCRE:',
-	'FULLTEXT_MYSQL_MBSTRING_EXPLAIN'		=> 'If PCRE does not have unicode character properties, the search backend will try to use mbstring’s regular expression engine.',
-	'FULLTEXT_MYSQL_PCRE_EXPLAIN'			=> 'This search backend requires PCRE unicode character properties, only available in PHP 4.4, 5.1 and above, if you want to search for non-latin characters.',
 	'FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN'	=> 'Words with at least this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 	'FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'	=> 'Words with no more than this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 
-- 
cgit v1.2.1


From 50936cb2eff3f80d99390c76ef6ac535e73f6cc3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 4 Jun 2012 19:06:46 +0200
Subject: [feature/new-tz-handling] Fix selecting and validating of timezone in
 UCP

PHPBB3-9558
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index a80862890a..f9558bc6d3 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -422,6 +422,7 @@ $lang = array_merge($lang, array(
 	'SORT_SIZE'					=> 'File size',
 
 	'TIMEZONE'					=> 'Timezone',
+	'TIMEZONE_INVALID'			=> 'The timezone you selected is invalid.',
 	'TO'						=> 'To',
 	'TOO_MANY_RECIPIENTS'		=> 'You tried to send a private message to too many recipients.',
 	'TOO_MANY_REGISTERS'		=> 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',
-- 
cgit v1.2.1


From 00b5e5345dc44c99340bba932522b6b05b48dab2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 4 Jun 2012 19:19:34 +0200
Subject: [feature/new-tz-handling] Fix displaying of "All times are" string

PHPBB3-9558
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 023ee2c89f..bbafb54108 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -74,7 +74,7 @@ $lang = array_merge($lang, array(
 	'ALL_FORUMS'					=> 'All forums',
 	'ALL_MESSAGES'					=> 'All messages',
 	'ALL_POSTS'						=> 'All posts',
-	'ALL_TIMES'						=> 'All times are %1$s %2$s',
+	'ALL_TIMES'						=> 'All times are <abbr title="%2$s">%1$s</abbr>',
 	'ALL_TOPICS'					=> 'All Topics',
 	'AND'							=> 'And',
 	'ARE_WATCHING_FORUM'			=> 'You have subscribed to be notified of new posts in this forum.',
-- 
cgit v1.2.1


From 66f7d45603417df7619323977de62aebce0bf676 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 5 Jun 2012 21:44:44 +0200
Subject: [feature/new-tz-handling] Introduce 2 step timezone selection using
 javascript

PHPBB3-9558
---
 phpBB/language/en/common.php | 1 +
 phpBB/language/en/ucp.php    | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index bbafb54108..d0afb846b4 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -42,6 +42,7 @@ $lang = array_merge($lang, array(
 	'TRANSLATION_INFO'	=> '',
 	'DIRECTION'			=> 'ltr',
 	'DATE_FORMAT'		=> '|d M Y|',	// 01 Jan 2007 (with Relative days enabled)
+	'DATETIME_FORMAT'	=> '|d M Y, H:i|',	// 01 Jan 2007, 13:37 (with Relative days enabled)
 	'USER_LANG'			=> 'en-gb',
 
 	// You can define different rules for the determination of plural forms here.
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index f9558bc6d3..64a434d89c 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -412,6 +412,7 @@ $lang = array_merge($lang, array(
 	'SIGNATURE_EXPLAIN'			=> 'This is a block of text that can be added to posts you make. There is a %d character limit.',
 	'SIGNATURE_PREVIEW'			=> 'Your signature will appear like this in posts',
 	'SIGNATURE_TOO_LONG'		=> 'Your signature is too long.',
+	'SELECT_CURRENT_TIME'		=> 'Select current time',
 	'SELECT_TIMEZONE'			=> 'Select timezone',
 	'SORT'						=> 'Sort',
 	'SORT_COMMENT'				=> 'File comment',
@@ -422,7 +423,9 @@ $lang = array_merge($lang, array(
 	'SORT_SIZE'					=> 'File size',
 
 	'TIMEZONE'					=> 'Timezone',
+	'TIMEZONE_DATE_SUGGESTION'	=> 'Suggestion: %s',
 	'TIMEZONE_INVALID'			=> 'The timezone you selected is invalid.',
+	'TIMEZONE_SELECTED'			=> '(currently selected)',
 	'TO'						=> 'To',
 	'TOO_MANY_RECIPIENTS'		=> 'You tried to send a private message to too many recipients.',
 	'TOO_MANY_REGISTERS'		=> 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',
-- 
cgit v1.2.1


From 5f96e5d374d1702d3d81591b7c69ede1cafebfa7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 12 Jun 2012 19:54:26 +0200
Subject: [feature/new-tz-handling] Fix timezone option when editing a user in
 the ACP

PHPBB3-9558
---
 phpBB/language/en/acp/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index dc35969955..5cebcc89d7 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -401,6 +401,8 @@ $lang = array_merge($lang, array(
 	'STATISTIC'					=> 'Statistic',
 	'STATISTIC_RESYNC_OPTIONS'	=> 'Resynchronise or reset statistics',
 
+	'TIMEZONE_INVALID'	=> 'The timezone you selected is invalid.',
+	'TIMEZONE_SELECTED'	=> '(currently selected)',
 	'TOPICS_PER_DAY'	=> 'Topics per day',
 
 	'UPLOAD_DIR_SIZE'	=> 'Size of posted attachments',
-- 
cgit v1.2.1


From 8981399ae141d87aaa2f2f7994bca9cf6df3ec24 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Mon, 11 Jun 2012 16:49:34 +0530
Subject: [feature/postgresql-fulltext-search] change language for pgsql < 8.3

PHPBB3-9730
---
 phpBB/language/en/acp/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 5fa5acbe40..a307bc3e07 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -62,7 +62,7 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'	=> 'Words with no more than this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 
 	'FULLTEXT_POSTGRES_INCOMPATIBLE_VERSION'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL.',
-	'FULLTEXT_POSTGRES_TS_NOT_FOUND'	=> 'The PostgreSQL fulltext backend can only be used with Tsearch2.',
+	'FULLTEXT_POSTGRES_TS_NOT_USABLE'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL 8.3 and above.',
 	'FULLTEXT_POSTGRES_TOTAL_POSTS'			=> 'Total number of indexed posts',
 	'FULLTEXT_POSTGRES_MBSTRING'				=> 'Support for non-latin UTF-8 characters using mbstring:',
 	'FULLTEXT_POSTGRES_PCRE'					=> 'Support for non-latin UTF-8 characters using PCRE:',
-- 
cgit v1.2.1


From 84054afc9de614bb41f178f78a71c6966b9e0537 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 12 Jun 2012 04:18:39 +0530
Subject: [feature/postgresql-fulltext-search] remove mbstring support

Remove the usage of mbstring regex engine when PCRE does not support UTF8
since its a requirement for phpbb 3.1

PHPBB3-9730
---
 phpBB/language/en/acp/search.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index a307bc3e07..6d45878038 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -64,12 +64,10 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_POSTGRES_INCOMPATIBLE_VERSION'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL.',
 	'FULLTEXT_POSTGRES_TS_NOT_USABLE'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL 8.3 and above.',
 	'FULLTEXT_POSTGRES_TOTAL_POSTS'			=> 'Total number of indexed posts',
-	'FULLTEXT_POSTGRES_MBSTRING'				=> 'Support for non-latin UTF-8 characters using mbstring:',
 	'FULLTEXT_POSTGRES_PCRE'					=> 'Support for non-latin UTF-8 characters using PCRE:',
 	'FULLTEXT_POSTGRES_TS_NAME'				=> 'Tsearch2 Configuration Profile:',
 	'FULLTEXT_POSTGRES_MIN_WORD_LEN'			=> 'Minimum word length for keywords',
 	'FULLTEXT_POSTGRES_MAX_WORD_LEN'			=> 'Maximum word length for keywords',
-	'FULLTEXT_POSTGRES_MBSTRING_EXPLAIN'		=> 'If PCRE does not have unicode character properties, the search backend will try to use mbstring’s regular expression engine.',
 	'FULLTEXT_POSTGRES_PCRE_EXPLAIN'			=> 'This search backend requires PCRE unicode character properties, only available in PHP 4.4, 5.1 and above, if you want to search for non-latin characters.',
 	'FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'				=> 'The Tsearch2 configuration profile used to determine the parser and dictionary.',
 	'FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'			=> 'Words with at least this many characters will be included in the query to the database.',
-- 
cgit v1.2.1


From 2821dc332537ec962ad1552d523ffaa7f50d7a43 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 12 Jun 2012 04:31:31 +0530
Subject: [feature/postgresql-fulltext-search] fix language tsearch2 to text
 search

Language is changed according to the current PostgreSQL documentation.

PHPBB3-9730
---
 phpBB/language/en/acp/search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 6d45878038..736a3049a8 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -65,11 +65,11 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_POSTGRES_TS_NOT_USABLE'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL 8.3 and above.',
 	'FULLTEXT_POSTGRES_TOTAL_POSTS'			=> 'Total number of indexed posts',
 	'FULLTEXT_POSTGRES_PCRE'					=> 'Support for non-latin UTF-8 characters using PCRE:',
-	'FULLTEXT_POSTGRES_TS_NAME'				=> 'Tsearch2 Configuration Profile:',
+	'FULLTEXT_POSTGRES_TS_NAME'				=> 'Text search Configuration Profile:',
 	'FULLTEXT_POSTGRES_MIN_WORD_LEN'			=> 'Minimum word length for keywords',
 	'FULLTEXT_POSTGRES_MAX_WORD_LEN'			=> 'Maximum word length for keywords',
 	'FULLTEXT_POSTGRES_PCRE_EXPLAIN'			=> 'This search backend requires PCRE unicode character properties, only available in PHP 4.4, 5.1 and above, if you want to search for non-latin characters.',
-	'FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'				=> 'The Tsearch2 configuration profile used to determine the parser and dictionary.',
+	'FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'				=> 'The Text search configuration profile used to determine the parser and dictionary.',
 	'FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'			=> 'Words with at least this many characters will be included in the query to the database.',
 	'FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'			=> 'Words with no more than this many characters will be included in the query to the database.',
 
-- 
cgit v1.2.1


From 8e035f9141f79ba12ff6f20d9d2ea0008f73fa1e Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 12 Jun 2012 05:07:05 +0530
Subject: [feature/postgresql-fulltext-search] removes pcre check

PCRE UTF8 support is already checked globally. adds an option of
pgsql version to acp.

PHPBB3-9730
---
 phpBB/language/en/acp/search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 736a3049a8..be147a78de 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -64,11 +64,11 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_POSTGRES_INCOMPATIBLE_VERSION'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL.',
 	'FULLTEXT_POSTGRES_TS_NOT_USABLE'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL 8.3 and above.',
 	'FULLTEXT_POSTGRES_TOTAL_POSTS'			=> 'Total number of indexed posts',
-	'FULLTEXT_POSTGRES_PCRE'					=> 'Support for non-latin UTF-8 characters using PCRE:',
+	'FULLTEXT_POSTGRES_VERSION_CHECK'		=> 'PostgreSQL version',
 	'FULLTEXT_POSTGRES_TS_NAME'				=> 'Text search Configuration Profile:',
 	'FULLTEXT_POSTGRES_MIN_WORD_LEN'			=> 'Minimum word length for keywords',
 	'FULLTEXT_POSTGRES_MAX_WORD_LEN'			=> 'Maximum word length for keywords',
-	'FULLTEXT_POSTGRES_PCRE_EXPLAIN'			=> 'This search backend requires PCRE unicode character properties, only available in PHP 4.4, 5.1 and above, if you want to search for non-latin characters.',
+	'FULLTEXT_POSTGRES_VERSION_CHECK_EXPLAIN'		=> 'This search backend requires PostgreSQL version 8.3 and above.',
 	'FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'				=> 'The Text search configuration profile used to determine the parser and dictionary.',
 	'FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'			=> 'Words with at least this many characters will be included in the query to the database.',
 	'FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'			=> 'Words with no more than this many characters will be included in the query to the database.',
-- 
cgit v1.2.1


From 8ba510a99df3b26333367347a7c2c22664ae400f Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 12 Jun 2012 12:19:28 +0530
Subject: [feature/postgresql-fulltext-search] fix language key

Language key name not incompatible_database instead of version which
was misleading

PHPBB3-9730
---
 phpBB/language/en/acp/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index be147a78de..93bad88a5d 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -61,7 +61,7 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN'	=> 'Words with at least this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 	'FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'	=> 'Words with no more than this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 
-	'FULLTEXT_POSTGRES_INCOMPATIBLE_VERSION'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL.',
+	'FULLTEXT_POSTGRES_INCOMPATIBLE_DATABASE'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL.',
 	'FULLTEXT_POSTGRES_TS_NOT_USABLE'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL 8.3 and above.',
 	'FULLTEXT_POSTGRES_TOTAL_POSTS'			=> 'Total number of indexed posts',
 	'FULLTEXT_POSTGRES_VERSION_CHECK'		=> 'PostgreSQL version',
-- 
cgit v1.2.1


From 19d76f76dcd19e2bd44fbe7a384533bae4cb1538 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Sun, 1 Jul 2012 12:45:18 +0530
Subject: [feature/postgresql-fulltext-search] remove phrase search code

Unused Code for phrase search removed as pgsql doesnt support it. An added
message is displayed if user tries to perform exact phrase search.

PHPBB3-9730
---
 phpBB/language/en/search.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 5b6fdce0e7..2fbb5122ad 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -72,6 +72,7 @@ $lang = array_merge($lang, array(
 	'WORDS_IN_NO_POST'		=> 'No posts were found because the words <strong>%s</strong> are not contained in any post.',
 
 	'POST_CHARACTERS'		=> 'characters of posts',
+	'PHRASE_SEARCH_DISABLED'	=> 'Searching by exact phrase is not supported on this board.',
 
 	'RECENT_SEARCHES'		=> 'Recent searches',
 	'RESULT_DAYS'			=> 'Limit results to previous',
-- 
cgit v1.2.1


From b98be2f23543a25b74dc8442338d0db4fcc3403b Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Fri, 22 Jun 2012 15:16:13 +0530
Subject: [ticket/10943] displays searched query in search result

Search backend displays an additional normalized search query just above
the ignored words.

PHPBB3-10943
---
 phpBB/language/en/search.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 5b6fdce0e7..7bf8473579 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -81,6 +81,7 @@ $lang = array_merge($lang, array(
 
 	'SEARCHED_FOR'				=> 'Search term used',
 	'SEARCHED_TOPIC'			=> 'Searched topic',
+	'SEARCHED_QUERY'			=> 'Searched query',
 	'SEARCH_ALL_TERMS'			=> 'Search for all terms or use query as entered',
 	'SEARCH_ANY_TERMS'			=> 'Search for any terms',
 	'SEARCH_AUTHOR'				=> 'Search for author',
-- 
cgit v1.2.1


From 05452b9ec0dab4fecfbca05fd5598af224d784de Mon Sep 17 00:00:00 2001
From: Nathan <exreaction@phpbb.com>
Date: Tue, 3 Jul 2012 23:25:51 -0500
Subject: [ticket/8323] Do not allow sending of Private Messages to users who
 do not have permission to read private messages

PHPBB3-8323
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index e3971c75e2..8af828935b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -367,6 +367,7 @@ $lang = array_merge($lang, array(
 	'PM_SENTBOX'				=> 'Sent messages',
 	'PM_SUBJECT'				=> 'Message subject',
 	'PM_TO'						=> 'Send to',
+	'PM_USERS_REMOVED_NO_PERMISSION'	=> 'Some users couldn’t be added as they do not have permission to read private messages.',
 	'PM_USERS_REMOVED_NO_PM'	=> 'Some users couldn’t be added as they have disabled private message receipt.',
 	'POPUP_ON_PM'				=> 'Pop up window on new private message',
 	'POST_EDIT_PM'				=> 'Edit message',
-- 
cgit v1.2.1


From c38bb4254abec403add35378da67092c8513a3c4 Mon Sep 17 00:00:00 2001
From: Nathan <exreaction@phpbb.com>
Date: Tue, 3 Jul 2012 23:34:07 -0500
Subject: [ticket/8323] Do not allow sending of Private Messages to users who
 are banned

PHPBB3-8323
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 8af828935b..bc21b6b437 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -367,6 +367,7 @@ $lang = array_merge($lang, array(
 	'PM_SENTBOX'				=> 'Sent messages',
 	'PM_SUBJECT'				=> 'Message subject',
 	'PM_TO'						=> 'Send to',
+	'PM_USERS_REMOVED_BANNED'	=> 'Some users couldn’t be added as they are banned.',
 	'PM_USERS_REMOVED_NO_PERMISSION'	=> 'Some users couldn’t be added as they do not have permission to read private messages.',
 	'PM_USERS_REMOVED_NO_PM'	=> 'Some users couldn’t be added as they have disabled private message receipt.',
 	'POPUP_ON_PM'				=> 'Pop up window on new private message',
-- 
cgit v1.2.1


From b25efd744db56f7565453caccf26630404db07c7 Mon Sep 17 00:00:00 2001
From: Nathan <exreaction@phpbb.com>
Date: Tue, 10 Jul 2012 17:41:27 -0500
Subject: [ticket/8323] Only disable administrative deactivated accounts from
 receiving PMs

Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation)

PHPBB3-8323
---
 phpBB/language/en/ucp.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index bc21b6b437..8af828935b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -367,7 +367,6 @@ $lang = array_merge($lang, array(
 	'PM_SENTBOX'				=> 'Sent messages',
 	'PM_SUBJECT'				=> 'Message subject',
 	'PM_TO'						=> 'Send to',
-	'PM_USERS_REMOVED_BANNED'	=> 'Some users couldn’t be added as they are banned.',
 	'PM_USERS_REMOVED_NO_PERMISSION'	=> 'Some users couldn’t be added as they do not have permission to read private messages.',
 	'PM_USERS_REMOVED_NO_PM'	=> 'Some users couldn’t be added as they have disabled private message receipt.',
 	'POPUP_ON_PM'				=> 'Pop up window on new private message',
-- 
cgit v1.2.1


From a50b0faf4abfb1bba68e03d843c58f07f842cf12 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Fri, 4 May 2012 18:39:41 +0530
Subject: [feature/sphinx-fulltext-search] MOD by naderman installed in phpbb

PHPBB3-10946
---
 phpBB/language/en/mods/fulltext_sphinx.php | 65 ++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 phpBB/language/en/mods/fulltext_sphinx.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mods/fulltext_sphinx.php b/phpBB/language/en/mods/fulltext_sphinx.php
new file mode 100644
index 0000000000..e06328afc8
--- /dev/null
+++ b/phpBB/language/en/mods/fulltext_sphinx.php
@@ -0,0 +1,65 @@
+<?php
+/** 
+*
+* fulltext_sphinx [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
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'FULLTEXT_SPHINX_AUTOCONF'				=> 'Automatically configure Sphinx',
+	'FULLTEXT_SPHINX_AUTOCONF_EXPLAIN'		=> 'This is the easiest way to install Sphinx, just select the settings here and a config file will be written for you. This requires write permissions on the configuration folder.',
+	'FULLTEXT_SPHINX_AUTORUN'				=> 'Automatically run Sphinx',
+	'FULLTEXT_SPHINX_AUTORUN_EXPLAIN'		=> 'This is the easiest way to run Sphinx. Select the paths in this dialogue and the Sphinx daemon will be started and stopped as needed. You can also create an index from the ACP. If your PHP installation forbids the use of exec you can disable this and run Sphinx manually.',
+	'FULLTEXT_SPHINX_BIN_PATH'				=> 'Path to executables directory',
+	'FULLTEXT_SPHINX_BIN_PATH_EXPLAIN'		=> 'Skip if autorun is disabled. If this path could not be determined automatically you have to enter the path to the directory in which the sphinx executables <samp>indexer</samp> and <samp>searchd</samp> reside.',
+	'FULLTEXT_SPHINX_CONFIG_PATH'			=> 'Path to configuration directory',
+	'FULLTEXT_SPHINX_CONFIG_PATH_EXPLAIN'	=> 'Skip if autoconf is disabled. You should create this config directory outside the web accessable directories. It has to be writable by the user as which your webserver is running (often www-data or nobody).',
+	'FULLTEXT_SPHINX_CONFIGURE_FIRST'		=> 'Before you create an index you have to enable and configure sphinx under GENERAL -> SERVER CONFIGURATION -> Search settings.',
+	'FULLTEXT_SPHINX_CONFIGURE_BEFORE'		=> 'Configure the following settings BEFORE activating Sphinx',
+	'FULLTEXT_SPHINX_CONFIGURE_AFTER'		=> 'The following settings do not have to be configured before activating Sphinx',
+	'FULLTEXT_SPHINX_DATA_PATH'				=> 'Path to data directory',
+	'FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'	=> 'Skip if autorun is disabled. You should create this directory outside the web accessable directories. It has to be writable by the user as which your webserver is running (often www-data or nobody). It will be used to store the indexes and log files.',
+	'FULLTEXT_SPHINX_DELTA_POSTS'			=> 'Number of posts in frequently updated delta index',
+	'FULLTEXT_SPHINX_DIRECTORY_NOT_FOUND'	=> 'The directory <strong>%s</strong> does not exist. Please correct your path settings.',
+	'FULLTEXT_SPHINX_FILE_NOT_EXECUTABLE'	=> 'The file <strong>%s</strong> is not executable for the webserver.',
+	'FULLTEXT_SPHINX_FILE_NOT_FOUND'		=> 'The file <strong>%s</strong> does not exist. Please correct your path settings.',
+	'FULLTEXT_SPHINX_FILE_NOT_WRITABLE'	=> 'The file <strong>%s</strong> cannot be written by the webserver.',
+	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'	=> 'Indexer memory limit',
+	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'	=> 'This number should at all times be lower than the RAM available on your machine. If you experience periodic performance problems this might be due to the indexer consuming too many resources. It might help to lower the amount of memory available to the indexer.',
+	'FULLTEXT_SPHINX_LAST_SEARCHES'		=> 'Recent search queries',
+	'FULLTEXT_SPHINX_MAIN_POSTS'			=> 'Number of posts in main index',
+	'FULLTEXT_SPHINX_PORT'					=> 'Sphinx search deamon port',
+	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search deamon on localhost listens. Leave empty to use the default 3312',
+	'FULLTEXT_SPHINX_REQUIRES_EXEC'		=> 'The sphinx plugin for phpBB requires PHP’s <code>exec</code> function which is disabled on your system.',
+	'FULLTEXT_SPHINX_UNCONFIGURED'			=> 'Please set all necessary options in the "Fulltext Sphinx" section of the previous page before you try to activate the sphinx plugin.',
+	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx plugin for phpBB currently only supports MySQL',
+	'FULLTEXT_SPHINX_STOPWORDS_FILE'		=> 'Stopwords activated',
+	'FULLTEXT_SPHINX_STOPWORDS_FILE_EXPLAIN'	=> 'This setting only works with autoconf enabled. You can place a file called sphinx_stopwords.txt containing one word in each line in your config directory. If this file is present these words will be excluded from the indexing process.',
+));
+
+?>
\ No newline at end of file
-- 
cgit v1.2.1


From 8d76bc45ee19186f40dd3b459a9bd33e5e4c23d9 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 26 Jun 2012 02:35:36 +0530
Subject: [feature/sphinx-fulltext-search] minor fixes in formatting

Add a newline at the end of files. Update License information in package
docbloc.

PHPBB3-10946
---
 phpBB/language/en/mods/fulltext_sphinx.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mods/fulltext_sphinx.php b/phpBB/language/en/mods/fulltext_sphinx.php
index e06328afc8..f3fd68aa62 100644
--- a/phpBB/language/en/mods/fulltext_sphinx.php
+++ b/phpBB/language/en/mods/fulltext_sphinx.php
@@ -62,4 +62,4 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_STOPWORDS_FILE_EXPLAIN'	=> 'This setting only works with autoconf enabled. You can place a file called sphinx_stopwords.txt containing one word in each line in your config directory. If this file is present these words will be excluded from the indexing process.',
 ));
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.1


From f609555b1ae335b5ea996bf26ee2846058e5256a Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Wed, 27 Jun 2012 00:28:31 +0530
Subject: [feature/sphinx-fulltext-search] integrate sphinx language keys with
 core

Language keys removed from mods folder and added to
language/en/acp/search.php

PHPBB3-10946
---
 phpBB/language/en/acp/search.php           | 30 ++++++++++++++
 phpBB/language/en/mods/fulltext_sphinx.php | 65 ------------------------------
 2 files changed, 30 insertions(+), 65 deletions(-)
 delete mode 100644 phpBB/language/en/mods/fulltext_sphinx.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index cd319c66a9..3fa7f34c64 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -69,6 +69,36 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'			=> 'Words with at least this many characters will be included in the query to the database.',
 	'FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'			=> 'Words with no more than this many characters will be included in the query to the database.',
 
+	'FULLTEXT_SPHINX_AUTOCONF'				=> 'Automatically configure Sphinx',
+	'FULLTEXT_SPHINX_AUTOCONF_EXPLAIN'		=> 'This is the easiest way to install Sphinx, just select the settings here and a config file will be written for you. This requires write permissions on the configuration folder.',
+	'FULLTEXT_SPHINX_AUTORUN'				=> 'Automatically run Sphinx',
+	'FULLTEXT_SPHINX_AUTORUN_EXPLAIN'		=> 'This is the easiest way to run Sphinx. Select the paths in this dialogue and the Sphinx daemon will be started and stopped as needed. You can also create an index from the ACP. If your PHP installation forbids the use of exec you can disable this and run Sphinx manually.',
+	'FULLTEXT_SPHINX_BIN_PATH'				=> 'Path to executables directory',
+	'FULLTEXT_SPHINX_BIN_PATH_EXPLAIN'		=> 'Skip if autorun is disabled. If this path could not be determined automatically you have to enter the path to the directory in which the sphinx executables <samp>indexer</samp> and <samp>searchd</samp> reside.',
+	'FULLTEXT_SPHINX_CONFIG_PATH'			=> 'Path to configuration directory',
+	'FULLTEXT_SPHINX_CONFIG_PATH_EXPLAIN'	=> 'Skip if autoconf is disabled. You should create this config directory outside the web accessable directories. It has to be writable by the user as which your webserver is running (often www-data or nobody).',
+	'FULLTEXT_SPHINX_CONFIGURE_FIRST'		=> 'Before you create an index you have to enable and configure sphinx under GENERAL -> SERVER CONFIGURATION -> Search settings.',
+	'FULLTEXT_SPHINX_CONFIGURE_BEFORE'		=> 'Configure the following settings BEFORE activating Sphinx',
+	'FULLTEXT_SPHINX_CONFIGURE_AFTER'		=> 'The following settings do not have to be configured before activating Sphinx',
+	'FULLTEXT_SPHINX_DATA_PATH'				=> 'Path to data directory',
+	'FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'		=> 'Skip if autorun is disabled. You should create this directory outside the web accessable directories. It has to be writable by the user as which your webserver is running (often www-data or nobody). It will be used to store the indexes and log files.',
+	'FULLTEXT_SPHINX_DELTA_POSTS'			=> 'Number of posts in frequently updated delta index',
+	'FULLTEXT_SPHINX_DIRECTORY_NOT_FOUND'	=> 'The directory <strong>%s</strong> does not exist. Please correct your path settings.',
+	'FULLTEXT_SPHINX_FILE_NOT_EXECUTABLE'	=> 'The file <strong>%s</strong> is not executable for the webserver.',
+	'FULLTEXT_SPHINX_FILE_NOT_FOUND'		=> 'The file <strong>%s</strong> does not exist. Please correct your path settings.',
+	'FULLTEXT_SPHINX_FILE_NOT_WRITABLE'		=> 'The file <strong>%s</strong> cannot be written by the webserver.',
+	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'		=> 'Indexer memory limit',
+	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'	=> 'This number should at all times be lower than the RAM available on your machine. If you experience periodic performance problems this might be due to the indexer consuming too many resources. It might help to lower the amount of memory available to the indexer.',
+	'FULLTEXT_SPHINX_LAST_SEARCHES'			=> 'Recent search queries',
+	'FULLTEXT_SPHINX_MAIN_POSTS'			=> 'Number of posts in main index',
+	'FULLTEXT_SPHINX_PORT'					=> 'Sphinx search deamon port',
+	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search deamon on localhost listens. Leave empty to use the default 3312',
+	'FULLTEXT_SPHINX_REQUIRES_EXEC'			=> 'The sphinx plugin for phpBB requires PHP’s <code>exec</code> function which is disabled on your system.',
+	'FULLTEXT_SPHINX_UNCONFIGURED'			=> 'Please set all necessary options in the "Fulltext Sphinx" section of the previous page before you try to activate the sphinx plugin.',
+	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx plugin for phpBB currently only supports MySQL',
+	'FULLTEXT_SPHINX_STOPWORDS_FILE'		=> 'Stopwords activated',
+	'FULLTEXT_SPHINX_STOPWORDS_FILE_EXPLAIN'	=> 'This setting only works with autoconf enabled. You can place a file called sphinx_stopwords.txt containing one word in each line in your config directory. If this file is present these words will be excluded from the indexing process.',
+
 	'GENERAL_SEARCH_SETTINGS'				=> 'General search settings',
 	'GO_TO_SEARCH_INDEX'					=> 'Go to search index page',
 
diff --git a/phpBB/language/en/mods/fulltext_sphinx.php b/phpBB/language/en/mods/fulltext_sphinx.php
deleted file mode 100644
index f3fd68aa62..0000000000
--- a/phpBB/language/en/mods/fulltext_sphinx.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/** 
-*
-* fulltext_sphinx [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
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// 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_merge($lang, array(
-	'FULLTEXT_SPHINX_AUTOCONF'				=> 'Automatically configure Sphinx',
-	'FULLTEXT_SPHINX_AUTOCONF_EXPLAIN'		=> 'This is the easiest way to install Sphinx, just select the settings here and a config file will be written for you. This requires write permissions on the configuration folder.',
-	'FULLTEXT_SPHINX_AUTORUN'				=> 'Automatically run Sphinx',
-	'FULLTEXT_SPHINX_AUTORUN_EXPLAIN'		=> 'This is the easiest way to run Sphinx. Select the paths in this dialogue and the Sphinx daemon will be started and stopped as needed. You can also create an index from the ACP. If your PHP installation forbids the use of exec you can disable this and run Sphinx manually.',
-	'FULLTEXT_SPHINX_BIN_PATH'				=> 'Path to executables directory',
-	'FULLTEXT_SPHINX_BIN_PATH_EXPLAIN'		=> 'Skip if autorun is disabled. If this path could not be determined automatically you have to enter the path to the directory in which the sphinx executables <samp>indexer</samp> and <samp>searchd</samp> reside.',
-	'FULLTEXT_SPHINX_CONFIG_PATH'			=> 'Path to configuration directory',
-	'FULLTEXT_SPHINX_CONFIG_PATH_EXPLAIN'	=> 'Skip if autoconf is disabled. You should create this config directory outside the web accessable directories. It has to be writable by the user as which your webserver is running (often www-data or nobody).',
-	'FULLTEXT_SPHINX_CONFIGURE_FIRST'		=> 'Before you create an index you have to enable and configure sphinx under GENERAL -> SERVER CONFIGURATION -> Search settings.',
-	'FULLTEXT_SPHINX_CONFIGURE_BEFORE'		=> 'Configure the following settings BEFORE activating Sphinx',
-	'FULLTEXT_SPHINX_CONFIGURE_AFTER'		=> 'The following settings do not have to be configured before activating Sphinx',
-	'FULLTEXT_SPHINX_DATA_PATH'				=> 'Path to data directory',
-	'FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'	=> 'Skip if autorun is disabled. You should create this directory outside the web accessable directories. It has to be writable by the user as which your webserver is running (often www-data or nobody). It will be used to store the indexes and log files.',
-	'FULLTEXT_SPHINX_DELTA_POSTS'			=> 'Number of posts in frequently updated delta index',
-	'FULLTEXT_SPHINX_DIRECTORY_NOT_FOUND'	=> 'The directory <strong>%s</strong> does not exist. Please correct your path settings.',
-	'FULLTEXT_SPHINX_FILE_NOT_EXECUTABLE'	=> 'The file <strong>%s</strong> is not executable for the webserver.',
-	'FULLTEXT_SPHINX_FILE_NOT_FOUND'		=> 'The file <strong>%s</strong> does not exist. Please correct your path settings.',
-	'FULLTEXT_SPHINX_FILE_NOT_WRITABLE'	=> 'The file <strong>%s</strong> cannot be written by the webserver.',
-	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'	=> 'Indexer memory limit',
-	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'	=> 'This number should at all times be lower than the RAM available on your machine. If you experience periodic performance problems this might be due to the indexer consuming too many resources. It might help to lower the amount of memory available to the indexer.',
-	'FULLTEXT_SPHINX_LAST_SEARCHES'		=> 'Recent search queries',
-	'FULLTEXT_SPHINX_MAIN_POSTS'			=> 'Number of posts in main index',
-	'FULLTEXT_SPHINX_PORT'					=> 'Sphinx search deamon port',
-	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search deamon on localhost listens. Leave empty to use the default 3312',
-	'FULLTEXT_SPHINX_REQUIRES_EXEC'		=> 'The sphinx plugin for phpBB requires PHP’s <code>exec</code> function which is disabled on your system.',
-	'FULLTEXT_SPHINX_UNCONFIGURED'			=> 'Please set all necessary options in the "Fulltext Sphinx" section of the previous page before you try to activate the sphinx plugin.',
-	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx plugin for phpBB currently only supports MySQL',
-	'FULLTEXT_SPHINX_STOPWORDS_FILE'		=> 'Stopwords activated',
-	'FULLTEXT_SPHINX_STOPWORDS_FILE_EXPLAIN'	=> 'This setting only works with autoconf enabled. You can place a file called sphinx_stopwords.txt containing one word in each line in your config directory. If this file is present these words will be excluded from the indexing process.',
-));
-
-?>
-- 
cgit v1.2.1


From 81627e2888ac0987c941775276a720c2aa7fe142 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 18 Jul 2012 18:59:25 +0200
Subject: [feature/new-tz-handling] Remove additional marking of selected items

PHPBB3-9558
---
 phpBB/language/en/ucp.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 14cc3fde27..512a4a5c24 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -431,7 +431,6 @@ $lang = array_merge($lang, array(
 	'TIMEZONE'					=> 'Timezone',
 	'TIMEZONE_DATE_SUGGESTION'	=> 'Suggestion: %s',
 	'TIMEZONE_INVALID'			=> 'The timezone you selected is invalid.',
-	'TIMEZONE_SELECTED'			=> '(currently selected)',
 	'TO'						=> 'To',
 	'TOO_MANY_RECIPIENTS'		=> 'You tried to send a private message to too many recipients.',
 	'TOO_MANY_REGISTERS'		=> 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',
-- 
cgit v1.2.1


From 537a16220ea9561332a17004eec79f2854c68df4 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 10 Jul 2012 05:33:17 +0530
Subject: [feature/sphinx-fulltext-search] remove recent search queries

remove recent search queries from the stats as they can't be retreived
and remove other language keys being used no more.

PHPBB3-10946
---
 phpBB/language/en/acp/search.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 3fa7f34c64..14701459eb 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -57,6 +57,7 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN'	=> 'Words with at least this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 	'FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'	=> 'Words with no more than this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 
+<<<<<<< HEAD
 	'FULLTEXT_POSTGRES_INCOMPATIBLE_DATABASE'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL.',
 	'FULLTEXT_POSTGRES_TS_NOT_USABLE'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL 8.3 and above.',
 	'FULLTEXT_POSTGRES_TOTAL_POSTS'			=> 'Total number of indexed posts',
@@ -69,10 +70,6 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'			=> 'Words with at least this many characters will be included in the query to the database.',
 	'FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'			=> 'Words with no more than this many characters will be included in the query to the database.',
 
-	'FULLTEXT_SPHINX_AUTOCONF'				=> 'Automatically configure Sphinx',
-	'FULLTEXT_SPHINX_AUTOCONF_EXPLAIN'		=> 'This is the easiest way to install Sphinx, just select the settings here and a config file will be written for you. This requires write permissions on the configuration folder.',
-	'FULLTEXT_SPHINX_AUTORUN'				=> 'Automatically run Sphinx',
-	'FULLTEXT_SPHINX_AUTORUN_EXPLAIN'		=> 'This is the easiest way to run Sphinx. Select the paths in this dialogue and the Sphinx daemon will be started and stopped as needed. You can also create an index from the ACP. If your PHP installation forbids the use of exec you can disable this and run Sphinx manually.',
 	'FULLTEXT_SPHINX_BIN_PATH'				=> 'Path to executables directory',
 	'FULLTEXT_SPHINX_BIN_PATH_EXPLAIN'		=> 'Skip if autorun is disabled. If this path could not be determined automatically you have to enter the path to the directory in which the sphinx executables <samp>indexer</samp> and <samp>searchd</samp> reside.',
 	'FULLTEXT_SPHINX_CONFIG_PATH'			=> 'Path to configuration directory',
@@ -83,18 +80,11 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_DATA_PATH'				=> 'Path to data directory',
 	'FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'		=> 'Skip if autorun is disabled. You should create this directory outside the web accessable directories. It has to be writable by the user as which your webserver is running (often www-data or nobody). It will be used to store the indexes and log files.',
 	'FULLTEXT_SPHINX_DELTA_POSTS'			=> 'Number of posts in frequently updated delta index',
-	'FULLTEXT_SPHINX_DIRECTORY_NOT_FOUND'	=> 'The directory <strong>%s</strong> does not exist. Please correct your path settings.',
-	'FULLTEXT_SPHINX_FILE_NOT_EXECUTABLE'	=> 'The file <strong>%s</strong> is not executable for the webserver.',
-	'FULLTEXT_SPHINX_FILE_NOT_FOUND'		=> 'The file <strong>%s</strong> does not exist. Please correct your path settings.',
-	'FULLTEXT_SPHINX_FILE_NOT_WRITABLE'		=> 'The file <strong>%s</strong> cannot be written by the webserver.',
 	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'		=> 'Indexer memory limit',
 	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'	=> 'This number should at all times be lower than the RAM available on your machine. If you experience periodic performance problems this might be due to the indexer consuming too many resources. It might help to lower the amount of memory available to the indexer.',
-	'FULLTEXT_SPHINX_LAST_SEARCHES'			=> 'Recent search queries',
 	'FULLTEXT_SPHINX_MAIN_POSTS'			=> 'Number of posts in main index',
 	'FULLTEXT_SPHINX_PORT'					=> 'Sphinx search deamon port',
 	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search deamon on localhost listens. Leave empty to use the default 3312',
-	'FULLTEXT_SPHINX_REQUIRES_EXEC'			=> 'The sphinx plugin for phpBB requires PHP’s <code>exec</code> function which is disabled on your system.',
-	'FULLTEXT_SPHINX_UNCONFIGURED'			=> 'Please set all necessary options in the "Fulltext Sphinx" section of the previous page before you try to activate the sphinx plugin.',
 	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx plugin for phpBB currently only supports MySQL',
 	'FULLTEXT_SPHINX_STOPWORDS_FILE'		=> 'Stopwords activated',
 	'FULLTEXT_SPHINX_STOPWORDS_FILE_EXPLAIN'	=> 'This setting only works with autoconf enabled. You can place a file called sphinx_stopwords.txt containing one word in each line in your config directory. If this file is present these words will be excluded from the indexing process.',
-- 
cgit v1.2.1


From b16e70ae1d03587c7d7d7e106299a4e576491751 Mon Sep 17 00:00:00 2001
From: Dhruv Goel <dhruv.goel92@gmail.com>
Date: Tue, 10 Jul 2012 12:32:42 +0530
Subject: [feature/sphinx-fulltext-search] remove bin_path

fulltext_sphinx_bin_path from ACP as it is no longer required.

PHPBB3-10946
---
 phpBB/language/en/acp/search.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 14701459eb..9618bb90c5 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -57,7 +57,6 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN'	=> 'Words with at least this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 	'FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'	=> 'Words with no more than this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 
-<<<<<<< HEAD
 	'FULLTEXT_POSTGRES_INCOMPATIBLE_DATABASE'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL.',
 	'FULLTEXT_POSTGRES_TS_NOT_USABLE'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL 8.3 and above.',
 	'FULLTEXT_POSTGRES_TOTAL_POSTS'			=> 'Total number of indexed posts',
@@ -70,8 +69,6 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'			=> 'Words with at least this many characters will be included in the query to the database.',
 	'FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'			=> 'Words with no more than this many characters will be included in the query to the database.',
 
-	'FULLTEXT_SPHINX_BIN_PATH'				=> 'Path to executables directory',
-	'FULLTEXT_SPHINX_BIN_PATH_EXPLAIN'		=> 'Skip if autorun is disabled. If this path could not be determined automatically you have to enter the path to the directory in which the sphinx executables <samp>indexer</samp> and <samp>searchd</samp> reside.',
 	'FULLTEXT_SPHINX_CONFIG_PATH'			=> 'Path to configuration directory',
 	'FULLTEXT_SPHINX_CONFIG_PATH_EXPLAIN'	=> 'Skip if autoconf is disabled. You should create this config directory outside the web accessable directories. It has to be writable by the user as which your webserver is running (often www-data or nobody).',
 	'FULLTEXT_SPHINX_CONFIGURE_FIRST'		=> 'Before you create an index you have to enable and configure sphinx under GENERAL -> SERVER CONFIGURATION -> Search settings.',
-- 
cgit v1.2.1


From 4b40f0d3c6d14adc2b20b866cbeb42586cf8d874 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Wed, 11 Jul 2012 16:25:19 +0530
Subject: [feature/sphinx-fulltext-search] display config file in ACP

sphinx config file is generated and displayed in the ACP for user to use
it to start sphinx search daemon.

PHPBB3-10946
---
 phpBB/language/en/acp/search.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 9618bb90c5..778f9ddec5 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -85,6 +85,9 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx plugin for phpBB currently only supports MySQL',
 	'FULLTEXT_SPHINX_STOPWORDS_FILE'		=> 'Stopwords activated',
 	'FULLTEXT_SPHINX_STOPWORDS_FILE_EXPLAIN'	=> 'This setting only works with autoconf enabled. You can place a file called sphinx_stopwords.txt containing one word in each line in your config directory. If this file is present these words will be excluded from the indexing process.',
+	'FULLTEXT_SPHINX_CONFIG_FILE'			=> 'Sphinx config file',
+	'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'	=> 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon.',
+	'FULLTEXT_SPHINX_NO_CONFIG_DATA'		=> 'The sphinx data and config directory paths are not defined. Please define them to generate the config file.',
 
 	'GENERAL_SEARCH_SETTINGS'				=> 'General search settings',
 	'GO_TO_SEARCH_INDEX'					=> 'Go to search index page',
-- 
cgit v1.2.1


From f40da411c389cb7718d31f1ee20f8487f25969f0 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Wed, 11 Jul 2012 17:46:58 +0530
Subject: [feature/sphinx-fulltext-search] modify language keys

Modify language keys according to what the config setting actually does.
Remove references to autoconf.

PHPBB3-10946
---
 phpBB/language/en/acp/search.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 778f9ddec5..970d9cd41b 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -70,12 +70,10 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'			=> 'Words with no more than this many characters will be included in the query to the database.',
 
 	'FULLTEXT_SPHINX_CONFIG_PATH'			=> 'Path to configuration directory',
-	'FULLTEXT_SPHINX_CONFIG_PATH_EXPLAIN'	=> 'Skip if autoconf is disabled. You should create this config directory outside the web accessable directories. It has to be writable by the user as which your webserver is running (often www-data or nobody).',
-	'FULLTEXT_SPHINX_CONFIGURE_FIRST'		=> 'Before you create an index you have to enable and configure sphinx under GENERAL -> SERVER CONFIGURATION -> Search settings.',
-	'FULLTEXT_SPHINX_CONFIGURE_BEFORE'		=> 'Configure the following settings BEFORE activating Sphinx',
-	'FULLTEXT_SPHINX_CONFIGURE_AFTER'		=> 'The following settings do not have to be configured before activating Sphinx',
+	'FULLTEXT_SPHINX_CONFIG_PATH_EXPLAIN'	=> 'You should put the sphinx.conf file in this directory. This config directory should be outside the web accessable directories.',
+	'FULLTEXT_SPHINX_CONFIGURE'				=> 'Configure the following settings to generate sphinx config file',
 	'FULLTEXT_SPHINX_DATA_PATH'				=> 'Path to data directory',
-	'FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'		=> 'Skip if autorun is disabled. You should create this directory outside the web accessable directories. It has to be writable by the user as which your webserver is running (often www-data or nobody). It will be used to store the indexes and log files.',
+	'FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'		=> 'It will be used to store the indexes and log files. You should create this directory outside the web accessable directories.',
 	'FULLTEXT_SPHINX_DELTA_POSTS'			=> 'Number of posts in frequently updated delta index',
 	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'		=> 'Indexer memory limit',
 	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'	=> 'This number should at all times be lower than the RAM available on your machine. If you experience periodic performance problems this might be due to the indexer consuming too many resources. It might help to lower the amount of memory available to the indexer.',
@@ -84,7 +82,7 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search deamon on localhost listens. Leave empty to use the default 3312',
 	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx plugin for phpBB currently only supports MySQL',
 	'FULLTEXT_SPHINX_STOPWORDS_FILE'		=> 'Stopwords activated',
-	'FULLTEXT_SPHINX_STOPWORDS_FILE_EXPLAIN'	=> 'This setting only works with autoconf enabled. You can place a file called sphinx_stopwords.txt containing one word in each line in your config directory. If this file is present these words will be excluded from the indexing process.',
+	'FULLTEXT_SPHINX_STOPWORDS_FILE_EXPLAIN'	=> 'You can place a file called sphinx_stopwords.txt containing one word in each line in your config directory. If this file is present these words will be excluded from the indexing process.',
 	'FULLTEXT_SPHINX_CONFIG_FILE'			=> 'Sphinx config file',
 	'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'	=> 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon.',
 	'FULLTEXT_SPHINX_NO_CONFIG_DATA'		=> 'The sphinx data and config directory paths are not defined. Please define them to generate the config file.',
-- 
cgit v1.2.1


From 609ce3ae8fb55e717ff188d2ec9c10c6ae252b7a Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Thu, 12 Jul 2012 17:48:17 +0530
Subject: [feature/sphinx-fulltext-search] add pgsql functionality

PHPBB3-10946
---
 phpBB/language/en/acp/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 970d9cd41b..4aa9c89cde 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -80,7 +80,7 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_MAIN_POSTS'			=> 'Number of posts in main index',
 	'FULLTEXT_SPHINX_PORT'					=> 'Sphinx search deamon port',
 	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search deamon on localhost listens. Leave empty to use the default 3312',
-	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx plugin for phpBB currently only supports MySQL',
+	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx search for phpBB supports MySQL and PostgreSQL only.',
 	'FULLTEXT_SPHINX_STOPWORDS_FILE'		=> 'Stopwords activated',
 	'FULLTEXT_SPHINX_STOPWORDS_FILE_EXPLAIN'	=> 'You can place a file called sphinx_stopwords.txt containing one word in each line in your config directory. If this file is present these words will be excluded from the indexing process.',
 	'FULLTEXT_SPHINX_CONFIG_FILE'			=> 'Sphinx config file',
-- 
cgit v1.2.1


From 656d2c34e0ca1424f07bb0ec2ed7b8489becbd6c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 21 Jul 2012 15:18:16 +0200
Subject: [ticket/11002] Use translating option to rename the Etc/GMT options

They have the invers offset of their name. So GMT+2 has the offset -7200.
To avoid additional confusion, we simply overwrite their name.

PHPBB3-11002
---
 phpBB/language/en/common.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index d0afb846b4..ab66f38124 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -836,6 +836,35 @@ $lang = array_merge($lang, array(
 		'Dec'		=> 'Dec',
 	),
 
+	// Timezones can be translated. We use this for the Etc/GMT timezones here,
+	// because they are named invers to their offset.
+	'timezones'		=> array(
+		'Etc/GMT-12'	=> 'GMT+12',
+		'Etc/GMT-11'	=> 'GMT+11',
+		'Etc/GMT-10'	=> 'GMT+10',
+		'Etc/GMT-9'		=> 'GMT+9',
+		'Etc/GMT-8'		=> 'GMT+8',
+		'Etc/GMT-7'		=> 'GMT+7',
+		'Etc/GMT-6'		=> 'GMT+6',
+		'Etc/GMT-5'		=> 'GMT+5',
+		'Etc/GMT-4'		=> 'GMT+4',
+		'Etc/GMT-3'		=> 'GMT+3',
+		'Etc/GMT-2'		=> 'GMT+2',
+		'Etc/GMT-1'		=> 'GMT+1',
+		'Etc/GMT+1'		=> 'GMT-1',
+		'Etc/GMT+2'		=> 'GMT-2',
+		'Etc/GMT+3'		=> 'GMT-3',
+		'Etc/GMT+4'		=> 'GMT-4',
+		'Etc/GMT+5'		=> 'GMT-5',
+		'Etc/GMT+6'		=> 'GMT-6',
+		'Etc/GMT+7'		=> 'GMT-7',
+		'Etc/GMT+8'		=> 'GMT-8',
+		'Etc/GMT+9'		=> 'GMT-9',
+		'Etc/GMT+10'	=> 'GMT-10',
+		'Etc/GMT+11'	=> 'GMT-11',
+		'Etc/GMT+12'	=> 'GMT-12',
+	),
+
 	// The value is only an example and will get replaced by the current time on view
 	'dateformats'	=> array(
 		'd M Y, H:i'			=> '01 Jan 2007, 13:37',
-- 
cgit v1.2.1


From 1f77b95fe71e727238212ea4632220ae9cab99d7 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 22 Jul 2012 01:49:30 +0530
Subject: [feature/sphinx-fulltext-search] fix language keys' typo

PHPBB3-10946
---
 phpBB/language/en/acp/search.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 4aa9c89cde..37c403f43d 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -69,8 +69,8 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'			=> 'Words with at least this many characters will be included in the query to the database.',
 	'FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'			=> 'Words with no more than this many characters will be included in the query to the database.',
 
-	'FULLTEXT_SPHINX_CONFIG_PATH'			=> 'Path to configuration directory',
-	'FULLTEXT_SPHINX_CONFIG_PATH_EXPLAIN'	=> 'You should put the sphinx.conf file in this directory. This config directory should be outside the web accessable directories.',
+	'FULLTEXT_SPHINX_CONFIG_PATH'			=> 'Path to config directory',
+	'FULLTEXT_SPHINX_CONFIG_PATH_EXPLAIN'	=> 'You should put the sphinx.conf file in this directory. This config directory should be outside the web accessible directories.',
 	'FULLTEXT_SPHINX_CONFIGURE'				=> 'Configure the following settings to generate sphinx config file',
 	'FULLTEXT_SPHINX_DATA_PATH'				=> 'Path to data directory',
 	'FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'		=> 'It will be used to store the indexes and log files. You should create this directory outside the web accessable directories.',
@@ -78,8 +78,8 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'		=> 'Indexer memory limit',
 	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'	=> 'This number should at all times be lower than the RAM available on your machine. If you experience periodic performance problems this might be due to the indexer consuming too many resources. It might help to lower the amount of memory available to the indexer.',
 	'FULLTEXT_SPHINX_MAIN_POSTS'			=> 'Number of posts in main index',
-	'FULLTEXT_SPHINX_PORT'					=> 'Sphinx search deamon port',
-	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search deamon on localhost listens. Leave empty to use the default 3312',
+	'FULLTEXT_SPHINX_PORT'					=> 'Sphinx search daemon port',
+	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search daemon (searchd) listens. Leave empty to use the default 3312',
 	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx search for phpBB supports MySQL and PostgreSQL only.',
 	'FULLTEXT_SPHINX_STOPWORDS_FILE'		=> 'Stopwords activated',
 	'FULLTEXT_SPHINX_STOPWORDS_FILE_EXPLAIN'	=> 'You can place a file called sphinx_stopwords.txt containing one word in each line in your config directory. If this file is present these words will be excluded from the indexing process.',
-- 
cgit v1.2.1


From 161e469b5a67b2911089ec0dfdb70bef355ed07e Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 22 Jul 2012 02:50:53 +0530
Subject: [feature/sphinx-fulltext-search] makes sql host configurable

The SQL server host which sphinx connects to index the posts is now
configurable via ACP.

PHPBB3-10946
---
 phpBB/language/en/acp/search.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 37c403f43d..99fbbac07e 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -75,6 +75,8 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_DATA_PATH'				=> 'Path to data directory',
 	'FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'		=> 'It will be used to store the indexes and log files. You should create this directory outside the web accessable directories.',
 	'FULLTEXT_SPHINX_DELTA_POSTS'			=> 'Number of posts in frequently updated delta index',
+	'FULLTEXT_SPHINX_HOST'					=> 'SQL server host',
+	'FULLTEXT_SPHINX_HOST_EXPLAIN'			=> 'SQL server host, which the sphinx search daemon (searchd) connects to. Leave empty to use the default SQL server host',
 	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'		=> 'Indexer memory limit',
 	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'	=> 'This number should at all times be lower than the RAM available on your machine. If you experience periodic performance problems this might be due to the indexer consuming too many resources. It might help to lower the amount of memory available to the indexer.',
 	'FULLTEXT_SPHINX_MAIN_POSTS'			=> 'Number of posts in main index',
-- 
cgit v1.2.1


From e40758db84a23bc7a2c5324dbedcd7f0911abeea Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 22 Jul 2012 03:16:03 +0530
Subject: [feature/sphinx-fulltext-search] remove stopwords and config path

Remove stopwords and config_path options from ACP.

PHPBB3-10946
---
 phpBB/language/en/acp/search.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 99fbbac07e..6d9201fb11 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -69,8 +69,6 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'			=> 'Words with at least this many characters will be included in the query to the database.',
 	'FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'			=> 'Words with no more than this many characters will be included in the query to the database.',
 
-	'FULLTEXT_SPHINX_CONFIG_PATH'			=> 'Path to config directory',
-	'FULLTEXT_SPHINX_CONFIG_PATH_EXPLAIN'	=> 'You should put the sphinx.conf file in this directory. This config directory should be outside the web accessible directories.',
 	'FULLTEXT_SPHINX_CONFIGURE'				=> 'Configure the following settings to generate sphinx config file',
 	'FULLTEXT_SPHINX_DATA_PATH'				=> 'Path to data directory',
 	'FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'		=> 'It will be used to store the indexes and log files. You should create this directory outside the web accessable directories.',
@@ -83,8 +81,6 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_PORT'					=> 'Sphinx search daemon port',
 	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search daemon (searchd) listens. Leave empty to use the default 3312',
 	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx search for phpBB supports MySQL and PostgreSQL only.',
-	'FULLTEXT_SPHINX_STOPWORDS_FILE'		=> 'Stopwords activated',
-	'FULLTEXT_SPHINX_STOPWORDS_FILE_EXPLAIN'	=> 'You can place a file called sphinx_stopwords.txt containing one word in each line in your config directory. If this file is present these words will be excluded from the indexing process.',
 	'FULLTEXT_SPHINX_CONFIG_FILE'			=> 'Sphinx config file',
 	'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'	=> 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon.',
 	'FULLTEXT_SPHINX_NO_CONFIG_DATA'		=> 'The sphinx data and config directory paths are not defined. Please define them to generate the config file.',
-- 
cgit v1.2.1


From 39bac86f7db881a1035bebad56507145103218d5 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 22 Jul 2012 03:43:50 +0530
Subject: [feature/sphinx-fulltext-search] improve port option

Use listen instead of deprecated port value in sphinx config file.
sqlhost uses default $dbhost.

PHPBB3-10946
---
 phpBB/language/en/acp/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 6d9201fb11..394d408fdb 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -79,7 +79,7 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'	=> 'This number should at all times be lower than the RAM available on your machine. If you experience periodic performance problems this might be due to the indexer consuming too many resources. It might help to lower the amount of memory available to the indexer.',
 	'FULLTEXT_SPHINX_MAIN_POSTS'			=> 'Number of posts in main index',
 	'FULLTEXT_SPHINX_PORT'					=> 'Sphinx search daemon port',
-	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search daemon (searchd) listens. Leave empty to use the default 3312',
+	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search daemon (searchd) listens. Leave empty to use the default Sphinx API port 3312 ',
 	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx search for phpBB supports MySQL and PostgreSQL only.',
 	'FULLTEXT_SPHINX_CONFIG_FILE'			=> 'Sphinx config file',
 	'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'	=> 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon.',
-- 
cgit v1.2.1


From 67665f59577092badf7eb0b5585e5ae39c52c8da Mon Sep 17 00:00:00 2001
From: Nathan <exreaction@phpbb.com>
Date: Sat, 14 Jul 2012 18:12:57 -0500
Subject: [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate

PHPBB3-10990
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index d0afb846b4..f3dba1cba3 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -134,7 +134,7 @@ $lang = array_merge($lang, array(
 	'COLLAPSE_VIEW'			=> 'Collapse view',
 	'CLOSE_WINDOW'			=> 'Close window',
 	'COLOUR_SWATCH'			=> 'Colour swatch',
-	'COMMA_SEPARATOR'		=> ', ',	// Used in pagination of ACP & prosilver, use localised comma if appropriate, eg: Ideographic or Arabic
+	'COMMA_SEPARATOR'		=> ', ',	// Comma used to join lists into a single string, use localised comma if appropriate, eg: Ideographic or Arabic
 	'CONFIRM'				=> 'Confirm',
 	'CONFIRM_CODE'			=> 'Confirmation code',
 	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as it appears. All letters are case insensitive.',
-- 
cgit v1.2.1


From a5dd64195a3a88db3fec38ac74dfb5d118ab5622 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 22 Jul 2012 22:26:38 -0500
Subject: [ticket/11021] Add the option to specify a Site home URL and text

PHPBB3-11021
---
 phpBB/language/en/acp/board.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 0754884473..6b043b887d 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -49,6 +49,10 @@ $lang = array_merge($lang, array(
 	'OVERRIDE_STYLE'				=> 'Override user style',
 	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
 	'SITE_DESC'						=> 'Site description',
+	'SITE_HOME_TEXT'				=> 'Site home text',
+	'SITE_HOME_TEXT_EXPLAIN'		=> 'Specify a Site Home Text to use your own instead of the default text in the breadcrumbs ’Home.’',
+	'SITE_HOME_URL'					=> 'Site home URL',
+	'SITE_HOME_URL_EXPLAIN'			=> 'If you specify a Site Home URL, a link to this page will be added to your board’s breadcrumbs and the site logo will also be linked to this address.',
 	'SITE_NAME'						=> 'Site name',
 	'SYSTEM_TIMEZONE'				=> 'Guest timezone',
 	'SYSTEM_TIMEZONE_EXPLAIN'			=> 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.',
-- 
cgit v1.2.1


From 9f2faaa8f1799cf794388604dbf7946488be2376 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 22 Jul 2012 04:09:59 +0530
Subject: [feature/sphinx-fulltext-search] add trailing slash in language

PHPBB3-10946
---
 phpBB/language/en/acp/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 394d408fdb..c52448743c 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -71,7 +71,7 @@ $lang = array_merge($lang, array(
 
 	'FULLTEXT_SPHINX_CONFIGURE'				=> 'Configure the following settings to generate sphinx config file',
 	'FULLTEXT_SPHINX_DATA_PATH'				=> 'Path to data directory',
-	'FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'		=> 'It will be used to store the indexes and log files. You should create this directory outside the web accessable directories.',
+	'FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'		=> 'It will be used to store the indexes and log files. You should create this directory outside the web accessible directories. (should have a trailing slash)',
 	'FULLTEXT_SPHINX_DELTA_POSTS'			=> 'Number of posts in frequently updated delta index',
 	'FULLTEXT_SPHINX_HOST'					=> 'SQL server host',
 	'FULLTEXT_SPHINX_HOST_EXPLAIN'			=> 'SQL server host, which the sphinx search daemon (searchd) connects to. Leave empty to use the default SQL server host',
-- 
cgit v1.2.1


From 3f4afedad34e8bc9a25d0636dee0cf182dd8a5eb Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Fri, 27 Jul 2012 02:40:05 +0530
Subject: [feature/sphinx-fulltext-search] fix language of host config

PHPBB3-10946
---
 phpBB/language/en/acp/search.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index c52448743c..038e77c190 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -73,13 +73,13 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_DATA_PATH'				=> 'Path to data directory',
 	'FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'		=> 'It will be used to store the indexes and log files. You should create this directory outside the web accessible directories. (should have a trailing slash)',
 	'FULLTEXT_SPHINX_DELTA_POSTS'			=> 'Number of posts in frequently updated delta index',
-	'FULLTEXT_SPHINX_HOST'					=> 'SQL server host',
-	'FULLTEXT_SPHINX_HOST_EXPLAIN'			=> 'SQL server host, which the sphinx search daemon (searchd) connects to. Leave empty to use the default SQL server host',
+	'FULLTEXT_SPHINX_HOST'					=> 'Sphinx search daemon host',
+	'FULLTEXT_SPHINX_HOST_EXPLAIN'			=> 'Host on which the sphinx search daemon (searchd) listens. Leave empty to use the default localhost',
 	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'		=> 'Indexer memory limit',
 	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'	=> 'This number should at all times be lower than the RAM available on your machine. If you experience periodic performance problems this might be due to the indexer consuming too many resources. It might help to lower the amount of memory available to the indexer.',
 	'FULLTEXT_SPHINX_MAIN_POSTS'			=> 'Number of posts in main index',
 	'FULLTEXT_SPHINX_PORT'					=> 'Sphinx search daemon port',
-	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search daemon (searchd) listens. Leave empty to use the default Sphinx API port 3312 ',
+	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search daemon (searchd) listens. Leave empty to use the default Sphinx API port 3312',
 	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx search for phpBB supports MySQL and PostgreSQL only.',
 	'FULLTEXT_SPHINX_CONFIG_FILE'			=> 'Sphinx config file',
 	'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'	=> 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon.',
-- 
cgit v1.2.1


From 654798922574ef086d618b50a8a8d16eceaa5320 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Fri, 27 Jul 2012 02:48:25 +0530
Subject: [feature/sphinx-fulltext-search] use 9312 as default port

Uses 9312 instead of 3312 as default port for searchd to listen on
according to latest sphinx documentation. Use filename sphinxapi.php
instead of old one.

PHPBB3-10946
---
 phpBB/language/en/acp/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 038e77c190..9f947dc816 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -79,7 +79,7 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'	=> 'This number should at all times be lower than the RAM available on your machine. If you experience periodic performance problems this might be due to the indexer consuming too many resources. It might help to lower the amount of memory available to the indexer.',
 	'FULLTEXT_SPHINX_MAIN_POSTS'			=> 'Number of posts in main index',
 	'FULLTEXT_SPHINX_PORT'					=> 'Sphinx search daemon port',
-	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search daemon (searchd) listens. Leave empty to use the default Sphinx API port 3312',
+	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search daemon (searchd) listens. Leave empty to use the default Sphinx API port 9312',
 	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx search for phpBB supports MySQL and PostgreSQL only.',
 	'FULLTEXT_SPHINX_CONFIG_FILE'			=> 'Sphinx config file',
 	'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'	=> 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon.',
-- 
cgit v1.2.1


From 6fbbb30a817a44fed1fb90ee35fca0d1caf83fcb Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Wed, 1 Aug 2012 22:18:12 +0530
Subject: [ticket/11032] add sphinx errors to error log

PHPBB3-11032
---
 phpBB/language/en/acp/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 5cebcc89d7..04df897dba 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -690,6 +690,7 @@ $lang = array_merge($lang, array(
 
 	'LOG_SEARCH_INDEX_CREATED'	=> '<strong>Created search index for</strong><br />» %s',
 	'LOG_SEARCH_INDEX_REMOVED'	=> '<strong>Removed search index for</strong><br />» %s',
+	'LOG_SPHINX_ERROR'			=> '<strong>Sphinx Error</strong><br />» %s',
 	'LOG_STYLE_ADD'				=> '<strong>Added new style</strong><br />» %s',
 	'LOG_STYLE_DELETE'			=> '<strong>Deleted style</strong><br />» %s',
 	'LOG_STYLE_EDIT_DETAILS'	=> '<strong>Edited style</strong><br />» %s',
-- 
cgit v1.2.1


From 5bffd9883de02807817838cd840a5293b6b908ac Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Thu, 2 Aug 2012 20:47:09 +0100
Subject: [feature/attach-dl] Added links to the templates

PHPBB3-11042
---
 phpBB/language/en/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 33d39c3e99..61749046c4 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -161,6 +161,8 @@ $lang = array_merge($lang, array(
 	'DISPLAY_MESSAGES'		=> 'Display messages from previous',
 	'DISPLAY_POSTS'			=> 'Display posts from previous',
 	'DISPLAY_TOPICS'		=> 'Display topics from previous',
+	'DOWNLOAD_ALL'			=> 'Download all',
+	'DOWNLOAD_ALL_ATTACH'	=> 'Download all attachments',
 	'DOWNLOADED'			=> 'Downloaded',
 	'DOWNLOADING_FILE'		=> 'Downloading file',
 	'DOWNLOAD_COUNTS'		=> array(
-- 
cgit v1.2.1


From 698b7999c4dd389c7d0e970f72e4a594fc99dd5a Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Fri, 10 Aug 2012 10:46:32 +0530
Subject: [ticket/11032] trigger error in case search fails

Admins are shown actual error while users are shown a search failed error
in case sphinx search fails.

PHPBB3-11032
---
 phpBB/language/en/search.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index d09b4303cd..5eea6044bc 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -105,6 +105,8 @@ $lang = array_merge($lang, array(
 	'SORT_FORUM'				=> 'Forum',
 	'SORT_POST_SUBJECT'			=> 'Post subject',
 	'SORT_TIME'					=> 'Post time',
+	'SPHINX_SEARCH_FAILED'		=> 'Search failed. %s',
+	'SPHINX_SEARCH_ERROR_LOG'	=> 'The error information has been logged.',
 
 	'TOO_FEW_AUTHOR_CHARS'	=> array(
 		1	=> 'You must specify at least %d character of the authors name.',
-- 
cgit v1.2.1


From d4f1e71d5eca1204880de3199245e0167ac7f3f6 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Wed, 15 Aug 2012 22:57:02 +0530
Subject: [ticket/11032] fix language of error displayed

Language of the error displayed is modified.

PHPBB3-11032
---
 phpBB/language/en/search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 5eea6044bc..71cbec4b41 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -105,8 +105,8 @@ $lang = array_merge($lang, array(
 	'SORT_FORUM'				=> 'Forum',
 	'SORT_POST_SUBJECT'			=> 'Post subject',
 	'SORT_TIME'					=> 'Post time',
-	'SPHINX_SEARCH_FAILED'		=> 'Search failed. %s',
-	'SPHINX_SEARCH_ERROR_LOG'	=> 'The error information has been logged.',
+	'SPHINX_SEARCH_FAILED'		=> 'Search failed: %s',
+	'SPHINX_SEARCH_FAILED_LOG'	=> 'Sorry, search could not be performed. More information about this failure has been logged in the error log.',
 
 	'TOO_FEW_AUTHOR_CHARS'	=> array(
 		1	=> 'You must specify at least %d character of the authors name.',
-- 
cgit v1.2.1


From e1a4aa3ea255874660d31e13c0b4cadc8993ef4f Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Mon, 20 Aug 2012 21:52:42 +0100
Subject: [feature/attach-dl] Removed the use of some abbreviations

PHPBB3-11042
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 61749046c4..e6022e3b79 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -162,7 +162,7 @@ $lang = array_merge($lang, array(
 	'DISPLAY_POSTS'			=> 'Display posts from previous',
 	'DISPLAY_TOPICS'		=> 'Display topics from previous',
 	'DOWNLOAD_ALL'			=> 'Download all',
-	'DOWNLOAD_ALL_ATTACH'	=> 'Download all attachments',
+	'DOWNLOAD_ALL_ATTACHMENTS'	=> 'Download all attachments',
 	'DOWNLOADED'			=> 'Downloaded',
 	'DOWNLOADING_FILE'		=> 'Downloading file',
 	'DOWNLOAD_COUNTS'		=> array(
-- 
cgit v1.2.1


From fb13ab83e476d2afbc7bb181f7ab90df98f996da Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Sun, 27 Jun 2010 14:22:36 -0500
Subject: [feature/soft-delete] Implement the ability to soft-delete and
 restore posts

The soft delete feature seems to work.  Tests are pending.  A real icon is pending.  Add the permissions and the interface to soft-delete posts.  Also able to restore posts via the MCP queue

PHPBB3-9657
---
 phpBB/language/en/acp/common.php            | 2 ++
 phpBB/language/en/acp/permissions_phpbb.php | 5 +++++
 phpBB/language/en/mcp.php                   | 2 ++
 phpBB/language/en/posting.php               | 2 ++
 phpBB/language/en/viewtopic.php             | 2 ++
 5 files changed, 13 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 04df897dba..91a35311bc 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -554,12 +554,14 @@ $lang = array_merge($lang, array(
 	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br />» %s',
 	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” with the following reason</strong><br />» %2$s',
 	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
+	'LOG_POST_RESTORED'         => '<strong>Restored post</strong><br />» %s',
 	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
 	'LOG_REPORT_DELETED'		=> '<strong>Deleted report</strong><br />» %s',
 	'LOG_SPLIT_DESTINATION'		=> '<strong>Moved split posts</strong><br />» to %s',
 	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br />» from %s',
 
 	'LOG_TOPIC_APPROVED'		=> '<strong>Approved topic</strong><br />» %s',
+	'LOG_TOPIC_RESTORED'        => '<strong>Restored topic</strong><br />» %s',
 	'LOG_TOPIC_DISAPPROVED'		=> '<strong>Disapproved topic “%1$s” with the following reason</strong><br />%2$s',
 	'LOG_TOPIC_RESYNC'			=> '<strong>Resynchronised topic counters</strong><br />» %s',
 	'LOG_TOPIC_TYPE_CHANGED'	=> '<strong>Changed topic type</strong><br />» %s',
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 17649693fa..0a089f9dc1 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -156,6 +156,8 @@ $lang = array_merge($lang, array(
 	'acl_f_flash'		=> array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'),
 
 	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'actions'),
+	'acl_f_softdelete'  => array('lang' => 'Can soft delete own posts', 'cat' => 'actions'),
+	'acl_f_restore'		=> array('lang' => 'Can restore own posts', 'cat' => 'actions'),
 	'acl_f_delete'		=> array('lang' => 'Can delete own posts', 'cat' => 'actions'),
 	'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
 	'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
@@ -177,12 +179,15 @@ $lang = array_merge($lang, array(
 	'acl_m_approve'		=> array('lang' => 'Can approve posts', 'cat' => 'post_actions'),
 	'acl_m_report'		=> array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
 	'acl_m_chgposter'	=> array('lang' => 'Can change post author', 'cat' => 'post_actions'),
+	'acl_m_softdelete'	=> array('lang' => 'Can soft delete posts', 'cat' => 'post_actions'),
+	'acl_m_restore'     => array('lang' => 'Can restore deleted posts', 'cat' => 'post_actions'),
 
 	'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
 	'acl_m_lock'	=> array('lang' => 'Can lock topics', 'cat' => 'topic_actions'),
 	'acl_m_split'	=> array('lang' => 'Can split topics', 'cat' => 'topic_actions'),
 	'acl_m_merge'	=> array('lang' => 'Can merge topics', 'cat' => 'topic_actions'),
 
+
 	'acl_m_info'	=> array('lang' => 'Can view post details', 'cat' => 'misc'),
 	'acl_m_warn'	=> array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
 	'acl_m_ban'		=> array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index eaa2d7e3a5..175fa72829 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -201,6 +201,8 @@ $lang = array_merge($lang, array(
 	'MCP_QUEUE_UNAPPROVED_POSTS_EXPLAIN'	=> 'This is a list of all posts which require approving before they will be visible to users.',
 	'MCP_QUEUE_UNAPPROVED_TOPICS'			=> 'Topics awaiting approval',
 	'MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN'	=> 'This is a list of all topics which require approving before they will be visible to users.',
+	'MCP_QUEUE_DELETED_POSTS'               => 'Deleted posts',
+	'MCP_QUEUE_DELETED_POSTS_EXPLAIN'       => 'This is a list of all posts which have been soft deleted.  You can restore or permanently delete the posts from this screen.',
 
 	'MCP_VIEW_USER'			=> 'View warnings for a specific user',
 
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 086bd6ffb0..c0edc068dd 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -209,6 +209,8 @@ $lang = array_merge($lang, array(
 	'SMILIES'					=> 'Smilies',
 	'SMILIES_ARE_OFF'			=> 'Smilies are <em>OFF</em>',
 	'SMILIES_ARE_ON'			=> 'Smilies are <em>ON</em>',
+	'SOFT_DELETE_POST'			=> 'Soft Delete',
+	'SOFT_DELETE_POST_EXPLAIN'  => 'Soft Deletion can be un-done',
 	'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement time limit',
 	'STICK_TOPIC_FOR'			=> 'Stick topic for',
 	'STICK_TOPIC_FOR_EXPLAIN'	=> 'Enter 0 or leave blank for a never ending Sticky/Announcement. Please note that this number is relative to the date of the post.',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 278c064fe7..ce66a5b8e2 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -89,6 +89,7 @@ $lang = array_merge($lang, array(
 	'POLL_ENDED_AT'			=> 'Poll ended at %s',
 	'POLL_RUN_TILL'			=> 'Poll runs till %s',
 	'POLL_VOTED_OPTION'		=> 'You voted for this option',
+	'POST_DELETED_RESTORE'  => 'This post has been deleted.  It can be restored.',
 	'PRINT_TOPIC'			=> 'Print view',
 
 	'QUICK_MOD'				=> 'Quick-mod tools',
@@ -96,6 +97,7 @@ $lang = array_merge($lang, array(
 	'QUOTE'					=> 'Quote',
 
 	'REPLY_TO_TOPIC'		=> 'Reply to topic',
+	'RESTORE'               => 'Restore',
 	'RETURN_POST'			=> '%sReturn to the post%s',
 
 	'SUBMIT_VOTE'			=> 'Submit vote',
-- 
cgit v1.2.1


From 8a036fa3e4e1fc51a3eb7fded346ccbd84a291b5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 29 Aug 2012 18:42:14 +0200
Subject: [feature/soft-delete] Update restoring feature to use ajax if
 requested.

Also fixes the mcp as a hole:
- displayes a success message
- gives a link to the post, if only one was restored

PHPBB3-9657
---
 phpBB/language/en/common.php | 1 +
 phpBB/language/en/mcp.php    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index e6022e3b79..857b9004ec 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -475,6 +475,7 @@ $lang = array_merge($lang, array(
 	'POST_BY_AUTHOR'		=> 'by',
 	'POST_BY_FOE'			=> 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. %2$sDisplay this post%3$s.',
 	'POST_DAY'				=> '%.2f posts per day',
+	'POST_DELETED'			=> 'Soft deleted post:',
 	'POST_DETAILS'			=> 'Post details',
 	'POST_NEW_TOPIC'		=> 'Post new topic',
 	'POST_PCT'				=> '%.2f%% of all posts',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 175fa72829..95d09028ce 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -201,8 +201,8 @@ $lang = array_merge($lang, array(
 	'MCP_QUEUE_UNAPPROVED_POSTS_EXPLAIN'	=> 'This is a list of all posts which require approving before they will be visible to users.',
 	'MCP_QUEUE_UNAPPROVED_TOPICS'			=> 'Topics awaiting approval',
 	'MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN'	=> 'This is a list of all topics which require approving before they will be visible to users.',
-	'MCP_QUEUE_DELETED_POSTS'               => 'Deleted posts',
-	'MCP_QUEUE_DELETED_POSTS_EXPLAIN'       => 'This is a list of all posts which have been soft deleted.  You can restore or permanently delete the posts from this screen.',
+	'MCP_QUEUE_DELETED_POSTS'				=> 'Deleted posts',
+	'MCP_QUEUE_DELETED_POSTS_EXPLAIN'		=> 'This is a list of all posts which have been soft deleted. You can restore or permanently delete the posts from this screen.',
 
 	'MCP_VIEW_USER'			=> 'View warnings for a specific user',
 
-- 
cgit v1.2.1


From 5e6b4c7192a80dc29382ad06976e9ce6d5c16efd Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 29 Feb 2012 21:23:50 +0000
Subject: [ticket/10631] Adding an extensions admin

PHPBB3-10631
---
 phpBB/language/en/acp/common.php            |   1 +
 phpBB/language/en/acp/customisations.php    | 100 ++++++++++++++++++++++++++++
 phpBB/language/en/acp/permissions_phpbb.php |   1 +
 3 files changed, 102 insertions(+)
 create mode 100644 phpBB/language/en/acp/customisations.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 04df897dba..5eb10d50b3 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -81,6 +81,7 @@ $lang = array_merge($lang, array(
 
 	'ACP_EMAIL_SETTINGS'		=> 'Email settings',
 	'ACP_EXTENSION_GROUPS'		=> 'Manage extension groups',
+	'ACP_EXTENSIONS'			=> 'Manage board extensions',
 
 	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
 	'ACP_FORUM_LOGS'				=> 'Forum logs',
diff --git a/phpBB/language/en/acp/customisations.php b/phpBB/language/en/acp/customisations.php
new file mode 100644
index 0000000000..7ba463bc81
--- /dev/null
+++ b/phpBB/language/en/acp/customisations.php
@@ -0,0 +1,100 @@
+<?php
+/** 
+*
+* acp_mods [English]
+*
+* @package language
+* @copyright (c) 2012 phpBB Group 
+* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License 
+*
+*/
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* 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_merge($lang, array(
+	'EXTENSION'				=> 'Extension',
+	'EXTENSIONS'			=> 'Extensions',
+	'EXTENSIONS_ADMIN'		=> 'Extensions Admin',
+	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit <a href="http://phpbb.com/mods/extensions/">this page</a> on phpBBs Offical Website.',
+	
+	'DETAILS'				=> 'Details',
+	
+	'AVALIABLE'				=> 'Avaliable',
+	'ENABLED'				=> 'Enabled',
+	'DISBALED'				=> 'Disabled',
+	
+	'ENABLE'				=> 'Enable',
+	'DISABLE'				=> 'Disable',
+	'PURGE'					=> 'Purge',
+	'DELETE'				=> 'Delete',
+	
+	'ENABLED'				=> 'Enabled',
+	'DISABLED'				=> 'Disabled',
+	'PURGED'				=> 'Purged',
+	'DELETED'				=> 'Deleted',
+	
+	'ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
+	'DISABLE_EXPLAIN'		=> 'Disabling an extension keeps the files and data intact but is not working on your board.',
+	'PURGE_EXPLAIN'			=> 'Purging an extension keeps the files but not the data on your board.',
+	'DELETE_EXPLAIN'		=> 'Deleting an extension removes all traces of the extension except from your logs.',
+	
+	'ENABLE_SUCESS'			=> 'Your extension was enabled sucessfully',
+	'DISABLE_SUCESS'		=> 'Your extension was disabled sucessfully',
+	'PURGE_SUCESS'			=> 'Your extension was purged sucessfully',
+	'DELETE_SUCESS'			=> 'Your extension was deleted sucessfully',
+	
+	'ENABLE_FAIL'			=> 'Your extension could not be enabled',
+	'DISABLE_FAIL'			=> 'Your extension could not be disabled',
+	'PURGE_FAIL'			=> 'Your extension could not be purged',
+	'DELETE_FAIL'			=> 'Your extension could not be deleted',
+	
+	'EXTENSION_NAME'			=> 'Extension Name',
+	'EXTENSION_ACTIONS'			=> 'Actions',
+	'EXTENSION_OPTIONS'			=> 'Options',
+
+	'ENABLE_CONFIRM'			=> 'Are you sure you wish to enable this extension?',
+	'DISABLE_CONFIRM'			=> 'Are your sure you wish to disable this extension?',
+	'PURGE_CONFIRM'				=> 'Are you sure you wish to purge (and not disable) this extension? This action will wipe the extension data on this board and is not reversible.',
+	'DELETE_CONFIRM'			=> 'Are you sure you wish to delete (and not purge or disable) this extension? This action will remove the extension and all of its data from this board and is not reversible.',
+	
+	'WARNING'			=> 'Warning',
+	'RETURN'			=> 'Return',
+	
+	''			=> '',
+	''			=> '',
+	''			=> '',
+	''			=> '',
+	''			=> '',
+	''			=> '',
+	''			=> '',
+	''			=> '',
+	''			=> '',
+	''			=> '',
+	''			=> '',
+	''			=> '',
+));
+
+?>
\ No newline at end of file
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 17649693fa..bb068e625f 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -226,6 +226,7 @@ $lang = array_merge($lang, array(
 	'acl_a_switchperm'	=> array('lang' => 'Can use others permissions', 'cat' => 'permissions'),
 
 	'acl_a_styles'		=> array('lang' => 'Can manage styles', 'cat' => 'misc'),
+	'acl_a_extensions'	=> array('lang' => 'Can manage extensions', 'cat' => 'misc'),
 	'acl_a_viewlogs'	=> array('lang' => 'Can view logs', 'cat' => 'misc'),
 	'acl_a_clearlogs'	=> array('lang' => 'Can clear logs', 'cat' => 'misc'),
 	'acl_a_modules'		=> array('lang' => 'Can manage modules', 'cat' => 'misc'),
-- 
cgit v1.2.1


From 29a9f3e70d0a165a33e50cce5d275e1a5090c989 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 4 Mar 2012 15:51:57 +0000
Subject: [ticket/10631] Update extensions admin language

Added details page information, added a new line at end of file and removed some whitespace.

PHPBB3-10631
---
 phpBB/language/en/acp/customisations.php | 54 ++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 23 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/customisations.php b/phpBB/language/en/acp/customisations.php
index 7ba463bc81..e45fcb843d 100644
--- a/phpBB/language/en/acp/customisations.php
+++ b/phpBB/language/en/acp/customisations.php
@@ -39,38 +39,38 @@ $lang = array_merge($lang, array(
 	'EXTENSIONS'			=> 'Extensions',
 	'EXTENSIONS_ADMIN'		=> 'Extensions Admin',
 	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit <a href="http://phpbb.com/mods/extensions/">this page</a> on phpBBs Offical Website.',
-	
+
 	'DETAILS'				=> 'Details',
-	
+
 	'AVALIABLE'				=> 'Avaliable',
 	'ENABLED'				=> 'Enabled',
 	'DISBALED'				=> 'Disabled',
-	
+
 	'ENABLE'				=> 'Enable',
 	'DISABLE'				=> 'Disable',
 	'PURGE'					=> 'Purge',
 	'DELETE'				=> 'Delete',
-	
+
 	'ENABLED'				=> 'Enabled',
 	'DISABLED'				=> 'Disabled',
 	'PURGED'				=> 'Purged',
 	'DELETED'				=> 'Deleted',
-	
+
 	'ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
 	'DISABLE_EXPLAIN'		=> 'Disabling an extension keeps the files and data intact but is not working on your board.',
 	'PURGE_EXPLAIN'			=> 'Purging an extension keeps the files but not the data on your board.',
 	'DELETE_EXPLAIN'		=> 'Deleting an extension removes all traces of the extension except from your logs.',
-	
+
 	'ENABLE_SUCESS'			=> 'Your extension was enabled sucessfully',
 	'DISABLE_SUCESS'		=> 'Your extension was disabled sucessfully',
 	'PURGE_SUCESS'			=> 'Your extension was purged sucessfully',
 	'DELETE_SUCESS'			=> 'Your extension was deleted sucessfully',
-	
+
 	'ENABLE_FAIL'			=> 'Your extension could not be enabled',
 	'DISABLE_FAIL'			=> 'Your extension could not be disabled',
 	'PURGE_FAIL'			=> 'Your extension could not be purged',
 	'DELETE_FAIL'			=> 'Your extension could not be deleted',
-	
+
 	'EXTENSION_NAME'			=> 'Extension Name',
 	'EXTENSION_ACTIONS'			=> 'Actions',
 	'EXTENSION_OPTIONS'			=> 'Options',
@@ -79,22 +79,30 @@ $lang = array_merge($lang, array(
 	'DISABLE_CONFIRM'			=> 'Are your sure you wish to disable this extension?',
 	'PURGE_CONFIRM'				=> 'Are you sure you wish to purge (and not disable) this extension? This action will wipe the extension data on this board and is not reversible.',
 	'DELETE_CONFIRM'			=> 'Are you sure you wish to delete (and not purge or disable) this extension? This action will remove the extension and all of its data from this board and is not reversible.',
-	
+
 	'WARNING'			=> 'Warning',
 	'RETURN'			=> 'Return',
-	
-	''			=> '',
-	''			=> '',
-	''			=> '',
-	''			=> '',
-	''			=> '',
-	''			=> '',
-	''			=> '',
-	''			=> '',
-	''			=> '',
-	''			=> '',
-	''			=> '',
-	''			=> '',
+
+	'EXT_DETAILS'			=> 'Extension Details',
+	'DISPLAY_NAME'			=> 'Display Name',
+	'CLEAN_NAME'			=> 'Clean Name',
+	'TYPE'					=> 'Type',
+	'DESCRIPTION'			=> 'Description',
+	'VERSION'				=> 'Version',
+	'HOMEPAGE'				=> 'Homepage',
+	'PATH'					=> 'File Path',
+	'TIME'					=> 'Release Time',
+	'LICENCE'				=> 'Licence',
+
+	'REQUIREMENTS'			=> 'Requirements',
+	'PHPBB_VERSION'			=> 'phpBB Version',
+	'PHP_VERSION'			=> 'php Version',
+	'AUTHOR_INFORMATION'	=> 'Author Information',
+	'AUTHOR_NAME'			=> 'Author Name',
+	'AUTHOR_USERNAME'		=> 'Author Username',
+	'AUTHOR_EMAIL'			=> 'Author Email',
+	'AUTHOR_HOMEPAGE'		=> 'Author Homepage',
+	'AUTHOR_ROLE'			=> 'Author Role',
 ));
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.1


From a51ef4444719c8a50f6fe8ea909ce55ec41e5835 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 4 Mar 2012 16:04:18 +0000
Subject: [ticket/10631] Some rewording of extensions admin language

PHPBB3-10631
---
 phpBB/language/en/acp/customisations.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/customisations.php b/phpBB/language/en/acp/customisations.php
index e45fcb843d..5b15ae7655 100644
--- a/phpBB/language/en/acp/customisations.php
+++ b/phpBB/language/en/acp/customisations.php
@@ -57,19 +57,19 @@ $lang = array_merge($lang, array(
 	'DELETED'				=> 'Deleted',
 
 	'ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
-	'DISABLE_EXPLAIN'		=> 'Disabling an extension keeps the files and data intact but is not working on your board.',
-	'PURGE_EXPLAIN'			=> 'Purging an extension keeps the files but not the data on your board.',
-	'DELETE_EXPLAIN'		=> 'Deleting an extension removes all traces of the extension except from your logs.',
+	'DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files and settings but removes any functionality added by the extension.',
+	'PURGE_EXPLAIN'			=> 'Purging an extension clears an extensions data while retaining its files.',
+	'DELETE_EXPLAIN'		=> 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.',
 
-	'ENABLE_SUCESS'			=> 'Your extension was enabled sucessfully',
-	'DISABLE_SUCESS'		=> 'Your extension was disabled sucessfully',
-	'PURGE_SUCESS'			=> 'Your extension was purged sucessfully',
-	'DELETE_SUCESS'			=> 'Your extension was deleted sucessfully',
+	'ENABLE_SUCESS'			=> 'The extension was enabled sucessfully',
+	'DISABLE_SUCESS'		=> 'The extension was disabled sucessfully',
+	'PURGE_SUCESS'			=> 'The extension was purged sucessfully',
+	'DELETE_SUCESS'			=> 'The extension was deleted sucessfully',
 
-	'ENABLE_FAIL'			=> 'Your extension could not be enabled',
-	'DISABLE_FAIL'			=> 'Your extension could not be disabled',
-	'PURGE_FAIL'			=> 'Your extension could not be purged',
-	'DELETE_FAIL'			=> 'Your extension could not be deleted',
+	'ENABLE_FAIL'			=> 'The extension could not be enabled',
+	'DISABLE_FAIL'			=> 'The extension could not be disabled',
+	'PURGE_FAIL'			=> 'The extension could not be purged',
+	'DELETE_FAIL'			=> 'The extension could not be deleted',
 
 	'EXTENSION_NAME'			=> 'Extension Name',
 	'EXTENSION_ACTIONS'			=> 'Actions',
@@ -77,8 +77,8 @@ $lang = array_merge($lang, array(
 
 	'ENABLE_CONFIRM'			=> 'Are you sure you wish to enable this extension?',
 	'DISABLE_CONFIRM'			=> 'Are your sure you wish to disable this extension?',
-	'PURGE_CONFIRM'				=> 'Are you sure you wish to purge (and not disable) this extension? This action will wipe the extension data on this board and is not reversible.',
-	'DELETE_CONFIRM'			=> 'Are you sure you wish to delete (and not purge or disable) this extension? This action will remove the extension and all of its data from this board and is not reversible.',
+	'PURGE_CONFIRM'				=> 'Are you sure you wish to purge this extensions data? This cannot be undone.',
+	'DELETE_CONFIRM'			=> 'Are you sure you wish to data this extensions files and clear its data? This cannot be undone.',
 
 	'WARNING'			=> 'Warning',
 	'RETURN'			=> 'Return',
-- 
cgit v1.2.1


From 85e871e902454d14321f69e162a92746c46f7d65 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 4 Mar 2012 16:21:11 +0000
Subject: [ticket/10631] Removing ?> at end of customisations language file

PHPBB3-10631
---
 phpBB/language/en/acp/customisations.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/customisations.php b/phpBB/language/en/acp/customisations.php
index 5b15ae7655..e20806eac2 100644
--- a/phpBB/language/en/acp/customisations.php
+++ b/phpBB/language/en/acp/customisations.php
@@ -104,5 +104,3 @@ $lang = array_merge($lang, array(
 	'AUTHOR_HOMEPAGE'		=> 'Author Homepage',
 	'AUTHOR_ROLE'			=> 'Author Role',
 ));
-
-?>
-- 
cgit v1.2.1


From 9cd0e09f5deba03ee0e5d329f5ff126006fd4c9c Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 9 Mar 2012 18:09:38 +0000
Subject: [ticket/10631] Rename language file to extensions.php

PHPBB3-10631
---
 phpBB/language/en/acp/customisations.php | 106 -------------------------------
 phpBB/language/en/acp/extensions.php     | 106 +++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 106 deletions(-)
 delete mode 100644 phpBB/language/en/acp/customisations.php
 create mode 100644 phpBB/language/en/acp/extensions.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/customisations.php b/phpBB/language/en/acp/customisations.php
deleted file mode 100644
index e20806eac2..0000000000
--- a/phpBB/language/en/acp/customisations.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/** 
-*
-* acp_mods [English]
-*
-* @package language
-* @copyright (c) 2012 phpBB Group 
-* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License 
-*
-*/
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* 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_merge($lang, array(
-	'EXTENSION'				=> 'Extension',
-	'EXTENSIONS'			=> 'Extensions',
-	'EXTENSIONS_ADMIN'		=> 'Extensions Admin',
-	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit <a href="http://phpbb.com/mods/extensions/">this page</a> on phpBBs Offical Website.',
-
-	'DETAILS'				=> 'Details',
-
-	'AVALIABLE'				=> 'Avaliable',
-	'ENABLED'				=> 'Enabled',
-	'DISBALED'				=> 'Disabled',
-
-	'ENABLE'				=> 'Enable',
-	'DISABLE'				=> 'Disable',
-	'PURGE'					=> 'Purge',
-	'DELETE'				=> 'Delete',
-
-	'ENABLED'				=> 'Enabled',
-	'DISABLED'				=> 'Disabled',
-	'PURGED'				=> 'Purged',
-	'DELETED'				=> 'Deleted',
-
-	'ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
-	'DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files and settings but removes any functionality added by the extension.',
-	'PURGE_EXPLAIN'			=> 'Purging an extension clears an extensions data while retaining its files.',
-	'DELETE_EXPLAIN'		=> 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.',
-
-	'ENABLE_SUCESS'			=> 'The extension was enabled sucessfully',
-	'DISABLE_SUCESS'		=> 'The extension was disabled sucessfully',
-	'PURGE_SUCESS'			=> 'The extension was purged sucessfully',
-	'DELETE_SUCESS'			=> 'The extension was deleted sucessfully',
-
-	'ENABLE_FAIL'			=> 'The extension could not be enabled',
-	'DISABLE_FAIL'			=> 'The extension could not be disabled',
-	'PURGE_FAIL'			=> 'The extension could not be purged',
-	'DELETE_FAIL'			=> 'The extension could not be deleted',
-
-	'EXTENSION_NAME'			=> 'Extension Name',
-	'EXTENSION_ACTIONS'			=> 'Actions',
-	'EXTENSION_OPTIONS'			=> 'Options',
-
-	'ENABLE_CONFIRM'			=> 'Are you sure you wish to enable this extension?',
-	'DISABLE_CONFIRM'			=> 'Are your sure you wish to disable this extension?',
-	'PURGE_CONFIRM'				=> 'Are you sure you wish to purge this extensions data? This cannot be undone.',
-	'DELETE_CONFIRM'			=> 'Are you sure you wish to data this extensions files and clear its data? This cannot be undone.',
-
-	'WARNING'			=> 'Warning',
-	'RETURN'			=> 'Return',
-
-	'EXT_DETAILS'			=> 'Extension Details',
-	'DISPLAY_NAME'			=> 'Display Name',
-	'CLEAN_NAME'			=> 'Clean Name',
-	'TYPE'					=> 'Type',
-	'DESCRIPTION'			=> 'Description',
-	'VERSION'				=> 'Version',
-	'HOMEPAGE'				=> 'Homepage',
-	'PATH'					=> 'File Path',
-	'TIME'					=> 'Release Time',
-	'LICENCE'				=> 'Licence',
-
-	'REQUIREMENTS'			=> 'Requirements',
-	'PHPBB_VERSION'			=> 'phpBB Version',
-	'PHP_VERSION'			=> 'php Version',
-	'AUTHOR_INFORMATION'	=> 'Author Information',
-	'AUTHOR_NAME'			=> 'Author Name',
-	'AUTHOR_USERNAME'		=> 'Author Username',
-	'AUTHOR_EMAIL'			=> 'Author Email',
-	'AUTHOR_HOMEPAGE'		=> 'Author Homepage',
-	'AUTHOR_ROLE'			=> 'Author Role',
-));
diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
new file mode 100644
index 0000000000..e20806eac2
--- /dev/null
+++ b/phpBB/language/en/acp/extensions.php
@@ -0,0 +1,106 @@
+<?php
+/** 
+*
+* acp_mods [English]
+*
+* @package language
+* @copyright (c) 2012 phpBB Group 
+* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License 
+*
+*/
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* 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_merge($lang, array(
+	'EXTENSION'				=> 'Extension',
+	'EXTENSIONS'			=> 'Extensions',
+	'EXTENSIONS_ADMIN'		=> 'Extensions Admin',
+	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit <a href="http://phpbb.com/mods/extensions/">this page</a> on phpBBs Offical Website.',
+
+	'DETAILS'				=> 'Details',
+
+	'AVALIABLE'				=> 'Avaliable',
+	'ENABLED'				=> 'Enabled',
+	'DISBALED'				=> 'Disabled',
+
+	'ENABLE'				=> 'Enable',
+	'DISABLE'				=> 'Disable',
+	'PURGE'					=> 'Purge',
+	'DELETE'				=> 'Delete',
+
+	'ENABLED'				=> 'Enabled',
+	'DISABLED'				=> 'Disabled',
+	'PURGED'				=> 'Purged',
+	'DELETED'				=> 'Deleted',
+
+	'ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
+	'DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files and settings but removes any functionality added by the extension.',
+	'PURGE_EXPLAIN'			=> 'Purging an extension clears an extensions data while retaining its files.',
+	'DELETE_EXPLAIN'		=> 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.',
+
+	'ENABLE_SUCESS'			=> 'The extension was enabled sucessfully',
+	'DISABLE_SUCESS'		=> 'The extension was disabled sucessfully',
+	'PURGE_SUCESS'			=> 'The extension was purged sucessfully',
+	'DELETE_SUCESS'			=> 'The extension was deleted sucessfully',
+
+	'ENABLE_FAIL'			=> 'The extension could not be enabled',
+	'DISABLE_FAIL'			=> 'The extension could not be disabled',
+	'PURGE_FAIL'			=> 'The extension could not be purged',
+	'DELETE_FAIL'			=> 'The extension could not be deleted',
+
+	'EXTENSION_NAME'			=> 'Extension Name',
+	'EXTENSION_ACTIONS'			=> 'Actions',
+	'EXTENSION_OPTIONS'			=> 'Options',
+
+	'ENABLE_CONFIRM'			=> 'Are you sure you wish to enable this extension?',
+	'DISABLE_CONFIRM'			=> 'Are your sure you wish to disable this extension?',
+	'PURGE_CONFIRM'				=> 'Are you sure you wish to purge this extensions data? This cannot be undone.',
+	'DELETE_CONFIRM'			=> 'Are you sure you wish to data this extensions files and clear its data? This cannot be undone.',
+
+	'WARNING'			=> 'Warning',
+	'RETURN'			=> 'Return',
+
+	'EXT_DETAILS'			=> 'Extension Details',
+	'DISPLAY_NAME'			=> 'Display Name',
+	'CLEAN_NAME'			=> 'Clean Name',
+	'TYPE'					=> 'Type',
+	'DESCRIPTION'			=> 'Description',
+	'VERSION'				=> 'Version',
+	'HOMEPAGE'				=> 'Homepage',
+	'PATH'					=> 'File Path',
+	'TIME'					=> 'Release Time',
+	'LICENCE'				=> 'Licence',
+
+	'REQUIREMENTS'			=> 'Requirements',
+	'PHPBB_VERSION'			=> 'phpBB Version',
+	'PHP_VERSION'			=> 'php Version',
+	'AUTHOR_INFORMATION'	=> 'Author Information',
+	'AUTHOR_NAME'			=> 'Author Name',
+	'AUTHOR_USERNAME'		=> 'Author Username',
+	'AUTHOR_EMAIL'			=> 'Author Email',
+	'AUTHOR_HOMEPAGE'		=> 'Author Homepage',
+	'AUTHOR_ROLE'			=> 'Author Role',
+));
-- 
cgit v1.2.1


From e768d0066d6c19e2d32016cc87a93d0cc9a9bcf7 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 9 Mar 2012 18:12:45 +0000
Subject: [ticket/10631] Update extensions language file for some issues found

PHPBB3-10631
---
 phpBB/language/en/acp/extensions.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index e20806eac2..77d0b2f3cd 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -42,20 +42,18 @@ $lang = array_merge($lang, array(
 
 	'DETAILS'				=> 'Details',
 
-	'AVALIABLE'				=> 'Avaliable',
+	'AVAILABLE'				=> 'Available',
 	'ENABLED'				=> 'Enabled',
-	'DISBALED'				=> 'Disabled',
+	'DISABLED'				=> 'Disabled',
+	'PURGED'				=> 'Purged',
+	'DELETED'				=> 'Deleted',
+	'UPLOADED'				=> 'Uploaded',
 
 	'ENABLE'				=> 'Enable',
 	'DISABLE'				=> 'Disable',
 	'PURGE'					=> 'Purge',
 	'DELETE'				=> 'Delete',
 
-	'ENABLED'				=> 'Enabled',
-	'DISABLED'				=> 'Disabled',
-	'PURGED'				=> 'Purged',
-	'DELETED'				=> 'Deleted',
-
 	'ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
 	'DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files and settings but removes any functionality added by the extension.',
 	'PURGE_EXPLAIN'			=> 'Purging an extension clears an extensions data while retaining its files.',
-- 
cgit v1.2.1


From 7a954d352ef1fe84256ad691135b6c6bf0d4bcc5 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sat, 28 Apr 2012 18:13:28 +0100
Subject: [ticket/10631] Fixing some items mentioned in PR

PHPBB3-10631
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 77d0b2f3cd..37cabe477b 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -38,7 +38,7 @@ $lang = array_merge($lang, array(
 	'EXTENSION'				=> 'Extension',
 	'EXTENSIONS'			=> 'Extensions',
 	'EXTENSIONS_ADMIN'		=> 'Extensions Admin',
-	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit <a href="http://phpbb.com/mods/extensions/">this page</a> on phpBBs Offical Website.',
+	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit <a href="http://phpbb.com/mods/extensions/">this page</a> on phpBB&#39;s Offical Website.',
 
 	'DETAILS'				=> 'Details',
 
-- 
cgit v1.2.1


From 4cbfa6175303d23d35aaa06f8f68d9a3d7d0beb2 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sun, 29 Apr 2012 00:34:50 +0100
Subject: [ticket/10631] A few more extension admin changes

PHPBB3-10631
---
 phpBB/language/en/acp/extensions.php | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 37cabe477b..728ab40ee9 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -1,7 +1,7 @@
 <?php
 /** 
 *
-* acp_mods [English]
+* acp_extensions [English]
 *
 * @package language
 * @copyright (c) 2012 phpBB Group 
@@ -37,8 +37,8 @@ if (empty($lang) || !is_array($lang))
 $lang = array_merge($lang, array(
 	'EXTENSION'				=> 'Extension',
 	'EXTENSIONS'			=> 'Extensions',
-	'EXTENSIONS_ADMIN'		=> 'Extensions Admin',
-	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Admin is a tool in your phpBB Board which allows you to manage all of your extensions. For more information about extensions please visit <a href="http://phpbb.com/mods/extensions/">this page</a> on phpBB&#39;s Offical Website.',
+	'EXTENSIONS_ADMIN'		=> 'Extensions Manager',
+	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.',
 
 	'DETAILS'				=> 'Details',
 
@@ -59,10 +59,10 @@ $lang = array_merge($lang, array(
 	'PURGE_EXPLAIN'			=> 'Purging an extension clears an extensions data while retaining its files.',
 	'DELETE_EXPLAIN'		=> 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.',
 
-	'ENABLE_SUCESS'			=> 'The extension was enabled sucessfully',
-	'DISABLE_SUCESS'		=> 'The extension was disabled sucessfully',
-	'PURGE_SUCESS'			=> 'The extension was purged sucessfully',
-	'DELETE_SUCESS'			=> 'The extension was deleted sucessfully',
+	'ENABLE_SUCESS'			=> 'The extension was enabled successfully',
+	'DISABLE_SUCESS'		=> 'The extension was disabled successfully',
+	'PURGE_SUCESS'			=> 'The extension was purged successfully',
+	'DELETE_SUCESS'			=> 'The extension was deleted successfully',
 
 	'ENABLE_FAIL'			=> 'The extension could not be enabled',
 	'DISABLE_FAIL'			=> 'The extension could not be disabled',
@@ -73,10 +73,10 @@ $lang = array_merge($lang, array(
 	'EXTENSION_ACTIONS'			=> 'Actions',
 	'EXTENSION_OPTIONS'			=> 'Options',
 
-	'ENABLE_CONFIRM'			=> 'Are you sure you wish to enable this extension?',
-	'DISABLE_CONFIRM'			=> 'Are your sure you wish to disable this extension?',
-	'PURGE_CONFIRM'				=> 'Are you sure you wish to purge this extensions data? This cannot be undone.',
-	'DELETE_CONFIRM'			=> 'Are you sure you wish to data this extensions files and clear its data? This cannot be undone.',
+	'ENABLE_CONFIRM'			=> 'Are you sure that you wish to enable this extension?',
+	'DISABLE_CONFIRM'			=> 'Are you sure that you wish to disable this extension?',
+	'PURGE_CONFIRM'				=> 'Are you sure that you wish to purge this extension&#39;s data? This cannot be undone.',
+	'DELETE_CONFIRM'			=> 'Are you sure that you wish to data this extension&#39;s files and clear its data? This cannot be undone.',
 
 	'WARNING'			=> 'Warning',
 	'RETURN'			=> 'Return',
@@ -94,11 +94,10 @@ $lang = array_merge($lang, array(
 
 	'REQUIREMENTS'			=> 'Requirements',
 	'PHPBB_VERSION'			=> 'phpBB Version',
-	'PHP_VERSION'			=> 'php Version',
+	'PHP_VERSION'			=> 'PHP Version',
 	'AUTHOR_INFORMATION'	=> 'Author Information',
-	'AUTHOR_NAME'			=> 'Author Name',
-	'AUTHOR_USERNAME'		=> 'Author Username',
-	'AUTHOR_EMAIL'			=> 'Author Email',
-	'AUTHOR_HOMEPAGE'		=> 'Author Homepage',
-	'AUTHOR_ROLE'			=> 'Author Role',
+	'AUTHOR_NAME'			=> 'Name',
+	'AUTHOR_EMAIL'			=> 'Email',
+	'AUTHOR_HOMEPAGE'		=> 'Homepage',
+	'AUTHOR_ROLE'			=> 'Role',
 ));
-- 
cgit v1.2.1


From 3ba59c6362c955d1f9b59278f7dd19cdacecff99 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 22 Jul 2012 18:11:56 -0500
Subject: [ticket/10631] Various tidbits and cleanup on the acp extensions
 manager

PHPBB3-10631
---
 phpBB/language/en/acp/extensions.php | 207 ++++++++++++++++++-----------------
 1 file changed, 104 insertions(+), 103 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 728ab40ee9..950f3b5332 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -1,103 +1,104 @@
-<?php
-/** 
-*
-* acp_extensions [English]
-*
-* @package language
-* @copyright (c) 2012 phpBB Group 
-* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License 
-*
-*/
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* 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_merge($lang, array(
-	'EXTENSION'				=> 'Extension',
-	'EXTENSIONS'			=> 'Extensions',
-	'EXTENSIONS_ADMIN'		=> 'Extensions Manager',
-	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.',
-
-	'DETAILS'				=> 'Details',
-
-	'AVAILABLE'				=> 'Available',
-	'ENABLED'				=> 'Enabled',
-	'DISABLED'				=> 'Disabled',
-	'PURGED'				=> 'Purged',
-	'DELETED'				=> 'Deleted',
-	'UPLOADED'				=> 'Uploaded',
-
-	'ENABLE'				=> 'Enable',
-	'DISABLE'				=> 'Disable',
-	'PURGE'					=> 'Purge',
-	'DELETE'				=> 'Delete',
-
-	'ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
-	'DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files and settings but removes any functionality added by the extension.',
-	'PURGE_EXPLAIN'			=> 'Purging an extension clears an extensions data while retaining its files.',
-	'DELETE_EXPLAIN'		=> 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.',
-
-	'ENABLE_SUCESS'			=> 'The extension was enabled successfully',
-	'DISABLE_SUCESS'		=> 'The extension was disabled successfully',
-	'PURGE_SUCESS'			=> 'The extension was purged successfully',
-	'DELETE_SUCESS'			=> 'The extension was deleted successfully',
-
-	'ENABLE_FAIL'			=> 'The extension could not be enabled',
-	'DISABLE_FAIL'			=> 'The extension could not be disabled',
-	'PURGE_FAIL'			=> 'The extension could not be purged',
-	'DELETE_FAIL'			=> 'The extension could not be deleted',
-
-	'EXTENSION_NAME'			=> 'Extension Name',
-	'EXTENSION_ACTIONS'			=> 'Actions',
-	'EXTENSION_OPTIONS'			=> 'Options',
-
-	'ENABLE_CONFIRM'			=> 'Are you sure that you wish to enable this extension?',
-	'DISABLE_CONFIRM'			=> 'Are you sure that you wish to disable this extension?',
-	'PURGE_CONFIRM'				=> 'Are you sure that you wish to purge this extension&#39;s data? This cannot be undone.',
-	'DELETE_CONFIRM'			=> 'Are you sure that you wish to data this extension&#39;s files and clear its data? This cannot be undone.',
-
-	'WARNING'			=> 'Warning',
-	'RETURN'			=> 'Return',
-
-	'EXT_DETAILS'			=> 'Extension Details',
-	'DISPLAY_NAME'			=> 'Display Name',
-	'CLEAN_NAME'			=> 'Clean Name',
-	'TYPE'					=> 'Type',
-	'DESCRIPTION'			=> 'Description',
-	'VERSION'				=> 'Version',
-	'HOMEPAGE'				=> 'Homepage',
-	'PATH'					=> 'File Path',
-	'TIME'					=> 'Release Time',
-	'LICENCE'				=> 'Licence',
-
-	'REQUIREMENTS'			=> 'Requirements',
-	'PHPBB_VERSION'			=> 'phpBB Version',
-	'PHP_VERSION'			=> 'PHP Version',
-	'AUTHOR_INFORMATION'	=> 'Author Information',
-	'AUTHOR_NAME'			=> 'Name',
-	'AUTHOR_EMAIL'			=> 'Email',
-	'AUTHOR_HOMEPAGE'		=> 'Homepage',
-	'AUTHOR_ROLE'			=> 'Role',
-));
+<?php
+/** 
+*
+* acp_extensions [English]
+*
+* @package language
+* @copyright (c) 2012 phpBB Group 
+* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License 
+*
+*/
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* 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_merge($lang, array(
+	'EXTENSION'				=> 'Extension',
+	'EXTENSIONS'			=> 'Extensions',
+	'EXTENSIONS_ADMIN'		=> 'Extensions Manager',
+	'EXTENSIONS_EXPLAIN'	=> 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.',
+	'EXTENSION_INVALID'		=> 'The selected extension is not valid.',
+
+	'DETAILS'				=> 'Details',
+
+	'AVAILABLE'				=> 'Available',
+	'ENABLED'				=> 'Enabled',
+	'DISABLED'				=> 'Disabled',
+	'PURGED'				=> 'Purged',
+	'DELETED'				=> 'Deleted',
+	'UPLOADED'				=> 'Uploaded',
+
+	'ENABLE'				=> 'Enable',
+	'DISABLE'				=> 'Disable',
+	'PURGE'					=> 'Purge',
+	'DELETE'				=> 'Delete',
+
+	'ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
+	'DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files and settings but removes any functionality added by the extension.',
+	'PURGE_EXPLAIN'			=> 'Purging an extension clears an extensions data while retaining its files.',
+	'DELETE_EXPLAIN'		=> 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.',
+
+	'ENABLE_SUCESS'			=> 'The extension was enabled successfully',
+	'DISABLE_SUCESS'		=> 'The extension was disabled successfully',
+	'PURGE_SUCESS'			=> 'The extension was purged successfully',
+	'DELETE_SUCESS'			=> 'The extension was deleted successfully',
+
+	'ENABLE_FAIL'			=> 'The extension could not be enabled',
+	'DISABLE_FAIL'			=> 'The extension could not be disabled',
+	'PURGE_FAIL'			=> 'The extension could not be purged',
+	'DELETE_FAIL'			=> 'The extension could not be deleted',
+
+	'EXTENSION_NAME'			=> 'Extension Name',
+	'EXTENSION_ACTIONS'			=> 'Actions',
+	'EXTENSION_OPTIONS'			=> 'Options',
+
+	'ENABLE_CONFIRM'			=> 'Are you sure that you wish to enable this extension?',
+	'DISABLE_CONFIRM'			=> 'Are you sure that you wish to disable this extension?',
+	'PURGE_CONFIRM'				=> 'Are you sure that you wish to purge this extension&#39;s data? This cannot be undone.',
+	'DELETE_CONFIRM'			=> 'Are you sure that you wish to data this extension&#39;s files and clear its data? This cannot be undone.',
+
+	'WARNING'			=> 'Warning',
+	'RETURN'			=> 'Return',
+
+	'EXT_DETAILS'			=> 'Extension Details',
+	'DISPLAY_NAME'			=> 'Display Name',
+	'CLEAN_NAME'			=> 'Clean Name',
+	'TYPE'					=> 'Type',
+	'DESCRIPTION'			=> 'Description',
+	'VERSION'				=> 'Version',
+	'HOMEPAGE'				=> 'Homepage',
+	'PATH'					=> 'File Path',
+	'TIME'					=> 'Release Time',
+	'LICENCE'				=> 'Licence',
+
+	'REQUIREMENTS'			=> 'Requirements',
+	'PHPBB_VERSION'			=> 'phpBB Version',
+	'PHP_VERSION'			=> 'PHP Version',
+	'AUTHOR_INFORMATION'	=> 'Author Information',
+	'AUTHOR_NAME'			=> 'Name',
+	'AUTHOR_EMAIL'			=> 'Email',
+	'AUTHOR_HOMEPAGE'		=> 'Homepage',
+	'AUTHOR_ROLE'			=> 'Role',
+));
-- 
cgit v1.2.1


From 28ca2d6a5fe8f8f1d8733af70951fa1191336eb6 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 22 Jul 2012 22:54:27 -0500
Subject: [ticket/10631] Stagger the enable/disable/purge for extensions

PHPBB3-10631
---
 phpBB/language/en/acp/extensions.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 950f3b5332..66f3665757 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -60,10 +60,13 @@ $lang = array_merge($lang, array(
 	'PURGE_EXPLAIN'			=> 'Purging an extension clears an extensions data while retaining its files.',
 	'DELETE_EXPLAIN'		=> 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.',
 
-	'ENABLE_SUCESS'			=> 'The extension was enabled successfully',
-	'DISABLE_SUCESS'		=> 'The extension was disabled successfully',
-	'PURGE_SUCESS'			=> 'The extension was purged successfully',
-	'DELETE_SUCESS'			=> 'The extension was deleted successfully',
+	'DISABLE_IN_PROGRESS'	=> 'The extension is currently being disabled, please do not leave this page or refresh until it is completed.',
+	'ENABLE_IN_PROGRESS'	=> 'The extension is currently being installed, please do not leave this page or refresh until it is completed.',
+	'PURGE_IN_PROGRESS'		=> 'The extension is currently being purged, please do not leave this page or refresh until it is completed.',
+	'ENABLE_SUCCESS'			=> 'The extension was enabled successfully',
+	'DISABLE_SUCCESS'		=> 'The extension was disabled successfully',
+	'PURGE_SUCCESS'			=> 'The extension was purged successfully',
+	'DELETE_SUCCESS'			=> 'The extension was deleted successfully',
 
 	'ENABLE_FAIL'			=> 'The extension could not be enabled',
 	'DISABLE_FAIL'			=> 'The extension could not be disabled',
-- 
cgit v1.2.1


From 8bbab088dd5830d8dd1151a3684dde5c197ba268 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 23 Jul 2012 15:17:42 -0500
Subject: [ticket/10631] Validation for extensions

PHPBB3-10631
---
 phpBB/language/en/acp/extensions.php | 41 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 66f3665757..547d14d2b9 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -1,11 +1,11 @@
 <?php
-/** 
+/**
 *
 * acp_extensions [English]
 *
 * @package language
-* @copyright (c) 2012 phpBB Group 
-* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License 
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
 *
 */
 /**
@@ -23,7 +23,7 @@ if (empty($lang) || !is_array($lang))
 	$lang = array();
 }
 
-// DEVELOPERS PLEASE NOTE 
+// 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
@@ -35,11 +35,12 @@ if (empty($lang) || !is_array($lang))
 
 
 $lang = array_merge($lang, array(
-	'EXTENSION'				=> 'Extension',
-	'EXTENSIONS'			=> 'Extensions',
-	'EXTENSIONS_ADMIN'		=> 'Extensions Manager',
-	'EXTENSIONS_EXPLAIN'	=> 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.',
-	'EXTENSION_INVALID'		=> 'The selected extension is not valid.',
+	'EXTENSION'					=> 'Extension',
+	'EXTENSIONS'				=> 'Extensions',
+	'EXTENSIONS_ADMIN'			=> 'Extensions Manager',
+	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.',
+	'EXTENSION_INVALID'			=> 'The selected extension is not valid.',
+	'EXTENSION_NOT_AVAILABLE'	=> 'The selected extension is not available for this board, please verify your phpBB and PHP versions are allowed (see the details page).',
 
 	'DETAILS'				=> 'Details',
 
@@ -63,27 +64,27 @@ $lang = array_merge($lang, array(
 	'DISABLE_IN_PROGRESS'	=> 'The extension is currently being disabled, please do not leave this page or refresh until it is completed.',
 	'ENABLE_IN_PROGRESS'	=> 'The extension is currently being installed, please do not leave this page or refresh until it is completed.',
 	'PURGE_IN_PROGRESS'		=> 'The extension is currently being purged, please do not leave this page or refresh until it is completed.',
-	'ENABLE_SUCCESS'			=> 'The extension was enabled successfully',
+	'ENABLE_SUCCESS'		=> 'The extension was enabled successfully',
 	'DISABLE_SUCCESS'		=> 'The extension was disabled successfully',
 	'PURGE_SUCCESS'			=> 'The extension was purged successfully',
-	'DELETE_SUCCESS'			=> 'The extension was deleted successfully',
+	'DELETE_SUCCESS'		=> 'The extension was deleted successfully',
 
 	'ENABLE_FAIL'			=> 'The extension could not be enabled',
 	'DISABLE_FAIL'			=> 'The extension could not be disabled',
 	'PURGE_FAIL'			=> 'The extension could not be purged',
 	'DELETE_FAIL'			=> 'The extension could not be deleted',
 
-	'EXTENSION_NAME'			=> 'Extension Name',
-	'EXTENSION_ACTIONS'			=> 'Actions',
-	'EXTENSION_OPTIONS'			=> 'Options',
+	'EXTENSION_NAME'		=> 'Extension Name',
+	'EXTENSION_ACTIONS'		=> 'Actions',
+	'EXTENSION_OPTIONS'		=> 'Options',
 
-	'ENABLE_CONFIRM'			=> 'Are you sure that you wish to enable this extension?',
-	'DISABLE_CONFIRM'			=> 'Are you sure that you wish to disable this extension?',
-	'PURGE_CONFIRM'				=> 'Are you sure that you wish to purge this extension&#39;s data? This cannot be undone.',
-	'DELETE_CONFIRM'			=> 'Are you sure that you wish to data this extension&#39;s files and clear its data? This cannot be undone.',
+	'ENABLE_CONFIRM'		=> 'Are you sure that you wish to enable this extension?',
+	'DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable this extension?',
+	'PURGE_CONFIRM'			=> 'Are you sure that you wish to purge this extension&#39;s data? This cannot be undone.',
+	'DELETE_CONFIRM'		=> 'Are you sure that you wish to data this extension&#39;s files and clear its data? This cannot be undone.',
 
-	'WARNING'			=> 'Warning',
-	'RETURN'			=> 'Return',
+	'WARNING'				=> 'Warning',
+	'RETURN'				=> 'Return',
 
 	'EXT_DETAILS'			=> 'Extension Details',
 	'DISPLAY_NAME'			=> 'Display Name',
-- 
cgit v1.2.1


From 9c0cd2693fd61c9528aa5fcbc3dff9de73515ebe Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 23 Jul 2012 16:04:29 -0500
Subject: [ticket/10631] Make the enable/disable/purge notices more visable.

PHPBB3-10631
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 547d14d2b9..a16e13d979 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -80,7 +80,7 @@ $lang = array_merge($lang, array(
 
 	'ENABLE_CONFIRM'		=> 'Are you sure that you wish to enable this extension?',
 	'DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable this extension?',
-	'PURGE_CONFIRM'			=> 'Are you sure that you wish to purge this extension&#39;s data? This cannot be undone.',
+	'PURGE_CONFIRM'			=> 'Are you sure that you wish to purge this extension&#39;s data? This will remove all settings stored for this extension and cannot be undone!',
 	'DELETE_CONFIRM'		=> 'Are you sure that you wish to data this extension&#39;s files and clear its data? This cannot be undone.',
 
 	'WARNING'				=> 'Warning',
-- 
cgit v1.2.1


From 2273ae2b34071160ff930ca8d49326b8dd308899 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 23 Jul 2012 17:05:03 -0500
Subject: [ticket/10631] Remove references to delete extension

PHPBB3-10631
---
 phpBB/language/en/acp/extensions.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index a16e13d979..903ec249a8 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -48,13 +48,11 @@ $lang = array_merge($lang, array(
 	'ENABLED'				=> 'Enabled',
 	'DISABLED'				=> 'Disabled',
 	'PURGED'				=> 'Purged',
-	'DELETED'				=> 'Deleted',
 	'UPLOADED'				=> 'Uploaded',
 
 	'ENABLE'				=> 'Enable',
 	'DISABLE'				=> 'Disable',
 	'PURGE'					=> 'Purge',
-	'DELETE'				=> 'Delete',
 
 	'ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
 	'DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files and settings but removes any functionality added by the extension.',
@@ -67,12 +65,10 @@ $lang = array_merge($lang, array(
 	'ENABLE_SUCCESS'		=> 'The extension was enabled successfully',
 	'DISABLE_SUCCESS'		=> 'The extension was disabled successfully',
 	'PURGE_SUCCESS'			=> 'The extension was purged successfully',
-	'DELETE_SUCCESS'		=> 'The extension was deleted successfully',
 
 	'ENABLE_FAIL'			=> 'The extension could not be enabled',
 	'DISABLE_FAIL'			=> 'The extension could not be disabled',
 	'PURGE_FAIL'			=> 'The extension could not be purged',
-	'DELETE_FAIL'			=> 'The extension could not be deleted',
 
 	'EXTENSION_NAME'		=> 'Extension Name',
 	'EXTENSION_ACTIONS'		=> 'Actions',
@@ -81,7 +77,6 @@ $lang = array_merge($lang, array(
 	'ENABLE_CONFIRM'		=> 'Are you sure that you wish to enable this extension?',
 	'DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable this extension?',
 	'PURGE_CONFIRM'			=> 'Are you sure that you wish to purge this extension&#39;s data? This will remove all settings stored for this extension and cannot be undone!',
-	'DELETE_CONFIRM'		=> 'Are you sure that you wish to data this extension&#39;s files and clear its data? This cannot be undone.',
 
 	'WARNING'				=> 'Warning',
 	'RETURN'				=> 'Return',
-- 
cgit v1.2.1


From 89f4cf6a8c10f9b0875cf7f278016aff67eb38fc Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 23 Jul 2012 19:46:21 -0500
Subject: [ticket/10631] Use exceptions for errors. Build action list
 dynamically.

PHPBB3-10631
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 903ec249a8..0adaff10c8 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -39,7 +39,7 @@ $lang = array_merge($lang, array(
 	'EXTENSIONS'				=> 'Extensions',
 	'EXTENSIONS_ADMIN'			=> 'Extensions Manager',
 	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.',
-	'EXTENSION_INVALID'			=> 'The selected extension is not valid.',
+	'EXTENSION_INVALID_LIST'	=> 'The "%s" extension is not valid.<br /><p>%s</p>',
 	'EXTENSION_NOT_AVAILABLE'	=> 'The selected extension is not available for this board, please verify your phpBB and PHP versions are allowed (see the details page).',
 
 	'DETAILS'				=> 'Details',
-- 
cgit v1.2.1


From ff45c9aa7c077fc0a03c64764917d1efcccf48f4 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 10:36:22 -0500
Subject: [ticket/11103] General notification email template.

PHPBB3-11103
---
 phpBB/language/en/email/notification.txt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 phpBB/language/en/email/notification.txt

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/notification.txt b/phpBB/language/en/email/notification.txt
new file mode 100644
index 0000000000..ed35e96c85
--- /dev/null
+++ b/phpBB/language/en/email/notification.txt
@@ -0,0 +1,16 @@
+Subject: Notification from {SITENAME}
+
+Hello {USERNAME},
+
+{MESSAGE}
+
+You can view this by clicking on the following link:
+
+{U_VIEW_MESSAGE}
+
+<!-- IF U_UNSUBSCRIBE -->
+You may unsubscribe by clicking on the following link:
+{U_UNSUBSCRIBE}
+<!-- ENDIF -->
+
+{EMAIL_SIG}
\ No newline at end of file
-- 
cgit v1.2.1


From 3624d2c50ac1acca767c5642767102b97fd6b832 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 14:20:14 -0500
Subject: [ticket/11103] Use the language system, topic notifications

PHPBB3-11103
---
 phpBB/language/en/common.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index e6022e3b79..23f205dcc7 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -385,6 +385,9 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
+	'NOTIFICATION_PM'			=> '%1$s sent you a Private Message titled: %2$s.',
+	'NOTIFICATION_POST'			=> '%1$s replied to the topic "%2$s".',
+	'NOTIFICATION_TOPIC'		=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
 	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
-- 
cgit v1.2.1


From 9b1de1e487e162f55085ce72e660c5b348615649 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Sep 2012 21:05:11 -0500
Subject: [ticket/11103] Add topic ID to view post URL

PHPBB3-11103
---
 phpBB/language/en/common.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 23f205dcc7..a437c924cf 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -385,7 +385,8 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
-	'NOTIFICATION_PM'			=> '%1$s sent you a Private Message titled: %2$s.',
+	'NOTIFICATIONS'				=> '[ Notifications ]',
+	'NOTIFICATION_PM'			=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'			=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_TOPIC'		=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
-- 
cgit v1.2.1


From 207bbdf48cb05abfb611f238e4ba07131131c74d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Sep 2012 23:55:29 -0500
Subject: [ticket/11103] Quote notifications

PHPBB3-11103
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a437c924cf..75ca5c0000 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -388,6 +388,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATIONS'				=> '[ Notifications ]',
 	'NOTIFICATION_PM'			=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'			=> '%1$s replied to the topic "%2$s".',
+	'NOTIFICATION_QUOTE'		=> '%1$s quoted you in the post "%2$s".',
 	'NOTIFICATION_TOPIC'		=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
-- 
cgit v1.2.1


From ed1ec8e720a7ec3c1270cd631cc37e531f315f26 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 16:54:20 -0500
Subject: [ticket/11103] Add/Update/Mark Read functions accept an array for the
 type

This saves a lot of code in some areas (where the same data is sent, just
for different types)

Notifications for bookmarks

PHPBB3-11103
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 75ca5c0000..3e69c6bb03 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -386,6 +386,7 @@ $lang = array_merge($lang, array(
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
 	'NOTIFICATIONS'				=> '[ Notifications ]',
+	'NOTIFICATION_BOOKMARK'		=> '%1$s replied to the topic "%2$s" you have bookmarked.',
 	'NOTIFICATION_PM'			=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'			=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_QUOTE'		=> '%1$s quoted you in the post "%2$s".',
-- 
cgit v1.2.1


From 959c81d00e830e89fa9d583ee93bf8f166013fe0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 18:05:13 -0500
Subject: [ticket/11103] Use appropriate email templates to send notifications

Fixing a number of bugs

PHPBB3-11103
---
 phpBB/language/en/email/notification.txt           | 16 ----------------
 phpBB/language/en/email/notifications/bookmark.txt | 20 ++++++++++++++++++++
 phpBB/language/en/email/notifications/quote.txt    | 20 ++++++++++++++++++++
 3 files changed, 40 insertions(+), 16 deletions(-)
 delete mode 100644 phpBB/language/en/email/notification.txt
 create mode 100644 phpBB/language/en/email/notifications/bookmark.txt
 create mode 100644 phpBB/language/en/email/notifications/quote.txt

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/notification.txt b/phpBB/language/en/email/notification.txt
deleted file mode 100644
index ed35e96c85..0000000000
--- a/phpBB/language/en/email/notification.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Subject: Notification from {SITENAME}
-
-Hello {USERNAME},
-
-{MESSAGE}
-
-You can view this by clicking on the following link:
-
-{U_VIEW_MESSAGE}
-
-<!-- IF U_UNSUBSCRIBE -->
-You may unsubscribe by clicking on the following link:
-{U_UNSUBSCRIBE}
-<!-- ENDIF -->
-
-{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/notifications/bookmark.txt b/phpBB/language/en/email/notifications/bookmark.txt
new file mode 100644
index 0000000000..9888008604
--- /dev/null
+++ b/phpBB/language/en/email/notifications/bookmark.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}" has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+
+If you want to view the newest post made since your last visit, click the following link:
+{U_NEWEST_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt
new file mode 100644
index 0000000000..96fd527c8f
--- /dev/null
+++ b/phpBB/language/en/email/notifications/quote.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic, "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
+
+If you want to view the quoted post, click the following link:
+{U_QUOTED_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies quoting you, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
\ No newline at end of file
-- 
cgit v1.2.1


From 0c56bd45eff15b0bff2672ed08b390d0248625d8 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 23 Jul 2012 13:15:08 -0500
Subject: [ticket/11021] Better language strings for site home url/text

Correct the logo title to be {L_HOME} if {U_HOME} is used.

Check if the Home text is instead of just equal to false when
outputting it to the template

PHPBB3-11021
---
 phpBB/language/en/acp/board.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 6b043b887d..b80aec1f4a 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -45,14 +45,14 @@ $lang = array_merge($lang, array(
 	'DISABLE_BOARD'					=> 'Disable board',
 	'DISABLE_BOARD_EXPLAIN'			=> 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
 	'DISPLAY_LAST_SUBJECT'			=> 'Display subject of last added post on forum list',
-	'DISPLAY_LAST_SUBJECT_EXPLAIN'	=> 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesn’t have read access are not shown.',	
+	'DISPLAY_LAST_SUBJECT_EXPLAIN'	=> 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesn’t have read access are not shown.',
 	'OVERRIDE_STYLE'				=> 'Override user style',
 	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
 	'SITE_DESC'						=> 'Site description',
-	'SITE_HOME_TEXT'				=> 'Site home text',
-	'SITE_HOME_TEXT_EXPLAIN'		=> 'Specify a Site Home Text to use your own instead of the default text in the breadcrumbs ’Home.’',
-	'SITE_HOME_URL'					=> 'Site home URL',
-	'SITE_HOME_URL_EXPLAIN'			=> 'If you specify a Site Home URL, a link to this page will be added to your board’s breadcrumbs and the site logo will also be linked to this address.',
+	'SITE_HOME_TEXT'				=> 'Main website text',
+	'SITE_HOME_TEXT_EXPLAIN'		=> 'This text will be displayed as a link to your website homepage in the board’s breadcrumbs. If not specified, it will default to ’Home’.',
+	'SITE_HOME_URL'					=> 'Main website URL',
+	'SITE_HOME_URL_EXPLAIN'			=> 'If specified, a link to this URL will be prepended to your board’s breadcrumbs. The board logo will also link to this URL.',
 	'SITE_NAME'						=> 'Site name',
 	'SYSTEM_TIMEZONE'				=> 'Guest timezone',
 	'SYSTEM_TIMEZONE_EXPLAIN'			=> 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.',
-- 
cgit v1.2.1


From 9e5505933aec5a57e57018e6375be0bf28636fbe Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 11:10:25 -0500
Subject: [ticket/11021] Fix the language changes that were lost previously

Change U_HOME to U_SITE_HOME

PHPBB3-11021
---
 phpBB/language/en/acp/board.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index b80aec1f4a..a4597a1014 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -50,9 +50,9 @@ $lang = array_merge($lang, array(
 	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
 	'SITE_DESC'						=> 'Site description',
 	'SITE_HOME_TEXT'				=> 'Main website text',
-	'SITE_HOME_TEXT_EXPLAIN'		=> 'This text will be displayed as a link to your website homepage in the board’s breadcrumbs. If not specified, it will default to ’Home’.',
+	'SITE_HOME_TEXT_EXPLAIN'		=> 'This text will be displayed as a link to your website homepage in the board’s breadcrumbs. If not specified, it will default to “Home”.',
 	'SITE_HOME_URL'					=> 'Main website URL',
-	'SITE_HOME_URL_EXPLAIN'			=> 'If specified, a link to this URL will be prepended to your board’s breadcrumbs. The board logo will also link to this URL.',
+	'SITE_HOME_URL_EXPLAIN'			=> 'If specified, a link to this URL will be prepended to your board’s breadcrumbs and the board logo will link to this URL instead of the forum index. An absolute URL is required, e.g. <samp>http://www.phpbb.com</samp>.',
 	'SITE_NAME'						=> 'Site name',
 	'SYSTEM_TIMEZONE'				=> 'Guest timezone',
 	'SYSTEM_TIMEZONE_EXPLAIN'			=> 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.',
-- 
cgit v1.2.1


From 05b573ebf76c737f89deaefd22ce963aa910e5d1 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 13:51:02 -0500
Subject: [ticket/11103] Topic and post dis/approval notifications

Remove the formatted title function, plaintext is not needed since
email templates are used

Fix a number of bugs.

PHPBB3-11103
---
 phpBB/language/en/common.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 3e69c6bb03..4229b41fb8 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -385,12 +385,16 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
-	'NOTIFICATIONS'				=> '[ Notifications ]',
-	'NOTIFICATION_BOOKMARK'		=> '%1$s replied to the topic "%2$s" you have bookmarked.',
-	'NOTIFICATION_PM'			=> '%1$s sent you a Private Message "%2$s".',
-	'NOTIFICATION_POST'			=> '%1$s replied to the topic "%2$s".',
-	'NOTIFICATION_QUOTE'		=> '%1$s quoted you in the post "%2$s".',
-	'NOTIFICATION_TOPIC'		=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
+	'NOTIFICATIONS'						=> '[ Notifications ]',
+	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
+	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
+	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
+	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
+	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved because "%2$s".',
+	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
+	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
+	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
+	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved because "%2$s".',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
 	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
-- 
cgit v1.2.1


From 7454d5c2d526f237bf24825b80edf6c9f1750fc6 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 14:33:15 -0500
Subject: [ticket/11103] Topic/Post in queue notification

Also, bug fixes and cleanup

PHPBB3-11103
---
 phpBB/language/en/common.php                            |  2 ++
 phpBB/language/en/email/notifications/post_in_queue.txt | 17 +++++++++++++++++
 phpBB/language/en/email/notifications/quote.txt         |  2 +-
 .../language/en/email/notifications/topic_in_queue.txt  | 17 +++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/language/en/email/notifications/post_in_queue.txt
 create mode 100644 phpBB/language/en/email/notifications/topic_in_queue.txt

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 4229b41fb8..90acd0854b 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -391,10 +391,12 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved because "%2$s".',
+	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
 	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved because "%2$s".',
+	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
 	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt
new file mode 100644
index 0000000000..5ce2b8fe09
--- /dev/null
+++ b/phpBB/language/en/email/notifications/post_in_queue.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the post, "{POST_SUBJECT}" at "{SITENAME}" needs approval.
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt
index 96fd527c8f..8b8584a794 100644
--- a/phpBB/language/en/email/notifications/quote.txt
+++ b/phpBB/language/en/email/notifications/quote.txt
@@ -5,7 +5,7 @@ Hello {USERNAME},
 You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic, "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
 
 If you want to view the quoted post, click the following link:
-{U_QUOTED_POST}
+{U_VIEW_POST}
 
 If you want to view the topic, click the following link:
 {U_TOPIC}
diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt
new file mode 100644
index 0000000000..17c8b15880
--- /dev/null
+++ b/phpBB/language/en/email/notifications/topic_in_queue.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the topic , "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
+
+If you want to view the topic, click the following link:
+{U_VIEW_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
\ No newline at end of file
-- 
cgit v1.2.1


From 661dd09d6f44b46e5a30b37bb3425058f055ea01 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 16 Sep 2012 23:03:00 -0500
Subject: [ticket/11103] Bug fix

PHPBB3-11103
---
 phpBB/language/en/email/notifications/topic_in_queue.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt
index 17c8b15880..e1ff486ac5 100644
--- a/phpBB/language/en/email/notifications/topic_in_queue.txt
+++ b/phpBB/language/en/email/notifications/topic_in_queue.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the topic , "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
+You are receiving this notification because the topic, "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
 
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
-- 
cgit v1.2.1


From 98731b127748af4673fdee92db2e139e84fd4d4b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 20 Sep 2012 10:36:11 -0500
Subject: [ticket/11103] Prettify the output for prosilver.

Create a way to mark items read from the output list.

PHPBB3-11103
---
 phpBB/language/en/common.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 90acd0854b..8ad7628891 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -347,6 +347,7 @@ $lang = array_merge($lang, array(
 	'MARK'					=> 'Mark',
 	'MARK_ALL'				=> 'Mark all',
 	'MARK_FORUMS_READ'		=> 'Mark forums read',
+	'MARK_READ'				=> 'Mark read',
 	'MARK_SUBFORUMS_READ'	=> 'Mark subforums read',
 	'MB'					=> 'MB',
 	'MIB'					=> 'MiB',
@@ -385,7 +386,7 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
-	'NOTIFICATIONS'						=> '[ Notifications ]',
+	'NOTIFICATIONS'						=> 'Notifications',
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
-- 
cgit v1.2.1


From e66117409c68242832f76cdb456d16c40573639e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 26 Sep 2012 22:39:12 -0500
Subject: [ticket/11103] More work on the UCP Notifications page

PHPBB3-11103
---
 phpBB/language/en/ucp.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 648de587aa..85845d2b27 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -287,6 +287,18 @@ $lang = array_merge($lang, array(
 	'NEW_PASSWORD'					=> 'New password',
 	'NEW_PASSWORD_CONFIRM_EMPTY'	=> 'You did not enter a confirm password.',
 	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
+
+	'NOTIFICATION_METHOD_EMAIL'					=> 'Email',
+	'NOTIFICATION_METHOD_JABBER'				=> 'Jabber',
+	'NOTIFICATION_TYPE'							=> 'Notification type',
+	'NOTIFICATION_TYPE_BOOKMARK'				=> 'Someone replies to a topic you have bookmarked',
+	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'		=> 'A post or topic needs approval',
+	'NOTIFICATION_TYPE_MODERATION_QUEUE'   		=> 'Your topics/posts are approved or disapproved by a moderator',
+	'NOTIFICATION_TYPE_PM'						=> 'Someone sends you a private message',
+	'NOTIFICATION_TYPE_POST'					=> 'Someone replies to a topic you are subscribed to',
+	'NOTIFICATION_TYPE_QUOTE'					=> 'Someone quotes you in a post',
+	'NOTIFICATION_TYPE_TOPIC'					=> 'Someone creates a topic in a forum you are subscribed to',
+
 	'NOTIFY_METHOD'					=> 'Notification method',
 	'NOTIFY_METHOD_BOTH'			=> 'Both',
 	'NOTIFY_METHOD_EMAIL'			=> 'Email only',
@@ -456,6 +468,8 @@ $lang = array_merge($lang, array(
 	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
+	'UCP_NOTIFICATION_OPTIONS'	=> 'Notification Options',
+
 	'UCP_PREFS'					=> 'Board preferences',
 	'UCP_PREFS_PERSONAL'		=> 'Edit global settings',
 	'UCP_PREFS_POST'			=> 'Edit posting defaults',
-- 
cgit v1.2.1


From 544fbe35f4b5cd12e4556c9c300f471a4092dc41 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 26 Sep 2012 22:59:22 -0500
Subject: [ticket/11103] Some tweaks to the template output

PHPBB3-11103
---
 phpBB/language/en/ucp.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 85845d2b27..66662d2f63 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -288,16 +288,16 @@ $lang = array_merge($lang, array(
 	'NEW_PASSWORD_CONFIRM_EMPTY'	=> 'You did not enter a confirm password.',
 	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
 
-	'NOTIFICATION_METHOD_EMAIL'					=> 'Email',
-	'NOTIFICATION_METHOD_JABBER'				=> 'Jabber',
-	'NOTIFICATION_TYPE'							=> 'Notification type',
-	'NOTIFICATION_TYPE_BOOKMARK'				=> 'Someone replies to a topic you have bookmarked',
-	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'		=> 'A post or topic needs approval',
-	'NOTIFICATION_TYPE_MODERATION_QUEUE'   		=> 'Your topics/posts are approved or disapproved by a moderator',
-	'NOTIFICATION_TYPE_PM'						=> 'Someone sends you a private message',
-	'NOTIFICATION_TYPE_POST'					=> 'Someone replies to a topic you are subscribed to',
-	'NOTIFICATION_TYPE_QUOTE'					=> 'Someone quotes you in a post',
-	'NOTIFICATION_TYPE_TOPIC'					=> 'Someone creates a topic in a forum you are subscribed to',
+	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
+	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
+	'NOTIFICATION_TYPE'									=> 'Notification type',
+	'NOTIFICATION_TYPE_BOOKMARK'						=> 'Someone replies to a topic you have bookmarked',
+	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'				=> 'A post or topic needs approval',
+	'NOTIFICATION_TYPE_MODERATION_QUEUE'   				=> 'Your topics/posts are approved or disapproved by a moderator',
+	'NOTIFICATION_TYPE_PM'								=> 'Someone sends you a private message',
+	'NOTIFICATION_TYPE_POST'							=> 'Someone replies to a topic you are subscribed to',
+	'NOTIFICATION_TYPE_QUOTE'							=> 'Someone quotes you in a post',
+	'NOTIFICATION_TYPE_TOPIC'				   			=> 'Someone creates a topic in a forum you are subscribed to',
 
 	'NOTIFY_METHOD'					=> 'Notification method',
 	'NOTIFY_METHOD_BOTH'			=> 'Both',
@@ -468,7 +468,7 @@ $lang = array_merge($lang, array(
 	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
-	'UCP_NOTIFICATION_OPTIONS'	=> 'Notification Options',
+	'UCP_NOTIFICATION_OPTIONS'	=> 'Notification options',
 
 	'UCP_PREFS'					=> 'Board preferences',
 	'UCP_PREFS_PERSONAL'		=> 'Edit global settings',
-- 
cgit v1.2.1


From 48ccc9eb93c8413f05f6a50d40e597f560c671d8 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 18:25:37 -0500
Subject: [ticket/11103] UCP Notification Options can now be set

PHPBB3-11103
---
 phpBB/language/en/common.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 8ad7628891..43bc6328fe 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -386,7 +386,10 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
-	'NOTIFICATIONS'						=> 'Notifications',
+	'NOTIFICATIONS_CNT'			=> array(
+		1	=> '%d Notification',
+		2	=> '%d Notifications',
+	),
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
-- 
cgit v1.2.1


From dfb17f444ae560a0af1b242cfbf85008cd993816 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 19:04:47 -0500
Subject: [ticket/11103] Fix module setup, add explanation to template

PHPBB3-11103
---
 phpBB/language/en/ucp.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 66662d2f63..843039635c 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -468,7 +468,8 @@ $lang = array_merge($lang, array(
 	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
-	'UCP_NOTIFICATION_OPTIONS'	=> 'Notification options',
+	'UCP_NOTIFICATION_OPTIONS'			=> 'Notification options',
+	'UCP_NOTIFICATION_OPTIONS_EXPLAIN'	=> 'Here you can set your preferred notification methods for the board.',
 
 	'UCP_PREFS'					=> 'Board preferences',
 	'UCP_PREFS_PERSONAL'		=> 'Edit global settings',
-- 
cgit v1.2.1


From 521992215cfaac6ae22421325fbcfb0c3fefecb7 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 19:08:22 -0500
Subject: [ticket/11103] Language key needed in the UCP

PHPBB3-11103
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 843039635c..7ad860673b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -288,6 +288,7 @@ $lang = array_merge($lang, array(
 	'NEW_PASSWORD_CONFIRM_EMPTY'	=> 'You did not enter a confirm password.',
 	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
 
+	'NOTIFICATIONS'										=> 'Notifications',
 	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
 	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
 	'NOTIFICATION_TYPE'									=> 'Notification type',
-- 
cgit v1.2.1


From 07fb66ac1090dfe92431ed749b520115595f7927 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Oct 2012 14:31:00 -0500
Subject: [ticket/11103] Do not abbreviate template output

PHPBB3-11103
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 43bc6328fe..f05ce5b175 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -386,7 +386,7 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
-	'NOTIFICATIONS_CNT'			=> array(
+	'NOTIFICATIONS_COUNT'		=> array(
 		1	=> '%d Notification',
 		2	=> '%d Notifications',
 	),
-- 
cgit v1.2.1


From 0bab8ff777bcb82361b75441c085ee2e510db5cc Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Oct 2012 13:43:03 -0500
Subject: [ticket/11103] ACP option to enable/disable notifications output in
 header

PHPBB3-11103
---
 phpBB/language/en/acp/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 5eb10d50b3..0096a84878 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -250,6 +250,8 @@ $lang = array_merge($lang, array(
 	'IP'					=> 'User IP',
 	'IP_HOSTNAME'			=> 'IP addresses or hostnames',
 
+	'LOAD_NOTIFICATIONS'			=> 'Display Notifications',
+	'LOAD_NOTIFICATIONS_EXPLAIN'	=> 'Display the notifications list on every page (typically in the header).',
 	'LOGGED_IN_AS'			=> 'You are logged in as:',
 	'LOGIN_ADMIN'			=> 'To administer the board you must be an authenticated user.',
 	'LOGIN_ADMIN_CONFIRM'	=> 'To administer the board you must re-authenticate yourself.',
-- 
cgit v1.2.1


From 948bd69495175db6967c0f5e99c3e0ba31e1882a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Oct 2012 13:54:27 -0500
Subject: [ticket/11103] Move UCP Notification Options to Board Preferences tab

Also rename to "Edit notification options" for consistency

PHPBB3-11103
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 7ad860673b..78f863541c 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -469,7 +469,7 @@ $lang = array_merge($lang, array(
 	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
-	'UCP_NOTIFICATION_OPTIONS'			=> 'Notification options',
+	'UCP_NOTIFICATION_OPTIONS'			=> 'Edit notification options',
 	'UCP_NOTIFICATION_OPTIONS_EXPLAIN'	=> 'Here you can set your preferred notification methods for the board.',
 
 	'UCP_PREFS'					=> 'Board preferences',
-- 
cgit v1.2.1


From b33e5273942c4f67e8168763eec224fd61edaa8f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 9 Oct 2012 22:02:49 -0500
Subject: [ticket/11103] Working on report notifications (post/pm)

PHPBB3-11103
---
 phpBB/language/en/common.php                          |  1 +
 phpBB/language/en/email/notifications/report_post.txt | 17 +++++++++++++++++
 phpBB/language/en/ucp.php                             |  1 +
 3 files changed, 19 insertions(+)
 create mode 100644 phpBB/language/en/email/notifications/report_post.txt

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index f05ce5b175..ae487f7159 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -397,6 +397,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved because "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
+	'NOTIFICATION_REPORT'				=> 'A post "%1$s" was reported because "%2$s".',
 	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved because "%2$s".',
diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt
new file mode 100644
index 0000000000..f0863d346e
--- /dev/null
+++ b/phpBB/language/en/email/notifications/report_post.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the post, "{POST_SUBJECT}" at "{SITENAME}" was reported.
+
+If you want to view the report, click the following link:
+{U_VIEW_REPORT}
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 78f863541c..e2dbd542f9 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -298,6 +298,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TYPE_PM'								=> 'Someone sends you a private message',
 	'NOTIFICATION_TYPE_POST'							=> 'Someone replies to a topic you are subscribed to',
 	'NOTIFICATION_TYPE_QUOTE'							=> 'Someone quotes you in a post',
+	'NOTIFICATION_TYPE_REPORT'							=> 'Someone reports a post',
 	'NOTIFICATION_TYPE_TOPIC'				   			=> 'Someone creates a topic in a forum you are subscribed to',
 
 	'NOTIFY_METHOD'					=> 'Notification method',
-- 
cgit v1.2.1


From 6d53bd4675e00419bcfcf476b03166b9774bebca Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 9 Oct 2012 22:28:41 -0500
Subject: [ticket/11103] Finishing up PM Report notifications

PHPBB3-11103
---
 phpBB/language/en/common.php                        |  3 ++-
 phpBB/language/en/email/notifications/report_pm.txt | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/language/en/email/notifications/report_pm.txt

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index ae487f7159..cbf8e6ee4c 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -397,7 +397,8 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved because "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
-	'NOTIFICATION_REPORT'				=> 'A post "%1$s" was reported because "%2$s".',
+	'NOTIFICATION_REPORT_PM'			=> 'A Private Message "%1$s" was reported because "%2$s".',
+	'NOTIFICATION_REPORT_POST'			=> 'A post "%1$s" was reported because "%2$s".',
 	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved because "%2$s".',
diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt
new file mode 100644
index 0000000000..eeaa8ee9b9
--- /dev/null
+++ b/phpBB/language/en/email/notifications/report_pm.txt
@@ -0,0 +1,14 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because a Private Message titled, "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
+
+If you want to view the report, click the following link:
+{U_VIEW_REPORT}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
\ No newline at end of file
-- 
cgit v1.2.1


From 1b56a1d6be12afb851a158a5e09965a6528d1435 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Oct 2012 22:36:48 -0500
Subject: [ticket/11103] Finishing up report post/pm and adding report closed

PHPBB3-11103
---
 phpBB/language/en/common.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index cbf8e6ee4c..78ba02ed0f 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -397,8 +397,9 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved because "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
-	'NOTIFICATION_REPORT_PM'			=> 'A Private Message "%1$s" was reported because "%2$s".',
-	'NOTIFICATION_REPORT_POST'			=> 'A post "%1$s" was reported because "%2$s".',
+	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" because "%3$s".',
+	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" because "%3$s".',
+	'NOTIFICATION_REPORT_CLOSED'   		=> '%1$s closed the report you made for "%2$s".',
 	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved because "%2$s".',
-- 
cgit v1.2.1


From cb937841269017d13058208378e4c9ad79718c6e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 20:02:38 -0500
Subject: [ticket/11103] UCP Notification List

PHPBB3-11103
---
 phpBB/language/en/ucp.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index e2dbd542f9..d75609880b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -289,6 +289,9 @@ $lang = array_merge($lang, array(
 	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
 
 	'NOTIFICATIONS'										=> 'Notifications',
+	'NOTIFICATIONS_MARK_ALL_READ'						=> 'Mark all notifications read',
+	'NOTIFICATIONS_MARK_ALL_READ_CONFIRM'				=> 'Are you sure you want to mark all notifications read?',
+	'NOTIFICATIONS_MARK_ALL_READ_SUCCESS'				=> 'All notifications have been marked read successfully.',
 	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
 	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
 	'NOTIFICATION_TYPE'									=> 'Notification type',
@@ -470,6 +473,8 @@ $lang = array_merge($lang, array(
 	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
+	'UCP_NOTIFICATION_LIST'				=> 'Manage notifications',
+	'UCP_NOTIFICATION_LIST_EXPLAIN'		=> 'Here you may view all past notifications.',
 	'UCP_NOTIFICATION_OPTIONS'			=> 'Edit notification options',
 	'UCP_NOTIFICATION_OPTIONS_EXPLAIN'	=> 'Here you can set your preferred notification methods for the board.',
 
-- 
cgit v1.2.1


From c5f280351a96aaebd90c27da095c9b1ff28624a5 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 23:52:49 -0500
Subject: [ticket/11103] UCP Notification option grouping

Also add the ability to specify an _EXPLAIN text for the notification option

PHPBB3-11103
---
 phpBB/language/en/ucp.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index d75609880b..1d17ed5caf 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -292,6 +292,9 @@ $lang = array_merge($lang, array(
 	'NOTIFICATIONS_MARK_ALL_READ'						=> 'Mark all notifications read',
 	'NOTIFICATIONS_MARK_ALL_READ_CONFIRM'				=> 'Are you sure you want to mark all notifications read?',
 	'NOTIFICATIONS_MARK_ALL_READ_SUCCESS'				=> 'All notifications have been marked read successfully.',
+	'NOTIFICATION_GROUP_MISCELLANEOUS'					=> 'Miscellaneous Notifications',
+	'NOTIFICATION_GROUP_MODERATION'						=> 'Moderation Notifications',
+	'NOTIFICATION_GROUP_POSTING'						=> 'Posting Notifications',
 	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
 	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
 	'NOTIFICATION_TYPE'									=> 'Notification type',
-- 
cgit v1.2.1


From 716635c834dd2d6644f3d47c67f7184f95a35c0b Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 10:58:23 -0500
Subject: [ticket/11103] Fix some language strings

Newlines at end of email files

PHPBB3-11103
---
 phpBB/language/en/common.php                             | 8 ++++----
 phpBB/language/en/email/notifications/bookmark.txt       | 4 ++--
 phpBB/language/en/email/notifications/post_in_queue.txt  | 2 +-
 phpBB/language/en/email/notifications/quote.txt          | 2 +-
 phpBB/language/en/email/notifications/report_pm.txt      | 2 +-
 phpBB/language/en/email/notifications/report_post.txt    | 2 +-
 phpBB/language/en/email/notifications/topic_in_queue.txt | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 78ba02ed0f..2f9f646cd3 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -394,15 +394,15 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
-	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved because "%2$s".',
+	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved for reason: "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
-	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" because "%3$s".',
-	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" because "%3$s".',
+	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
+	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" for reason: "%3$s".',
 	'NOTIFICATION_REPORT_CLOSED'   		=> '%1$s closed the report you made for "%2$s".',
 	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
-	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved because "%2$s".',
+	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved for reason: "%2$s".',
 	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by "%1$s" and needs approval.',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
diff --git a/phpBB/language/en/email/notifications/bookmark.txt b/phpBB/language/en/email/notifications/bookmark.txt
index 9888008604..95f17b5693 100644
--- a/phpBB/language/en/email/notifications/bookmark.txt
+++ b/phpBB/language/en/email/notifications/bookmark.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}" has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
 
 If you want to view the newest post made since your last visit, click the following link:
 {U_NEWEST_POST}
@@ -17,4 +17,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
 
 {U_NOTIFICATION_SETTINGS}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt
index 5ce2b8fe09..5208182a70 100644
--- a/phpBB/language/en/email/notifications/post_in_queue.txt
+++ b/phpBB/language/en/email/notifications/post_in_queue.txt
@@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
 
 {U_NOTIFICATION_SETTINGS}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt
index 8b8584a794..0efcf7940c 100644
--- a/phpBB/language/en/email/notifications/quote.txt
+++ b/phpBB/language/en/email/notifications/quote.txt
@@ -17,4 +17,4 @@ If you no longer wish to receive updates about replies quoting you, please updat
 
 {U_NOTIFICATION_SETTINGS}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt
index eeaa8ee9b9..f515242893 100644
--- a/phpBB/language/en/email/notifications/report_pm.txt
+++ b/phpBB/language/en/email/notifications/report_pm.txt
@@ -11,4 +11,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
 
 {U_NOTIFICATION_SETTINGS}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt
index f0863d346e..4ece935ccb 100644
--- a/phpBB/language/en/email/notifications/report_post.txt
+++ b/phpBB/language/en/email/notifications/report_post.txt
@@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
 
 {U_NOTIFICATION_SETTINGS}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt
index e1ff486ac5..782fc4d629 100644
--- a/phpBB/language/en/email/notifications/topic_in_queue.txt
+++ b/phpBB/language/en/email/notifications/topic_in_queue.txt
@@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda
 
 {U_NOTIFICATION_SETTINGS}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
-- 
cgit v1.2.1


From a48f09033810148fd9b2d5a0b6a683f14ac73a6a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 12:35:35 -0500
Subject: [ticket/11103] Make sure notifications are marked read when clicking
 them

How do we do this? If an item is unread, the URL to view that item will
be the URL to mark it as read (index.php?mark_notification=$id). When the
URL is visited it marks the item as read and redirects them to the correct
URL for the item.

If the item is read, the URL is directly to the item.

Prettify the html output

PHPBB-11103
---
 phpBB/language/en/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 2f9f646cd3..8980c274ef 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -395,7 +395,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved for reason: "%2$s".',
-	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by "%1$s" and needs approval.',
+	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by %1$s and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
 	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
 	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" for reason: "%3$s".',
@@ -403,7 +403,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved for reason: "%2$s".',
-	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by "%1$s" and needs approval.',
+	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by %1$s and needs approval.',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
 	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
-- 
cgit v1.2.1


From 31502cdd6c3a5bac5164ec30530e5b4bf63f3196 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 12:45:04 -0500
Subject: [ticket/11103] Fix comma usage

https://github.com/phpbb/phpbb3/pull/992#discussion_r1837084

PHPBB3-11103
---
 phpBB/language/en/email/forum_notify.txt                 | 2 +-
 phpBB/language/en/email/newtopic_notify.txt              | 2 +-
 phpBB/language/en/email/notifications/post_in_queue.txt  | 2 +-
 phpBB/language/en/email/notifications/quote.txt          | 2 +-
 phpBB/language/en/email/notifications/report_pm.txt      | 2 +-
 phpBB/language/en/email/notifications/report_post.txt    | 2 +-
 phpBB/language/en/email/notifications/topic_in_queue.txt | 2 +-
 phpBB/language/en/email/topic_notify.txt                 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt
index fae5a83885..bbfd3ad7e7 100644
--- a/phpBB/language/en/email/forum_notify.txt
+++ b/phpBB/language/en/email/forum_notify.txt
@@ -2,7 +2,7 @@ Subject: Forum post notification - "{FORUM_NAME}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
 
 {U_NEWEST_POST}
 
diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt
index 529bbf0f8f..badc48b5a9 100644
--- a/phpBB/language/en/email/newtopic_notify.txt
+++ b/phpBB/language/en/email/newtopic_notify.txt
@@ -2,7 +2,7 @@ Subject: New topic notification - "{FORUM_NAME}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
+You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
 
 {U_FORUM}
 
diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt
index 5208182a70..8d56ce6c4d 100644
--- a/phpBB/language/en/email/notifications/post_in_queue.txt
+++ b/phpBB/language/en/email/notifications/post_in_queue.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the post, "{POST_SUBJECT}" at "{SITENAME}" needs approval.
+You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" needs approval.
 
 If you want to view the post, click the following link:
 {U_VIEW_POST}
diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt
index 0efcf7940c..2b9525801f 100644
--- a/phpBB/language/en/email/notifications/quote.txt
+++ b/phpBB/language/en/email/notifications/quote.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic, "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
+You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
 
 If you want to view the quoted post, click the following link:
 {U_VIEW_POST}
diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt
index f515242893..66ae82d074 100644
--- a/phpBB/language/en/email/notifications/report_pm.txt
+++ b/phpBB/language/en/email/notifications/report_pm.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because a Private Message titled, "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
+You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
 
 If you want to view the report, click the following link:
 {U_VIEW_REPORT}
diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt
index 4ece935ccb..46983be1ed 100644
--- a/phpBB/language/en/email/notifications/report_post.txt
+++ b/phpBB/language/en/email/notifications/report_post.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the post, "{POST_SUBJECT}" at "{SITENAME}" was reported.
+You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported.
 
 If you want to view the report, click the following link:
 {U_VIEW_REPORT}
diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt
index 782fc4d629..ae8f9e2484 100644
--- a/phpBB/language/en/email/notifications/topic_in_queue.txt
+++ b/phpBB/language/en/email/notifications/topic_in_queue.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because the topic, "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
+You are receiving this notification because the topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
 
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
index 99587b28e0..a6a3d2df36 100644
--- a/phpBB/language/en/email/topic_notify.txt
+++ b/phpBB/language/en/email/topic_notify.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the topic, "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
 
 If you want to view the newest post made since your last visit, click the following link:
 {U_NEWEST_POST}
-- 
cgit v1.2.1


From 7c2cc9cfeface2ea4267dca204f56f794e3418af Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 15 Oct 2012 14:02:16 +0200
Subject: [feature/soft-delete] Turn restore_post() into a method and add the
 docs

PHPBB3-9567
---
 phpBB/language/en/mcp.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 95d09028ce..fee3ac47e4 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -269,15 +269,17 @@ $lang = array_merge($lang, array(
 	'POSTS_DISAPPROVED_SUCCESS'	=> 'The selected posts have been disapproved.',
 	'POSTS_LOCKED_SUCCESS'		=> 'The selected posts have been locked successfully.',
 	'POSTS_MERGED_SUCCESS'		=> 'The selected posts have been merged.',
-	'POSTS_UNLOCKED_SUCCESS'	=> 'The selected posts have been unlocked successfully.',
 	'POSTS_PER_PAGE'			=> 'Posts per page',
 	'POSTS_PER_PAGE_EXPLAIN'	=> '(Set to 0 to view all posts.)',
+	'POSTS_RESTORED_SUCCESS'	=> 'The selected posts have been restored successfully.',
+	'POSTS_UNLOCKED_SUCCESS'	=> 'The selected posts have been unlocked successfully.',
 	'POST_APPROVED_SUCCESS'		=> 'The selected post has been approved.',
 	'POST_DELETED_SUCCESS'		=> 'The selected post has been successfully removed from the database.',
 	'POST_DISAPPROVED_SUCCESS'	=> 'The selected post has been disapproved.',
 	'POST_LOCKED_SUCCESS'		=> 'Post locked successfully.',
 	'POST_NOT_EXIST'			=> 'The post you requested does not exist.',
 	'POST_REPORTED_SUCCESS'		=> 'This post has been successfully reported.',
+	'POST_RESTORED_SUCCESS'		=> 'This post has been restored successfully.',
 	'POST_UNLOCKED_SUCCESS'		=> 'Post unlocked successfully.',
 
 	'READ_USERNOTES'			=> 'User notes',
-- 
cgit v1.2.1


From b1ce8a8c13eca920abf3659fcbfec267684071bb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 15 Oct 2012 15:19:32 +0200
Subject: [feature/soft-delete] Add checkbox to restoring posts like on approve

PHPBB3-9567
---
 phpBB/language/en/mcp.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index fee3ac47e4..327c0fba69 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -306,6 +306,11 @@ $lang = array_merge($lang, array(
 	'REPORT_POST_EXPLAIN'		=> 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
 	'REPORT_REASON'				=> 'Report reason',
 	'REPORT_TIME'				=> 'Report time',
+	'RESTORE'				=> 'Restore',
+	'RESTORE_POST'			=> 'Restore post',
+	'RESTORE_POST_CONFIRM'	=> 'Are you sure you want to restore this post?',
+	'RESTORE_POSTS'			=> 'Restore posts',
+	'RESTORE_POSTS_CONFIRM'	=> 'Are you sure you want to restore the selected posts?',
 	'RESYNC'					=> 'Resync',
 	'RETURN_MESSAGE'			=> '%sReturn to the message%s',
 	'RETURN_NEW_FORUM'			=> '%sGo to the new forum%s',
-- 
cgit v1.2.1


From 33073fafbe53cb103e9e00bceb249a0879a2eb9c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 15 Oct 2012 15:53:32 +0200
Subject: [feature/soft-delete] Add module for soft deleted topics

Unapproved/soft deleted posts are posts, that have a different visibility than
the topic. All others will be hidden from the posts list and can be managed
with the topic modules.

PHPBB3-9567
---
 phpBB/language/en/mcp.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 327c0fba69..a19fa36295 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -203,6 +203,8 @@ $lang = array_merge($lang, array(
 	'MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN'	=> 'This is a list of all topics which require approving before they will be visible to users.',
 	'MCP_QUEUE_DELETED_POSTS'				=> 'Deleted posts',
 	'MCP_QUEUE_DELETED_POSTS_EXPLAIN'		=> 'This is a list of all posts which have been soft deleted. You can restore or permanently delete the posts from this screen.',
+	'MCP_QUEUE_DELETED_TOPICS'				=> 'Deleted topics',
+	'MCP_QUEUE_DELETED_TOPICS_EXPLAIN'		=> 'This is a list of all topics which have been soft deleted. You can restore or permanently delete the topics from this screen.',
 
 	'MCP_VIEW_USER'			=> 'View warnings for a specific user',
 
@@ -240,6 +242,7 @@ $lang = array_merge($lang, array(
 	'NO_POST'						=> 'You have to select a post in order to warn the user for a post.',
 	'NO_POST_REPORT'				=> 'This post was not reported.',
 	'NO_POST_SELECTED'				=> 'You must select at least one post to perform this action.',
+	'NO_POSTS_DELETED'				=> 'There are no soft deleted posts.',
 	'NO_POSTS_QUEUE'				=> 'There are no posts waiting for approval.',
 	'NO_REASON_DISAPPROVAL'			=> 'Please give an appropriate reason for disapproval.',
 	'NO_REPORT'						=> 'No report found',
@@ -247,6 +250,7 @@ $lang = array_merge($lang, array(
 	'NO_REPORT_SELECTED'			=> 'You must select at least one report to perform this action.',
 	'NO_TOPIC_ICON'					=> 'None',
 	'NO_TOPIC_SELECTED'				=> 'You must select at least one topic to perform this action.',
+	'NO_TOPICS_DELETED'				=> 'There are no soft deleted topics.',
 	'NO_TOPICS_QUEUE'				=> 'There are no topics waiting for approval.',
 
 	'ONLY_TOPIC'			=> 'Only topic “%s”',
-- 
cgit v1.2.1


From 61a1467c90e865f43c359bb8678d27b5e571f21f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 16:47:18 -0500
Subject: [ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link

PHPBB3-11103
---
 phpBB/language/en/common.php | 2 ++
 phpBB/language/en/ucp.php    | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 8980c274ef..75c681e86a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -386,6 +386,7 @@ $lang = array_merge($lang, array(
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
+	'NOTIFICATIONS'				=> 'Notifications',
 	'NOTIFICATIONS_COUNT'		=> array(
 		1	=> '%d Notification',
 		2	=> '%d Notifications',
@@ -591,6 +592,7 @@ $lang = array_merge($lang, array(
 	'SEARCH_UNREAD'				=> 'View unread posts',
 	'SEARCH_USER_POSTS'			=> 'Search user’s posts',
 	'SECONDS'					=> 'Seconds',
+	'SEE_ALL'					=> 'See All',
 	'SELECT'					=> 'Select',
 	'SELECT_ALL_CODE'			=> 'Select all',
 	'SELECT_DESTINATION_FORUM'	=> 'Please select a destination forum',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 1d17ed5caf..a09f0a62a1 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -288,7 +288,6 @@ $lang = array_merge($lang, array(
 	'NEW_PASSWORD_CONFIRM_EMPTY'	=> 'You did not enter a confirm password.',
 	'NEW_PASSWORD_ERROR'			=> 'The passwords you entered do not match.',
 
-	'NOTIFICATIONS'										=> 'Notifications',
 	'NOTIFICATIONS_MARK_ALL_READ'						=> 'Mark all notifications read',
 	'NOTIFICATIONS_MARK_ALL_READ_CONFIRM'				=> 'Are you sure you want to mark all notifications read?',
 	'NOTIFICATIONS_MARK_ALL_READ_SUCCESS'				=> 'All notifications have been marked read successfully.',
-- 
cgit v1.2.1


From 6861af22eecfa4a254eb62245ee109d8e5635f93 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 19:19:26 -0500
Subject: [ticket/11103] Message of no notifications if you have none

PHPBB3-11103
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 75c681e86a..f3c597af89 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -382,6 +382,7 @@ $lang = array_merge($lang, array(
 	'NEXT_STEP'					=> 'Next',
 	'NEVER'						=> 'Never',
 	'NO'						=> 'No',
+	'NO_NOTIFICATIONS'			=> 'You have no notifications',
 	'NOT_ALLOWED_MANAGE_GROUP'	=> 'You are not allowed to manage this group.',
 	'NOT_AUTHORISED'			=> 'You are not authorised to access this area.',
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
-- 
cgit v1.2.1


From 94d682f77431add84867bb0b196ad0719b293606 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 20:54:18 -0500
Subject: [ticket/11103] Use the full class name as the item_type/method

This is going to require you recreate the db tables.

PHPBB3-11103
---
 phpBB/language/en/ucp.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 7c3960204a..5b1e7add02 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -295,8 +295,6 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_GROUP_MISCELLANEOUS'					=> 'Miscellaneous Notifications',
 	'NOTIFICATION_GROUP_MODERATION'						=> 'Moderation Notifications',
 	'NOTIFICATION_GROUP_POSTING'						=> 'Posting Notifications',
-	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
-	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
 	'NOTIFICATION_TYPE'									=> 'Notification type',
 	'NOTIFICATION_TYPE_BOOKMARK'						=> 'Someone replies to a topic you have bookmarked',
 	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'				=> 'A post or topic needs approval',
@@ -376,6 +374,8 @@ $lang = array_merge($lang, array(
 	'PASSWORD_UPDATED'			=> 'A new password was sent to your registered email address.',
 	'PERMISSIONS_RESTORED'		=> 'Successfully restored original permissions.',
 	'PERMISSIONS_TRANSFERRED'	=> 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
+	'PHPBB_NOTIFICATION_METHOD_EMAIL'					=> 'Email',
+	'PHPBB_NOTIFICATION_METHOD_JABBER'					=> 'Jabber',
 	'PM_DISABLED'				=> 'Private messaging has been disabled on this board.',
 	'PM_FROM'					=> 'From',
 	'PM_FROM_REMOVED_AUTHOR'	=> 'This message was sent by a user no longer registered.',
-- 
cgit v1.2.1


From e7a137820bf6ca341df5c0c503e2767451f57c5e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 21 Oct 2012 22:30:20 +0200
Subject: [feature/soft-delete] Use correct language when restoring topics in
 MCP

PHPBB3-9567
---
 phpBB/language/en/mcp.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index a19fa36295..f6616d1a69 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -310,11 +310,15 @@ $lang = array_merge($lang, array(
 	'REPORT_POST_EXPLAIN'		=> 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
 	'REPORT_REASON'				=> 'Report reason',
 	'REPORT_TIME'				=> 'Report time',
-	'RESTORE'				=> 'Restore',
-	'RESTORE_POST'			=> 'Restore post',
-	'RESTORE_POST_CONFIRM'	=> 'Are you sure you want to restore this post?',
-	'RESTORE_POSTS'			=> 'Restore posts',
-	'RESTORE_POSTS_CONFIRM'	=> 'Are you sure you want to restore the selected posts?',
+	'RESTORE'					=> 'Restore',
+	'RESTORE_POST'				=> 'Restore post',
+	'RESTORE_POST_CONFIRM'		=> 'Are you sure you want to restore this post?',
+	'RESTORE_POSTS'				=> 'Restore posts',
+	'RESTORE_POSTS_CONFIRM'		=> 'Are you sure you want to restore the selected posts?',
+	'RESTORE_TOPIC'				=> 'Restore topic',
+	'RESTORE_TOPIC_CONFIRM'		=> 'Are you sure you want to restore this topic?',
+	'RESTORE_TOPICS'			=> 'Restore topics',
+	'RESTORE_TOPICS_CONFIRM'	=> 'Are you sure you want to restore the selected topics?',
 	'RESYNC'					=> 'Resync',
 	'RETURN_MESSAGE'			=> '%sReturn to the message%s',
 	'RETURN_NEW_FORUM'			=> '%sGo to the new forum%s',
@@ -355,6 +359,7 @@ $lang = array_merge($lang, array(
 	'TOPICS_FORKED_SUCCESS'		=> 'The selected topics have been copied successfully.',
 	'TOPICS_LOCKED_SUCCESS'		=> 'The selected topics have been locked.',
 	'TOPICS_MOVED_SUCCESS'		=> 'The selected topics have been moved successfully.',
+	'TOPICS_RESTORED_SUCCESS'	=> 'The selected topics have been restored successfully.',
 	'TOPICS_RESYNC_SUCCESS'		=> 'The selected topics have been resynchronised.',
 	'TOPICS_TYPE_CHANGED'		=> 'Topic types changed successfully.',
 	'TOPICS_UNLOCKED_SUCCESS'	=> 'The selected topics have been unlocked.',
@@ -365,6 +370,7 @@ $lang = array_merge($lang, array(
 	'TOPIC_LOCKED_SUCCESS'		=> 'The selected topic has been locked.',
 	'TOPIC_MOVED_SUCCESS'		=> 'The selected topic has been moved successfully.',
 	'TOPIC_NOT_EXIST'			=> 'The topic you selected does not exist.',
+	'TOPIC_RESTORED_SUCCESS'	=> 'This topic has been restored successfully.',
 	'TOPIC_RESYNC_SUCCESS'		=> 'The selected topic has been resynchronised.',
 	'TOPIC_SPLIT_SUCCESS'		=> 'The selected topic has been split successfully.',
 	'TOPIC_TIME'				=> 'Topic time',
-- 
cgit v1.2.1


From f21fd469bca3e5c3504a773a96d1a8fab6c374a7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 24 Oct 2012 19:52:16 +0200
Subject: [feature/soft-delete] Handle soft deleting via Delete Icon

PHPBB3-9567
---
 phpBB/language/en/posting.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index c0edc068dd..a57a907423 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -78,6 +78,9 @@ $lang = array_merge($lang, array(
 	'DELETE_MESSAGE_CONFIRM'	=> 'Are you sure you want to delete this message?',
 	'DELETE_OWN_POSTS'			=> 'Sorry but you can only delete your own posts.',
 	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
+	'DELETE_POST_SOFT'			=> 'Soft delete post',
+	'DELETE_POST_SOFT_EXP'		=> 'Soft deleted posts can be recovered by a moderator',
+	'DELETE_POST_REASON'		=> 'Soft delete reason',
 	'DELETE_POST_WARN'			=> 'Once deleted the post cannot be recovered',
 	'DISABLE_BBCODE'			=> 'Disable BBCode',
 	'DISABLE_MAGIC_URL'			=> 'Do not automatically parse URLs',
-- 
cgit v1.2.1


From 7b3d794cad4c06b1bbb769439a2d051b7ca0a0d4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 24 Oct 2012 19:58:28 +0200
Subject: [feature/soft-delete] Display post delete reason if one is given

PHPBB3-9567
---
 phpBB/language/en/viewtopic.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index ce66a5b8e2..a5739a6586 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -50,6 +50,7 @@ $lang = array_merge($lang, array(
 	'CODE'					=> 'Code',
 
 	'DELETE_TOPIC'			=> 'Delete topic',
+	'DELETED_INFORMATION'	=> 'Deleted by %1$s on %2$s',
 	'DISAPPROVE'					=> 'Disapprove',
 	'DOWNLOAD_NOTICE'		=> 'You do not have the required permissions to view the files attached to this post.',
 
-- 
cgit v1.2.1


From 4a8d38aab13099fdb4fb7e2a7b72cff1c05fda9c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 27 Oct 2012 17:12:34 +0200
Subject: [feature/soft-delete] Allow soft deleting/restoring topics via
 quickmoderation

PHPBB3-9567
---
 phpBB/language/en/acp/common.php | 5 ++++-
 phpBB/language/en/posting.php    | 2 ++
 phpBB/language/en/viewtopic.php  | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 91a35311bc..a2fe426415 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -554,9 +554,12 @@ $lang = array_merge($lang, array(
 	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br />» %s',
 	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” with the following reason</strong><br />» %2$s',
 	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
-	'LOG_POST_RESTORED'         => '<strong>Restored post</strong><br />» %s',
+	'LOG_POST_RESTORED'			=> '<strong>Restored post</strong><br />» %s',
 	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
 	'LOG_REPORT_DELETED'		=> '<strong>Deleted report</strong><br />» %s',
+	'LOG_RESTORE_TOPIC'			=> '<strong>Restored topic “%1$s” written by</strong><br />» %2$s',
+	'LOG_SOFTDELETE_POST'		=> '<strong>Soft deleted post “%1$s” written by</strong><br />» %2$s',
+	'LOG_SOFTDELETE_TOPIC'		=> '<strong>Soft deleted topic “%1$s” written by</strong><br />» %2$s',
 	'LOG_SPLIT_DESTINATION'		=> '<strong>Moved split posts</strong><br />» to %s',
 	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br />» from %s',
 
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index a57a907423..10e1d48d38 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -82,6 +82,8 @@ $lang = array_merge($lang, array(
 	'DELETE_POST_SOFT_EXP'		=> 'Soft deleted posts can be recovered by a moderator',
 	'DELETE_POST_REASON'		=> 'Soft delete reason',
 	'DELETE_POST_WARN'			=> 'Once deleted the post cannot be recovered',
+	'DELETE_TOPIC_SOFT'			=> 'Soft delete topic',
+	'DELETE_TOPIC_SOFT_EXP'		=> 'Soft deleted topics can be recovered by a moderator',
 	'DISABLE_BBCODE'			=> 'Disable BBCode',
 	'DISABLE_MAGIC_URL'			=> 'Do not automatically parse URLs',
 	'DISABLE_SMILIES'			=> 'Disable smilies',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index a5739a6586..4e78bcfde3 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -98,7 +98,8 @@ $lang = array_merge($lang, array(
 	'QUOTE'					=> 'Quote',
 
 	'REPLY_TO_TOPIC'		=> 'Reply to topic',
-	'RESTORE'               => 'Restore',
+	'RESTORE'				=> 'Restore',
+	'RESTORE_TOPIC'			=> 'Restore topic',
 	'RETURN_POST'			=> '%sReturn to the post%s',
 
 	'SUBMIT_VOTE'			=> 'Submit vote',
-- 
cgit v1.2.1


From a9b59bfe033ac1e7316c585f270e314be29ab735 Mon Sep 17 00:00:00 2001
From: RMcGirr83 <rmcgirr83@gmail.com>
Date: Sat, 27 Oct 2012 08:30:55 -0400
Subject: [ticket/11156] Delete "Misc" tab of forum based permissions + move
 items

PHPBB3-11156
---
 phpBB/language/en/acp/permissions_phpbb.php | 53 ++++++++++++++---------------
 1 file changed, 26 insertions(+), 27 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index bb068e625f..b142cfd9aa 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -135,39 +135,38 @@ $lang = array_merge($lang, array(
 
 // Forum Permissions
 $lang = array_merge($lang, array(
-	'acl_f_list'		=> array('lang' => 'Can see forum', 'cat' => 'post'),
-	'acl_f_read'		=> array('lang' => 'Can read forum', 'cat' => 'post'),
+	'acl_f_list'		=> array('lang' => 'Can see forum', 'cat' => 'actions'),
+	'acl_f_read'		=> array('lang' => 'Can read forum', 'cat' => 'actions'),	
+	'acl_f_search'		=> array('lang' => 'Can search the forum', 'cat' => 'actions'),
+	'acl_f_subscribe'	=> array('lang' => 'Can subscribe forum', 'cat' => 'actions'),
+	'acl_f_print'		=> array('lang' => 'Can print topics', 'cat' => 'actions'),	
+	'acl_f_email'		=> array('lang' => 'Can email topics', 'cat' => 'actions'),	
+	'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
+	'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
+	'acl_f_download'	=> array('lang' => 'Can download files', 'cat' => 'actions'),	
+	'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
+
 	'acl_f_post'		=> array('lang' => 'Can start new topics', 'cat' => 'post'),
-	'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
-	'acl_f_icons'		=> array('lang' => 'Can use topic/post icons', 'cat' => 'post'),
-	'acl_f_announce'	=> array('lang' => 'Can post announcements', 'cat' => 'post'),
 	'acl_f_sticky'		=> array('lang' => 'Can post stickies', 'cat' => 'post'),
+	'acl_f_announce'	=> array('lang' => 'Can post announcements', 'cat' => 'post'),
+	'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
+	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'post'),
+	'acl_f_delete'		=> array('lang' => 'Can delete own posts', 'cat' => 'post'),
+	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'post'),
+	'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'post'),
+	'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'post'),	
+
+	'acl_f_attach'		=> array('lang' => 'Can attach files', 'cat' => 'content'),	
+	'acl_f_icons'		=> array('lang' => 'Can use topic/post icons', 'cat' => 'content'),
+	'acl_f_bbcode'		=> array('lang' => 'Can use BBCode', 'cat' => 'content'),	
+	'acl_f_flash'		=> array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'),
+	'acl_f_img'			=> array('lang' => 'Can use [img] BBCode tag', 'cat' => 'content'),
+	'acl_f_sigs'		=> array('lang' => 'Can use signatures', 'cat' => 'content'),
+	'acl_f_smilies'		=> array('lang' => 'Can use smilies', 'cat' => 'content'),
 
 	'acl_f_poll'		=> array('lang' => 'Can create polls', 'cat' => 'polls'),
 	'acl_f_vote'		=> array('lang' => 'Can vote in polls', 'cat' => 'polls'),
 	'acl_f_votechg'		=> array('lang' => 'Can change existing vote', 'cat' => 'polls'),
-
-	'acl_f_attach'		=> array('lang' => 'Can attach files', 'cat' => 'content'),
-	'acl_f_download'	=> array('lang' => 'Can download files', 'cat' => 'content'),
-	'acl_f_sigs'		=> array('lang' => 'Can use signatures', 'cat' => 'content'),
-	'acl_f_bbcode'		=> array('lang' => 'Can use BBCode', 'cat' => 'content'),
-	'acl_f_smilies'		=> array('lang' => 'Can use smilies', 'cat' => 'content'),
-	'acl_f_img'			=> array('lang' => 'Can use [img] BBCode tag', 'cat' => 'content'),
-	'acl_f_flash'		=> array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'),
-
-	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'actions'),
-	'acl_f_delete'		=> array('lang' => 'Can delete own posts', 'cat' => 'actions'),
-	'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
-	'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
-	'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
-	'acl_f_subscribe'	=> array('lang' => 'Can subscribe forum', 'cat' => 'actions'),
-	'acl_f_print'		=> array('lang' => 'Can print topics', 'cat' => 'actions'),
-	'acl_f_email'		=> array('lang' => 'Can email topics', 'cat' => 'actions'),
-
-	'acl_f_search'		=> array('lang' => 'Can search the forum', 'cat' => 'misc'),
-	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
-	'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'misc'),
-	'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'misc'),
 ));
 
 // Moderator Permissions
-- 
cgit v1.2.1


From 8d05dad63471ffbc58feecd1f44cfa5703f0d5f1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 31 Oct 2012 17:29:55 +0100
Subject: [feature/soft-delete] Display message when the posts are already soft
 deleted

PHPBB3-9567
---
 phpBB/language/en/posting.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 10e1d48d38..16d3e9a37a 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -184,6 +184,7 @@ $lang = array_merge($lang, array(
 	'POLL_VOTE_CHANGE'			=> 'Allow re-voting',
 	'POLL_VOTE_CHANGE_EXPLAIN'	=> 'If enabled users are able to change their vote.',
 	'POSTED_ATTACHMENTS'		=> 'Posted attachments',
+	'POST_ALREADY_SOFTDELETED'	=> 'The post is already soft deleted, you can only hard delete it.',
 	'POST_APPROVAL_NOTIFY'		=> 'You will be notified when your post has been approved.',
 	'POST_CONFIRMATION'			=> 'Confirmation of post',
 	'POST_CONFIRM_EXPLAIN'		=> 'To prevent automated posts the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
@@ -240,6 +241,7 @@ $lang = array_merge($lang, array(
 	'TOO_MANY_URLS'				=> 'Your message contains too many URLs. The maximum number of URLs allowed is %d.',
 	'TOO_MANY_USER_OPTIONS'		=> 'You cannot specify more options per user than existing poll options.',
 	'TOPIC_BUMPED'				=> 'Topic has been bumped successfully.',
+	'TOPIC_ALREADY_SOFTDELETED'	=> 'The topic is already soft deleted, you can only hard delete it.',
 
 	'UNAUTHORISED_BBCODE'		=> 'You cannot use certain BBCodes: %s.',
 	'UNGLOBALISE_EXPLAIN'		=> 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.',
-- 
cgit v1.2.1


From bed82bf2bd13ca04cc1572d454eee5ef3a9053a6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 1 Nov 2012 22:23:35 +0100
Subject: [feature/soft-delete] Invert the logic on confirm box

Permanent delete is now the checkbox rather then softdelete.

PHPBB3-9567
---
 phpBB/language/en/mcp.php     |  4 ----
 phpBB/language/en/posting.php | 19 ++++++++++++-------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index f6616d1a69..22ee2a54e2 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -72,16 +72,12 @@ $lang = array_merge($lang, array(
 	'DELETE_PM_REPORTS'			=> 'Delete PM reports',
 	'DELETE_PM_REPORTS_CONFIRM'	=> 'Are you sure you want to delete the selected PM reports?',
 	'DELETE_POSTS'				=> 'Delete posts',
-	'DELETE_POSTS_CONFIRM'		=> 'Are you sure you want to delete these posts?',
-	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
 	'DELETE_REPORT'				=> 'Delete report',
 	'DELETE_REPORT_CONFIRM'		=> 'Are you sure you want to delete the selected report?',
 	'DELETE_REPORTS'			=> 'Delete reports',
 	'DELETE_REPORTS_CONFIRM'	=> 'Are you sure you want to delete the selected reports?',
 	'DELETE_SHADOW_TOPIC'		=> 'Delete shadow topic',
 	'DELETE_TOPICS'				=> 'Delete selected topics',
-	'DELETE_TOPICS_CONFIRM'		=> 'Are you sure you want to delete these topics?',
-	'DELETE_TOPIC_CONFIRM'		=> 'Are you sure you want to delete this topic?',
 	'DISAPPROVE'				=> 'Disapprove',
 	'DISAPPROVE_REASON'			=> 'Reason for disapproval',
 	'DISAPPROVE_POST'			=> 'Disapprove post',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 16d3e9a37a..5418069d08 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -77,13 +77,20 @@ $lang = array_merge($lang, array(
 	'DELETE_MESSAGE'			=> 'Delete message',
 	'DELETE_MESSAGE_CONFIRM'	=> 'Are you sure you want to delete this message?',
 	'DELETE_OWN_POSTS'			=> 'Sorry but you can only delete your own posts.',
+	'DELETE_PERMANENTLY'		=> 'Delete permanently',
 	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
-	'DELETE_POST_SOFT'			=> 'Soft delete post',
-	'DELETE_POST_SOFT_EXP'		=> 'Soft deleted posts can be recovered by a moderator',
-	'DELETE_POST_REASON'		=> 'Soft delete reason',
+	'DELETE_POST_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete this post?',
+	'DELETE_POST_PERMANENTLY'	=> 'Permanently delete this post so it can not be recovered',
+	'DELETE_POSTS_CONFIRM'		=> 'Are you sure you want to delete these posts?',
+	'DELETE_POSTS_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete these posts?',
+	'DELETE_REASON'				=> 'Delete reason',
+	'DELETE_REASON_EXPLAIN'		=> 'The reason is only used when the post is not deleted permanently.',
 	'DELETE_POST_WARN'			=> 'Once deleted the post cannot be recovered',
-	'DELETE_TOPIC_SOFT'			=> 'Soft delete topic',
-	'DELETE_TOPIC_SOFT_EXP'		=> 'Soft deleted topics can be recovered by a moderator',
+	'DELETE_TOPIC_CONFIRM'		=> 'Are you sure you want to delete this topic?',
+	'DELETE_TOPIC_PERMANENTLY'	=> 'Permanently delete this topic so it can not be recovered',
+	'DELETE_TOPIC_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete this topic?',
+	'DELETE_TOPICS_CONFIRM'		=> 'Are you sure you want to delete these topics?',
+	'DELETE_TOPICS_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete these topics?',
 	'DISABLE_BBCODE'			=> 'Disable BBCode',
 	'DISABLE_MAGIC_URL'			=> 'Do not automatically parse URLs',
 	'DISABLE_SMILIES'			=> 'Disable smilies',
@@ -184,7 +191,6 @@ $lang = array_merge($lang, array(
 	'POLL_VOTE_CHANGE'			=> 'Allow re-voting',
 	'POLL_VOTE_CHANGE_EXPLAIN'	=> 'If enabled users are able to change their vote.',
 	'POSTED_ATTACHMENTS'		=> 'Posted attachments',
-	'POST_ALREADY_SOFTDELETED'	=> 'The post is already soft deleted, you can only hard delete it.',
 	'POST_APPROVAL_NOTIFY'		=> 'You will be notified when your post has been approved.',
 	'POST_CONFIRMATION'			=> 'Confirmation of post',
 	'POST_CONFIRM_EXPLAIN'		=> 'To prevent automated posts the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
@@ -241,7 +247,6 @@ $lang = array_merge($lang, array(
 	'TOO_MANY_URLS'				=> 'Your message contains too many URLs. The maximum number of URLs allowed is %d.',
 	'TOO_MANY_USER_OPTIONS'		=> 'You cannot specify more options per user than existing poll options.',
 	'TOPIC_BUMPED'				=> 'Topic has been bumped successfully.',
-	'TOPIC_ALREADY_SOFTDELETED'	=> 'The topic is already soft deleted, you can only hard delete it.',
 
 	'UNAUTHORISED_BBCODE'		=> 'You cannot use certain BBCodes: %s.',
 	'UNGLOBALISE_EXPLAIN'		=> 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.',
-- 
cgit v1.2.1


From dfcfccf537658b83401b78afc851239f4842a4e5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 3 Nov 2012 22:53:54 +0100
Subject: [feature/soft-delete] Fix deleting via post editing

PHPBB3-9567
---
 phpBB/language/en/posting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 5418069d08..c3b06a77d7 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -85,7 +85,7 @@ $lang = array_merge($lang, array(
 	'DELETE_POSTS_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete these posts?',
 	'DELETE_REASON'				=> 'Delete reason',
 	'DELETE_REASON_EXPLAIN'		=> 'The reason is only used when the post is not deleted permanently.',
-	'DELETE_POST_WARN'			=> 'Once deleted the post cannot be recovered',
+	'DELETE_POST_WARN'			=> 'Deleted this post',
 	'DELETE_TOPIC_CONFIRM'		=> 'Are you sure you want to delete this topic?',
 	'DELETE_TOPIC_PERMANENTLY'	=> 'Permanently delete this topic so it can not be recovered',
 	'DELETE_TOPIC_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete this topic?',
-- 
cgit v1.2.1


From 269330749f1e456caf5c2e787448820449586ed4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 3 Nov 2012 23:37:35 +0100
Subject: [feature/soft-delete] Fix naming of soft delete (we wont use that in
 the UI)

PHPBB3-9567
---
 phpBB/language/en/acp/permissions_phpbb.php | 9 ++++-----
 phpBB/language/en/common.php                | 2 +-
 phpBB/language/en/mcp.php                   | 8 ++++----
 phpBB/language/en/posting.php               | 2 --
 phpBB/language/en/viewtopic.php             | 2 +-
 5 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 0a089f9dc1..9a7d15d4cd 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -156,9 +156,9 @@ $lang = array_merge($lang, array(
 	'acl_f_flash'		=> array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'),
 
 	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'actions'),
-	'acl_f_softdelete'  => array('lang' => 'Can soft delete own posts', 'cat' => 'actions'),
+	'acl_f_softdelete'  => array('lang' => 'Can delete own posts', 'cat' => 'actions'),
 	'acl_f_restore'		=> array('lang' => 'Can restore own posts', 'cat' => 'actions'),
-	'acl_f_delete'		=> array('lang' => 'Can delete own posts', 'cat' => 'actions'),
+	'acl_f_delete'		=> array('lang' => 'Can delete own posts permanently', 'cat' => 'actions'),
 	'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
 	'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
 	'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
@@ -175,11 +175,11 @@ $lang = array_merge($lang, array(
 // Moderator Permissions
 $lang = array_merge($lang, array(
 	'acl_m_edit'		=> array('lang' => 'Can edit posts', 'cat' => 'post_actions'),
-	'acl_m_delete'		=> array('lang' => 'Can delete posts', 'cat' => 'post_actions'),
+	'acl_m_delete'		=> array('lang' => 'Can delete posts permanently', 'cat' => 'post_actions'),
 	'acl_m_approve'		=> array('lang' => 'Can approve posts', 'cat' => 'post_actions'),
 	'acl_m_report'		=> array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
 	'acl_m_chgposter'	=> array('lang' => 'Can change post author', 'cat' => 'post_actions'),
-	'acl_m_softdelete'	=> array('lang' => 'Can soft delete posts', 'cat' => 'post_actions'),
+	'acl_m_softdelete'	=> array('lang' => 'Can delete posts', 'cat' => 'post_actions'),
 	'acl_m_restore'     => array('lang' => 'Can restore deleted posts', 'cat' => 'post_actions'),
 
 	'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
@@ -187,7 +187,6 @@ $lang = array_merge($lang, array(
 	'acl_m_split'	=> array('lang' => 'Can split topics', 'cat' => 'topic_actions'),
 	'acl_m_merge'	=> array('lang' => 'Can merge topics', 'cat' => 'topic_actions'),
 
-
 	'acl_m_info'	=> array('lang' => 'Can view post details', 'cat' => 'misc'),
 	'acl_m_warn'	=> array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
 	'acl_m_ban'		=> array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 857b9004ec..d7e4f12477 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -475,7 +475,7 @@ $lang = array_merge($lang, array(
 	'POST_BY_AUTHOR'		=> 'by',
 	'POST_BY_FOE'			=> 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. %2$sDisplay this post%3$s.',
 	'POST_DAY'				=> '%.2f posts per day',
-	'POST_DELETED'			=> 'Soft deleted post:',
+	'POST_DELETED'			=> 'Deleted post:',
 	'POST_DETAILS'			=> 'Post details',
 	'POST_NEW_TOPIC'		=> 'Post new topic',
 	'POST_PCT'				=> '%.2f%% of all posts',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 22ee2a54e2..e2533e2352 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -198,9 +198,9 @@ $lang = array_merge($lang, array(
 	'MCP_QUEUE_UNAPPROVED_TOPICS'			=> 'Topics awaiting approval',
 	'MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN'	=> 'This is a list of all topics which require approving before they will be visible to users.',
 	'MCP_QUEUE_DELETED_POSTS'				=> 'Deleted posts',
-	'MCP_QUEUE_DELETED_POSTS_EXPLAIN'		=> 'This is a list of all posts which have been soft deleted. You can restore or permanently delete the posts from this screen.',
+	'MCP_QUEUE_DELETED_POSTS_EXPLAIN'		=> 'This is a list of all posts which have been deleted. You can restore or permanently delete the posts from this screen.',
 	'MCP_QUEUE_DELETED_TOPICS'				=> 'Deleted topics',
-	'MCP_QUEUE_DELETED_TOPICS_EXPLAIN'		=> 'This is a list of all topics which have been soft deleted. You can restore or permanently delete the topics from this screen.',
+	'MCP_QUEUE_DELETED_TOPICS_EXPLAIN'		=> 'This is a list of all topics which have been deleted. You can restore or permanently delete the topics from this screen.',
 
 	'MCP_VIEW_USER'			=> 'View warnings for a specific user',
 
@@ -238,7 +238,7 @@ $lang = array_merge($lang, array(
 	'NO_POST'						=> 'You have to select a post in order to warn the user for a post.',
 	'NO_POST_REPORT'				=> 'This post was not reported.',
 	'NO_POST_SELECTED'				=> 'You must select at least one post to perform this action.',
-	'NO_POSTS_DELETED'				=> 'There are no soft deleted posts.',
+	'NO_POSTS_DELETED'				=> 'There are no deleted posts.',
 	'NO_POSTS_QUEUE'				=> 'There are no posts waiting for approval.',
 	'NO_REASON_DISAPPROVAL'			=> 'Please give an appropriate reason for disapproval.',
 	'NO_REPORT'						=> 'No report found',
@@ -246,7 +246,7 @@ $lang = array_merge($lang, array(
 	'NO_REPORT_SELECTED'			=> 'You must select at least one report to perform this action.',
 	'NO_TOPIC_ICON'					=> 'None',
 	'NO_TOPIC_SELECTED'				=> 'You must select at least one topic to perform this action.',
-	'NO_TOPICS_DELETED'				=> 'There are no soft deleted topics.',
+	'NO_TOPICS_DELETED'				=> 'There are no deleted topics.',
 	'NO_TOPICS_QUEUE'				=> 'There are no topics waiting for approval.',
 
 	'ONLY_TOPIC'			=> 'Only topic “%s”',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index c3b06a77d7..c5fc98e0f8 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -221,8 +221,6 @@ $lang = array_merge($lang, array(
 	'SMILIES'					=> 'Smilies',
 	'SMILIES_ARE_OFF'			=> 'Smilies are <em>OFF</em>',
 	'SMILIES_ARE_ON'			=> 'Smilies are <em>ON</em>',
-	'SOFT_DELETE_POST'			=> 'Soft Delete',
-	'SOFT_DELETE_POST_EXPLAIN'  => 'Soft Deletion can be un-done',
 	'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement time limit',
 	'STICK_TOPIC_FOR'			=> 'Stick topic for',
 	'STICK_TOPIC_FOR_EXPLAIN'	=> 'Enter 0 or leave blank for a never ending Sticky/Announcement. Please note that this number is relative to the date of the post.',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 4e78bcfde3..6f318c39f1 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -90,7 +90,7 @@ $lang = array_merge($lang, array(
 	'POLL_ENDED_AT'			=> 'Poll ended at %s',
 	'POLL_RUN_TILL'			=> 'Poll runs till %s',
 	'POLL_VOTED_OPTION'		=> 'You voted for this option',
-	'POST_DELETED_RESTORE'  => 'This post has been deleted.  It can be restored.',
+	'POST_DELETED_RESTORE'	=> 'This post has been deleted. It can be restored.',
 	'PRINT_TOPIC'			=> 'Print view',
 
 	'QUICK_MOD'				=> 'Quick-mod tools',
-- 
cgit v1.2.1


From 1c584ef8ba861ce361135dc44aeabd76423c0c94 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 9 Nov 2012 11:46:17 +0100
Subject: [feature/soft-delete] Use JS to display softdeleted/ignored posts

PHPBB3-9567
---
 phpBB/language/en/common.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index d7e4f12477..d8596a99f7 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -473,9 +473,12 @@ $lang = array_merge($lang, array(
 	'POSTS'					=> 'Posts',
 	'POSTS_UNAPPROVED'		=> 'At least one post in this topic has not been approved.',
 	'POST_BY_AUTHOR'		=> 'by',
-	'POST_BY_FOE'			=> 'This post was made by <strong>%1$s</strong> who is currently on your ignore list. %2$sDisplay this post%3$s.',
+	'POST_BY_FOE'			=> 'This post was made by <strong>%1$s</strong> who is currently on your ignore list.',
+	'POST_DISPLAY'			=> '%1$sDisplay this post%2$s.',
 	'POST_DAY'				=> '%.2f posts per day',
 	'POST_DELETED'			=> 'Deleted post:',
+	'POST_DELETED_BY'		=> 'This post was deleted by <strong>%1$s</strong> on %2$s.',
+	'POST_DELETED_BY_REASON'=> 'This post was deleted by <strong>%1$s</strong> on %2$s for reason: %3$s',
 	'POST_DETAILS'			=> 'Post details',
 	'POST_NEW_TOPIC'		=> 'Post new topic',
 	'POST_PCT'				=> '%.2f%% of all posts',
-- 
cgit v1.2.1


From f09ee162528d931aabc3f216410d02d3a072c21d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 9 Nov 2012 07:40:08 -0600
Subject: [ticket/11103] Use phpBB Container to load types/methods

PHPBB3-11103
---
 phpBB/language/en/ucp.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 5b1e7add02..7c3960204a 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -295,6 +295,8 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_GROUP_MISCELLANEOUS'					=> 'Miscellaneous Notifications',
 	'NOTIFICATION_GROUP_MODERATION'						=> 'Moderation Notifications',
 	'NOTIFICATION_GROUP_POSTING'						=> 'Posting Notifications',
+	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
+	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
 	'NOTIFICATION_TYPE'									=> 'Notification type',
 	'NOTIFICATION_TYPE_BOOKMARK'						=> 'Someone replies to a topic you have bookmarked',
 	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'				=> 'A post or topic needs approval',
@@ -374,8 +376,6 @@ $lang = array_merge($lang, array(
 	'PASSWORD_UPDATED'			=> 'A new password was sent to your registered email address.',
 	'PERMISSIONS_RESTORED'		=> 'Successfully restored original permissions.',
 	'PERMISSIONS_TRANSFERRED'	=> 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
-	'PHPBB_NOTIFICATION_METHOD_EMAIL'					=> 'Email',
-	'PHPBB_NOTIFICATION_METHOD_JABBER'					=> 'Jabber',
 	'PM_DISABLED'				=> 'Private messaging has been disabled on this board.',
 	'PM_FROM'					=> 'From',
 	'PM_FROM_REMOVED_AUTHOR'	=> 'This message was sent by a user no longer registered.',
-- 
cgit v1.2.1


From 7d7dc98b10b586635fdee5c420e1ae9fa8d2b752 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 9 Nov 2012 23:16:42 +0100
Subject: [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)

PHPBB3-11181
---
 phpBB/language/en/install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 68623a6c25..cb6a17afa2 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -302,10 +302,10 @@ $lang = array_merge($lang, array(
 	'PHP_REGISTER_GLOBALS_EXPLAIN'	=> 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.',
 	'PHP_SAFE_MODE'					=> 'Safe mode',
 	'PHP_SETTINGS'					=> 'PHP version and settings',
-	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.3.2 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
+	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.3.3 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
 	'PHP_URL_FOPEN_SUPPORT'			=> 'PHP setting <var>allow_url_fopen</var> is enabled',
 	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it.',
-	'PHP_VERSION_REQD'				=> 'PHP version >= 5.3.2',
+	'PHP_VERSION_REQD'				=> 'PHP version >= 5.3.3',
 	'POST_ID'						=> 'Post ID',
 	'PREFIX_FOUND'					=> 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
 	'PREPROCESS_STEP'				=> 'Executing pre-processing functions/queries',
-- 
cgit v1.2.1


From 6e7e70a18abc4368bc0728db420d1f7f61ad8686 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 3 Aug 2012 11:43:23 -0500
Subject: [ticket/10780] Replace colon usage in template output with {L_COLON}

Replace all the instances (I could find) where the colon is displayed
to the user with {L_COLON} so it can be localised.

PHPBB3-10780
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index e6022e3b79..4300ef431a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -134,6 +134,7 @@ $lang = array_merge($lang, array(
 	'COLLAPSE_VIEW'			=> 'Collapse view',
 	'CLOSE_WINDOW'			=> 'Close window',
 	'COLOUR_SWATCH'			=> 'Colour swatch',
+	'COLON'					=> ':',
 	'COMMA_SEPARATOR'		=> ', ',	// Comma used to join lists into a single string, use localised comma if appropriate, eg: Ideographic or Arabic
 	'CONFIRM'				=> 'Confirm',
 	'CONFIRM_CODE'			=> 'Confirmation code',
-- 
cgit v1.2.1


From 985d234a29b22086a196dca427e6c474229e3d36 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 11 Nov 2012 11:37:14 -0600
Subject: [ticket/11103] Move all email templates to the email/ directory &
 prep short

Prepare short email templates (to be used in jabber)

PHPBB3-11103
---
 phpBB/language/en/email/bookmark.txt                 | 20 ++++++++++++++++++++
 phpBB/language/en/email/notifications/bookmark.txt   | 20 --------------------
 .../en/email/notifications/post_in_queue.txt         | 17 -----------------
 phpBB/language/en/email/notifications/quote.txt      | 20 --------------------
 phpBB/language/en/email/notifications/report_pm.txt  | 14 --------------
 .../language/en/email/notifications/report_post.txt  | 17 -----------------
 .../en/email/notifications/topic_in_queue.txt        | 17 -----------------
 phpBB/language/en/email/post_in_queue.txt            | 17 +++++++++++++++++
 phpBB/language/en/email/quote.txt                    | 20 ++++++++++++++++++++
 phpBB/language/en/email/report_pm.txt                | 14 ++++++++++++++
 phpBB/language/en/email/report_post.txt              | 17 +++++++++++++++++
 phpBB/language/en/email/short/bookmark.txt           | 20 ++++++++++++++++++++
 phpBB/language/en/email/short/newtopic_notify.txt    | 13 +++++++++++++
 phpBB/language/en/email/short/post_approved.txt      | 14 ++++++++++++++
 phpBB/language/en/email/short/post_disapproved.txt   | 12 ++++++++++++
 phpBB/language/en/email/short/post_in_queue.txt      | 17 +++++++++++++++++
 phpBB/language/en/email/short/privmsg_notify.txt     | 15 +++++++++++++++
 phpBB/language/en/email/short/quote.txt              | 20 ++++++++++++++++++++
 phpBB/language/en/email/short/report_pm.txt          | 14 ++++++++++++++
 phpBB/language/en/email/short/report_post.txt        | 17 +++++++++++++++++
 phpBB/language/en/email/short/topic_approved.txt     | 11 +++++++++++
 phpBB/language/en/email/short/topic_disapproved.txt  | 12 ++++++++++++
 phpBB/language/en/email/short/topic_in_queue.txt     | 17 +++++++++++++++++
 phpBB/language/en/email/short/topic_notify.txt       | 20 ++++++++++++++++++++
 phpBB/language/en/email/topic_in_queue.txt           | 17 +++++++++++++++++
 25 files changed, 307 insertions(+), 105 deletions(-)
 create mode 100644 phpBB/language/en/email/bookmark.txt
 delete mode 100644 phpBB/language/en/email/notifications/bookmark.txt
 delete mode 100644 phpBB/language/en/email/notifications/post_in_queue.txt
 delete mode 100644 phpBB/language/en/email/notifications/quote.txt
 delete mode 100644 phpBB/language/en/email/notifications/report_pm.txt
 delete mode 100644 phpBB/language/en/email/notifications/report_post.txt
 delete mode 100644 phpBB/language/en/email/notifications/topic_in_queue.txt
 create mode 100644 phpBB/language/en/email/post_in_queue.txt
 create mode 100644 phpBB/language/en/email/quote.txt
 create mode 100644 phpBB/language/en/email/report_pm.txt
 create mode 100644 phpBB/language/en/email/report_post.txt
 create mode 100644 phpBB/language/en/email/short/bookmark.txt
 create mode 100644 phpBB/language/en/email/short/newtopic_notify.txt
 create mode 100644 phpBB/language/en/email/short/post_approved.txt
 create mode 100644 phpBB/language/en/email/short/post_disapproved.txt
 create mode 100644 phpBB/language/en/email/short/post_in_queue.txt
 create mode 100644 phpBB/language/en/email/short/privmsg_notify.txt
 create mode 100644 phpBB/language/en/email/short/quote.txt
 create mode 100644 phpBB/language/en/email/short/report_pm.txt
 create mode 100644 phpBB/language/en/email/short/report_post.txt
 create mode 100644 phpBB/language/en/email/short/topic_approved.txt
 create mode 100644 phpBB/language/en/email/short/topic_disapproved.txt
 create mode 100644 phpBB/language/en/email/short/topic_in_queue.txt
 create mode 100644 phpBB/language/en/email/short/topic_notify.txt
 create mode 100644 phpBB/language/en/email/topic_in_queue.txt

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/bookmark.txt b/phpBB/language/en/email/bookmark.txt
new file mode 100644
index 0000000000..95f17b5693
--- /dev/null
+++ b/phpBB/language/en/email/bookmark.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+
+If you want to view the newest post made since your last visit, click the following link:
+{U_NEWEST_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/bookmark.txt b/phpBB/language/en/email/notifications/bookmark.txt
deleted file mode 100644
index 95f17b5693..0000000000
--- a/phpBB/language/en/email/notifications/bookmark.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
-
-If you want to view the newest post made since your last visit, click the following link:
-{U_NEWEST_POST}
-
-If you want to view the topic, click the following link:
-{U_TOPIC}
-
-If you want to view the forum, click the following link:
-{U_FORUM}
-
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt
deleted file mode 100644
index 8d56ce6c4d..0000000000
--- a/phpBB/language/en/email/notifications/post_in_queue.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" needs approval.
-
-If you want to view the post, click the following link:
-{U_VIEW_POST}
-
-If you want to view the topic, click the following link:
-{U_TOPIC}
-
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt
deleted file mode 100644
index 2b9525801f..0000000000
--- a/phpBB/language/en/email/notifications/quote.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
-
-If you want to view the quoted post, click the following link:
-{U_VIEW_POST}
-
-If you want to view the topic, click the following link:
-{U_TOPIC}
-
-If you want to view the forum, click the following link:
-{U_FORUM}
-
-If you no longer wish to receive updates about replies quoting you, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt
deleted file mode 100644
index 66ae82d074..0000000000
--- a/phpBB/language/en/email/notifications/report_pm.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
-
-If you want to view the report, click the following link:
-{U_VIEW_REPORT}
-
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt
deleted file mode 100644
index 46983be1ed..0000000000
--- a/phpBB/language/en/email/notifications/report_post.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported.
-
-If you want to view the report, click the following link:
-{U_VIEW_REPORT}
-
-If you want to view the post, click the following link:
-{U_VIEW_POST}
-
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt
deleted file mode 100644
index ae8f9e2484..0000000000
--- a/phpBB/language/en/email/notifications/topic_in_queue.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
-
-Hello {USERNAME},
-
-You are receiving this notification because the topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
-
-If you want to view the topic, click the following link:
-{U_VIEW_TOPIC}
-
-If you want to view the forum, click the following link:
-{U_FORUM}
-
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
-{EMAIL_SIG}
diff --git a/phpBB/language/en/email/post_in_queue.txt b/phpBB/language/en/email/post_in_queue.txt
new file mode 100644
index 0000000000..8d56ce6c4d
--- /dev/null
+++ b/phpBB/language/en/email/post_in_queue.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" needs approval.
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/quote.txt b/phpBB/language/en/email/quote.txt
new file mode 100644
index 0000000000..2b9525801f
--- /dev/null
+++ b/phpBB/language/en/email/quote.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
+
+If you want to view the quoted post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies quoting you, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/report_pm.txt b/phpBB/language/en/email/report_pm.txt
new file mode 100644
index 0000000000..66ae82d074
--- /dev/null
+++ b/phpBB/language/en/email/report_pm.txt
@@ -0,0 +1,14 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
+
+If you want to view the report, click the following link:
+{U_VIEW_REPORT}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/report_post.txt b/phpBB/language/en/email/report_post.txt
new file mode 100644
index 0000000000..46983be1ed
--- /dev/null
+++ b/phpBB/language/en/email/report_post.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported.
+
+If you want to view the report, click the following link:
+{U_VIEW_REPORT}
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/bookmark.txt b/phpBB/language/en/email/short/bookmark.txt
new file mode 100644
index 0000000000..95f17b5693
--- /dev/null
+++ b/phpBB/language/en/email/short/bookmark.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+
+If you want to view the newest post made since your last visit, click the following link:
+{U_NEWEST_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt
new file mode 100644
index 0000000000..d4f5cae620
--- /dev/null
+++ b/phpBB/language/en/email/short/newtopic_notify.txt
@@ -0,0 +1,13 @@
+Subject: New topic notification - "{FORUM_NAME}"
+
+Hello {USERNAME},
+
+You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
+
+{U_FORUM}
+
+If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link:
+
+{U_STOP_WATCHING_FORUM}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/post_approved.txt b/phpBB/language/en/email/short/post_approved.txt
new file mode 100644
index 0000000000..e715b54026
--- /dev/null
+++ b/phpBB/language/en/email/short/post_approved.txt
@@ -0,0 +1,14 @@
+Subject: Post approved - "{POST_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator.
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_VIEW_TOPIC}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/post_disapproved.txt b/phpBB/language/en/email/short/post_disapproved.txt
new file mode 100644
index 0000000000..3bc64bb611
--- /dev/null
+++ b/phpBB/language/en/email/short/post_disapproved.txt
@@ -0,0 +1,12 @@
+Subject: Post disapproved - "{POST_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator.
+
+The following reason was given for the disapproval:
+
+{REASON}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/post_in_queue.txt b/phpBB/language/en/email/short/post_in_queue.txt
new file mode 100644
index 0000000000..8d56ce6c4d
--- /dev/null
+++ b/phpBB/language/en/email/short/post_in_queue.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" needs approval.
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/privmsg_notify.txt b/phpBB/language/en/email/short/privmsg_notify.txt
new file mode 100644
index 0000000000..d3a86cc73c
--- /dev/null
+++ b/phpBB/language/en/email/short/privmsg_notify.txt
@@ -0,0 +1,15 @@
+Subject: New private message has arrived
+
+Hello {USERNAME},
+
+You have received a new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject:
+
+{SUBJECT}
+
+You can view your new message by clicking on the following link:
+
+{U_VIEW_MESSAGE}
+
+You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/quote.txt b/phpBB/language/en/email/short/quote.txt
new file mode 100644
index 0000000000..2b9525801f
--- /dev/null
+++ b/phpBB/language/en/email/short/quote.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made.
+
+If you want to view the quoted post, click the following link:
+{U_VIEW_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies quoting you, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/report_pm.txt b/phpBB/language/en/email/short/report_pm.txt
new file mode 100644
index 0000000000..66ae82d074
--- /dev/null
+++ b/phpBB/language/en/email/short/report_pm.txt
@@ -0,0 +1,14 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported.
+
+If you want to view the report, click the following link:
+{U_VIEW_REPORT}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/report_post.txt b/phpBB/language/en/email/short/report_post.txt
new file mode 100644
index 0000000000..46983be1ed
--- /dev/null
+++ b/phpBB/language/en/email/short/report_post.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported.
+
+If you want to view the report, click the following link:
+{U_VIEW_REPORT}
+
+If you want to view the post, click the following link:
+{U_VIEW_POST}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_approved.txt b/phpBB/language/en/email/short/topic_approved.txt
new file mode 100644
index 0000000000..ffda378d30
--- /dev/null
+++ b/phpBB/language/en/email/short/topic_approved.txt
@@ -0,0 +1,11 @@
+Subject: Topic approved - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator.
+
+If you want to view the topic, click the following link:
+{U_VIEW_TOPIC}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/topic_disapproved.txt b/phpBB/language/en/email/short/topic_disapproved.txt
new file mode 100644
index 0000000000..49ef58bf39
--- /dev/null
+++ b/phpBB/language/en/email/short/topic_disapproved.txt
@@ -0,0 +1,12 @@
+Subject: Topic disapproved - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator.
+
+The following reason was given for the disapproval:
+
+{REASON}
+
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/topic_in_queue.txt b/phpBB/language/en/email/short/topic_in_queue.txt
new file mode 100644
index 0000000000..ae8f9e2484
--- /dev/null
+++ b/phpBB/language/en/email/short/topic_in_queue.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
+
+If you want to view the topic, click the following link:
+{U_VIEW_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt
new file mode 100644
index 0000000000..fa2481dd9a
--- /dev/null
+++ b/phpBB/language/en/email/short/topic_notify.txt
@@ -0,0 +1,20 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+
+If you want to view the newest post made since your last visit, click the following link:
+{U_NEWEST_POST}
+
+If you want to view the topic, click the following link:
+{U_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link:
+
+{U_STOP_WATCHING_TOPIC}
+
+{EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/topic_in_queue.txt b/phpBB/language/en/email/topic_in_queue.txt
new file mode 100644
index 0000000000..ae8f9e2484
--- /dev/null
+++ b/phpBB/language/en/email/topic_in_queue.txt
@@ -0,0 +1,17 @@
+Subject: Topic reply notification - "{TOPIC_TITLE}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval.
+
+If you want to view the topic, click the following link:
+{U_VIEW_TOPIC}
+
+If you want to view the forum, click the following link:
+{U_FORUM}
+
+If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
+
+{U_NOTIFICATION_SETTINGS}
+
+{EMAIL_SIG}
-- 
cgit v1.2.1


From 6a27a95f30f7dafffe994aceb75a3cf769d13221 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Nov 2012 15:32:35 +0100
Subject: [ticket/10411] Use new teampage and legend class in ACP and
 memberlist

PHPBB3-10411
---
 phpBB/language/en/acp/groups.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index a5c0af933c..18e5cbaa1d 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -36,12 +36,14 @@ if (empty($lang) || !is_array($lang))
 
 $lang = array_merge($lang, array(
 	'ACP_GROUPS_MANAGE_EXPLAIN'		=> 'From this panel you can administer all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.',
+	'ADD_CATEGORY'					=> 'Add category',
 	'ADD_USERS'						=> 'Add users',
 	'ADD_USERS_EXPLAIN'				=> 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.',
 
 	'COPY_PERMISSIONS'				=> 'Copy permissions from',
 	'COPY_PERMISSIONS_EXPLAIN'		=> 'Once created, the group will have the same permissions as the one you select here.',
 	'CREATE_GROUP'					=> 'Create new group',
+	'CATEGORY_NAME'					=> 'Category name',
 
 	'GROUPS_NO_MEMBERS'				=> 'This group has no members',
 	'GROUPS_NO_MODS'				=> 'No group leaders defined',
@@ -130,6 +132,7 @@ $lang = array_merge($lang, array(
 	'SPECIAL_GROUPS'			=> 'Pre-defined groups',
 	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
 
+	'TEAMPAGE'					=> 'Teampage',
 	'TEAMPAGE_DISP_ALL'			=> 'All memberships',
 	'TEAMPAGE_DISP_DEFAULT'		=> 'User’s default group only',
 	'TEAMPAGE_DISP_FIRST'		=> 'First membership only',
-- 
cgit v1.2.1


From 06158693c7b846518abfe9d72491fc7376e457f3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 19 Oct 2012 19:54:19 -0400
Subject: [feature/controller] Implement a front controller

PHPBB3-10864
---
 phpBB/language/en/app.php | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 phpBB/language/en/app.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
new file mode 100644
index 0000000000..db7f3164d0
--- /dev/null
+++ b/phpBB/language/en/app.php
@@ -0,0 +1,59 @@
+<?php
+/**
+*
+* app [English]
+*
+* @package language
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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
+//
+// Some characters you may want to copy&paste:
+// ’ » “ ” …
+//
+
+$lang = array_merge($lang, array(
+	'CONTROLLER_ARGUMENT_VALUE_MISSING'	=> 'Missing value for argument #%1$s: <strong>%3$s</strong> in class <strong>%2$s</strong>',
+	'CONTROLLER_NOT_SPECIFIED'			=> 'No controller has been specified.',
+	'CONTROLLER_NOT_FOUND'				=> 'The requested page could not be found.',
+	'CONTROLLER_METHOD_NOT_SPECIFIED'	=> 'No method was specified for the controller.',
+	'CONTROLLER_SERVICE_NOT_GIVEN'		=> 'The controller "<strong>%s</strong>" must have a service specified in ./config/routing.yml.',
+	'CONTROLLER_SERVICE_UNDEFINED'		=> 'The service for controller "<strong>%s</strong>" is not defined in ./config/services.yml.',
+	'CONTROLLER_RETURN_TYPE_INVALID'	=> 'The controller object <strong>%s</strong> must return a Symfony\Component\HttpFoundation\Response object.',
+
+	// Event Listener/Subscriber error messages
+	'NO_EVENT_ATTRIBUTE'				=> 'Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.',
+	'SUBSCRIBER_WRONG_TYPE'				=> 'Service "%1$s" must implement interface "%2$s".',
+
+	// Core error controller messages
+	'PAGE_NOT_FOUND_ERROR'				=> 'The page you have requested does not exist.',
+	'NOT_AUTHORISED_ERROR'				=> 'You do not have permission to access this page.',
+	'NOT_AUTHENTICATED_ERROR'			=> 'You must log in to access this page.',
+	'INTERNAL_SERVER_ERROR_ERROR'		=> 'An unknown error occured.',
+));
-- 
cgit v1.2.1


From 5c86a1660d436cf16448ae6c978237833e3e86b7 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 20 Oct 2012 17:16:14 -0400
Subject: [feature/controller] Don't allow a kernel listener to be added with
 no method

PHPBB3-10864
---
 phpBB/language/en/app.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
index db7f3164d0..2cbeaa2cba 100644
--- a/phpBB/language/en/app.php
+++ b/phpBB/language/en/app.php
@@ -49,6 +49,7 @@ $lang = array_merge($lang, array(
 
 	// Event Listener/Subscriber error messages
 	'NO_EVENT_ATTRIBUTE'				=> 'Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.',
+	'NO_METHOD_ATTRIBUTE'				=> 'Service "%1$s" must define the "method" attribute on "kernel.event_listener" tags.',
 	'SUBSCRIBER_WRONG_TYPE'				=> 'Service "%1$s" must implement interface "%2$s".',
 
 	// Core error controller messages
-- 
cgit v1.2.1


From ca30135391ef6b6c8149b7bb41aa840cf27d0a01 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 16 Nov 2012 22:59:29 +0100
Subject: [feature/avatars] Add gravatar to avatar settings

PHPBB3-10018
---
 phpBB/language/en/acp/board.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index a4380486cc..50121160c4 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -99,6 +99,7 @@ $lang = array_merge($lang, array(
 
 	'ALLOW_AVATARS'					=> 'Enable avatars',
 	'ALLOW_AVATARS_EXPLAIN'			=> 'Allow general usage of avatars;<br />If you disable avatars in general or avatars of a certain mode, the disabled avatars will no longer be shown on the board, but users will still be able to download their own avatars in the User Control Panel.',
+	'ALLOW_GRAVATAR'				=> 'Enable gravatar avatars',
 	'ALLOW_LOCAL'					=> 'Enable gallery avatars',
 	'ALLOW_REMOTE'					=> 'Enable remote avatars',
 	'ALLOW_REMOTE_EXPLAIN'			=> 'Avatars linked to from another website.',
-- 
cgit v1.2.1


From 5d0a20bbb684055143b77a630ab1b02270f7f900 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 16 Nov 2012 23:07:51 +0100
Subject: [feature/avatars] Add missing language variables for avatars

PHPBB3-10018
---
 phpBB/language/en/ucp.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 705b07b170..d397ca5538 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -89,12 +89,22 @@ $lang = array_merge($lang, array(
 	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
 	'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected persistent login keys were successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
+	'AVATAR_DRIVER_GRAVATAR_TITLE'	=> 'Gravatar',
+	'AVATAR_DRIVER_GRAVATAR_EXPLAIN'=> 'Gravatar is a service that provides you with a globally unique avatar.',
+	'AVATAR_DRIVER_LOCAL_TITLE'		=> 'Gallery avatar',
+	'AVATAR_DRIVER_LOCAL_EXPLAIN'	=> 'You can choose your avatar from a locally available set of avatars.',
+	'AVATAR_DRIVER_REMOTE_TITLE'	=> 'Remote avatar',
+	'AVATAR_DRIVER_REMOTE_EXPLAIN'	=> 'Link to avatar images from another website.',
+	'AVATAR_DRIVER_UPLOAD_TITLE'	=> 'Upload avatar',
+	'AVATAR_DRIVER_UPLOAD_EXPLAIN'	=> 'Upload your own custom avatar.',
 	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$s, height: %2$s, file size: %3$.2f KiB.',
 	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
 	'AVATAR_GALLERY'				=> 'Local gallery',
 	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',
 	'AVATAR_NOT_ALLOWED'			=> 'Your avatar cannot be displayed because avatars have been disallowed.',
 	'AVATAR_PAGE'					=> 'Page',
+	'AVATAR_SELECT'					=> 'Select your avatar',
+	'AVATAR_TYPE'					=> 'Avatar type',
 	'AVATAR_TYPE_NOT_ALLOWED'		=> 'Your current avatar cannot be displayed because its type has been disallowed.',
 
 	'BACK_TO_DRAFTS'			=> 'Back to saved drafts',
@@ -236,6 +246,11 @@ $lang = array_merge($lang, array(
 
 	'GLOBAL_ANNOUNCEMENT'		=> 'Global announcement',
 
+	'GRAVATAR_AVATAR_EMAIL'			=> 'Gravatar email',
+	'GRAVATAR_AVATAR_EMAIL_EXPLAIN'	=> 'Enter the email address you used for registering your account on <a href="http://www.gravatar.com/">Gravatar</a>.',
+	'GRAVATAR_AVATAR_SIZE'			=> 'Avatar dimensions',
+	'GRAVATAR_AVATAR_SIZE_EXPLAIN'	=> 'Specify the width and height of the avatar, leave blank to attempt automatic verification.',
+
 	'HIDE_ONLINE'				=> 'Hide my online status',
 	'HIDE_ONLINE_EXPLAIN'		=> 'Changing this setting won’t become effective until your next visit to the board.',
 	'HOLD_NEW_MESSAGES'			=> 'Do not accept new messages (New messages will be held back until enough space is available)',
-- 
cgit v1.2.1


From 132bbede2b5ca5e1bbb371bdaef0bb3041c67316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Wed, 18 Apr 2012 15:35:09 +0200
Subject: [feature/template-events] Handle incorrect template event identifiers

If the template event identifier is wrongly formatted phpBB will
triggern an `E_USER_NOTICE` if the `DEBUG` constant is set, otherwise
the location is ignored.

PHPBB3-9550
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 7ce3b5d2e6..5fc1b21e4f 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -186,6 +186,7 @@ $lang = array_merge($lang, array(
 	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',
 	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
 	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
+	'ERR_TEMPLATE_EVENT_LOCATION'		=> 'The specified template event location <em>[%s]</em> is wrongly formatted.',
 	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
 	'ERR_UNWATCHING'					=> 'An error occured while trying to unsubscribe.',
 	'ERR_WATCHING'						=> 'An error occured while trying to subscribe.',
-- 
cgit v1.2.1


From 4ed9e4124e592ddb7fe2696e45261e74edb89ddd Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 31 Oct 2012 11:11:33 -0400
Subject: [feature/template-events] Wording: wrongly -> improperly.

PHPBB3-9550
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5fc1b21e4f..feb5c18d84 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -186,7 +186,7 @@ $lang = array_merge($lang, array(
 	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',
 	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
 	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
-	'ERR_TEMPLATE_EVENT_LOCATION'		=> 'The specified template event location <em>[%s]</em> is wrongly formatted.',
+	'ERR_TEMPLATE_EVENT_LOCATION'		=> 'The specified template event location <em>[%s]</em> is improperly formatted.',
 	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
 	'ERR_UNWATCHING'					=> 'An error occured while trying to unsubscribe.',
 	'ERR_WATCHING'						=> 'An error occured while trying to subscribe.',
-- 
cgit v1.2.1


From 47a90f815d210d84f0c70ae678cb129e69963436 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 14 Nov 2012 17:31:05 -0500
Subject: [feature/template-events] Changes per imkingdavid's review.

PHPBB3-9550
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index feb5c18d84..6ebbb54c62 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -187,6 +187,7 @@ $lang = array_merge($lang, array(
 	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
 	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
 	'ERR_TEMPLATE_EVENT_LOCATION'		=> 'The specified template event location <em>[%s]</em> is improperly formatted.',
+	'ERR_TEMPLATE_COMPILATION'		=> 'The file could not be compiled: %s',
 	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
 	'ERR_UNWATCHING'					=> 'An error occured while trying to unsubscribe.',
 	'ERR_WATCHING'						=> 'An error occured while trying to subscribe.',
-- 
cgit v1.2.1


From 60c0a1dd2ac2c733a670093ad440e3ba6be3be4d Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 18 Nov 2012 15:51:05 -0500
Subject: [feature/controller] Don't use $user->lang() before container
 compilation

PHPBB3-10864
---
 phpBB/language/en/app.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
index 2cbeaa2cba..2d67246369 100644
--- a/phpBB/language/en/app.php
+++ b/phpBB/language/en/app.php
@@ -47,11 +47,6 @@ $lang = array_merge($lang, array(
 	'CONTROLLER_SERVICE_UNDEFINED'		=> 'The service for controller "<strong>%s</strong>" is not defined in ./config/services.yml.',
 	'CONTROLLER_RETURN_TYPE_INVALID'	=> 'The controller object <strong>%s</strong> must return a Symfony\Component\HttpFoundation\Response object.',
 
-	// Event Listener/Subscriber error messages
-	'NO_EVENT_ATTRIBUTE'				=> 'Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.',
-	'NO_METHOD_ATTRIBUTE'				=> 'Service "%1$s" must define the "method" attribute on "kernel.event_listener" tags.',
-	'SUBSCRIBER_WRONG_TYPE'				=> 'Service "%1$s" must implement interface "%2$s".',
-
 	// Core error controller messages
 	'PAGE_NOT_FOUND_ERROR'				=> 'The page you have requested does not exist.',
 	'NOT_AUTHORISED_ERROR'				=> 'You do not have permission to access this page.',
-- 
cgit v1.2.1


From 2f50d656481dca3c2aa28cd5035ce0d44e5c4977 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 18 Nov 2012 15:51:32 -0500
Subject: [feature/controller] Remove unused language strings

PHPBB3-10864
---
 phpBB/language/en/app.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
index 2d67246369..cb56015c30 100644
--- a/phpBB/language/en/app.php
+++ b/phpBB/language/en/app.php
@@ -46,10 +46,4 @@ $lang = array_merge($lang, array(
 	'CONTROLLER_SERVICE_NOT_GIVEN'		=> 'The controller "<strong>%s</strong>" must have a service specified in ./config/routing.yml.',
 	'CONTROLLER_SERVICE_UNDEFINED'		=> 'The service for controller "<strong>%s</strong>" is not defined in ./config/services.yml.',
 	'CONTROLLER_RETURN_TYPE_INVALID'	=> 'The controller object <strong>%s</strong> must return a Symfony\Component\HttpFoundation\Response object.',
-
-	// Core error controller messages
-	'PAGE_NOT_FOUND_ERROR'				=> 'The page you have requested does not exist.',
-	'NOT_AUTHORISED_ERROR'				=> 'You do not have permission to access this page.',
-	'NOT_AUTHENTICATED_ERROR'			=> 'You must log in to access this page.',
-	'INTERNAL_SERVER_ERROR_ERROR'		=> 'An unknown error occured.',
 ));
-- 
cgit v1.2.1


From 0abec06b09c71feb709b6101949181ff7ec4d882 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 21:16:21 +0100
Subject: [feature/avatars] Change gravatar explain as discussed in PR

PHPBB3-10018
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index d397ca5538..7223b13b29 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -90,7 +90,7 @@ $lang = array_merge($lang, array(
 	'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected persistent login keys were successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
 	'AVATAR_DRIVER_GRAVATAR_TITLE'	=> 'Gravatar',
-	'AVATAR_DRIVER_GRAVATAR_EXPLAIN'=> 'Gravatar is a service that provides you with a globally unique avatar.',
+	'AVATAR_DRIVER_GRAVATAR_EXPLAIN'=> 'Gravatar is a service that allows you to maintain the same avatar across multiple websites. Visit <a href="http://www.gravatar.com/">Gravatar</a> for more information.',
 	'AVATAR_DRIVER_LOCAL_TITLE'		=> 'Gallery avatar',
 	'AVATAR_DRIVER_LOCAL_EXPLAIN'	=> 'You can choose your avatar from a locally available set of avatars.',
 	'AVATAR_DRIVER_REMOTE_TITLE'	=> 'Remote avatar',
-- 
cgit v1.2.1


From dacacbbd52dc22f3344f313301cf6b4fb0f77233 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Sun, 15 Apr 2012 13:08:44 +0530
Subject: [ticket/10771] Using Remember Me instead of autologin or persistent
 keys

Changed language variable LOG_ME_IN's value to
"Remember me"

PHPBB3-10771
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 4300ef431a..71f1beb66a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -343,7 +343,7 @@ $lang = array_merge($lang, array(
 	'LOGIN_EXPLAIN_VIEWONLINE'			=> 'In order to view the online list you have to be registered and logged in.',
 	'LOGOUT'							=> 'Logout',
 	'LOGOUT_USER'						=> 'Logout [ %s ]',
-	'LOG_ME_IN'							=> 'Log me on automatically each visit',
+	'LOG_ME_IN'							=> 'Remember me',
 
 	'MARK'					=> 'Mark',
 	'MARK_ALL'				=> 'Mark all',
-- 
cgit v1.2.1


From a17c1a29f8ce5781082dcf87a8bde261647062f0 Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Wed, 18 Apr 2012 12:13:00 +0530
Subject: [ticket/10771] changed value in help_faq.php

PHPBB3-10771
---
 phpBB/language/en/help_faq.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 5c99f81c06..9500943b88 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -43,7 +43,7 @@ $help = array(
 	),
 	array(
 		0 => 'Why do I get logged off automatically?',
-		1 => 'If you do not check the <em>Log me in automatically</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.'
+		1 => 'If you do not check the <em>Remember me</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.'
 	),
 	array(
 		0 => 'How do I prevent my username appearing in the online user listings?',
-- 
cgit v1.2.1


From a97401a180657b8b9526c5a0af055d46cf3e8487 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 11 Nov 2012 00:03:22 +0100
Subject: [ticket/10771] use remember me in acp

PHPBB3-10771
---
 phpBB/language/en/acp/board.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index a4380486cc..4adcbd689e 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -449,10 +449,10 @@ $lang = array_merge($lang, array(
 	'ACP_SECURITY_SETTINGS_EXPLAIN'		=> 'Here you are able to define session and login related settings.',
 
 	'ALL'							=> 'All',
-	'ALLOW_AUTOLOGIN'				=> 'Allow persistent logins',
-	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users can autologin when they visit the board.',
-	'AUTOLOGIN_LENGTH'				=> 'Persistent login key expiration length (in days)',
-	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which persistent login keys are removed or zero to disable.',
+	'ALLOW_AUTOLOGIN'				=> 'Allow remember me logins',
+	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users can select remember me option when they visit the board.',
+	'AUTOLOGIN_LENGTH'				=> 'Remember me login key expiration length (in days)',
+	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which remember me login keys are removed or zero to disable.',
 	'BROWSER_VALID'					=> 'Validate browser',
 	'BROWSER_VALID_EXPLAIN'			=> 'Enables browser validation for each session improving security.',
 	'CHECK_DNSBL'					=> 'Check IP against DNS Blackhole List',
-- 
cgit v1.2.1


From 619e15378dd6839b26ceb7a698b8d07fa5ebbec9 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 11 Nov 2012 00:03:45 +0100
Subject: [ticket/10771] use remember me in ucp

PHPBB3-10771
---
 phpBB/language/en/ucp.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 705b07b170..0ae58392d5 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -87,7 +87,7 @@ $lang = array_merge($lang, array(
 	'ATTACHMENTS_EXPLAIN'			=> 'This is a list of attachments you have made in posts to this board.',
 	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
 	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
-	'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected persistent login keys were successfully deleted.',
+	'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected remember me login keys were successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
 	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$s, height: %2$s, file size: %3$.2f KiB.',
 	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
@@ -380,8 +380,8 @@ $lang = array_merge($lang, array(
 	'PREFERENCES_UPDATED'		=> 'Your preferences have been updated.',
 	'PROFILE_INFO_NOTICE'		=> 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
 	'PROFILE_UPDATED'			=> 'Your profile has been updated.',
-	'PROFILE_AUTOLOGIN_KEYS'	=> 'The persistent login keys automatically log you in when you visit the board. If you logout, the persistent login key is deleted only on the computer you are using to logout. Here you can see persistent login keys created on other computers you used to access this site.',
-	'PROFILE_NO_AUTOLOGIN_KEYS'	=> 'There are no saved persistent login keys.',
+	'PROFILE_AUTOLOGIN_KEYS'	=> 'The remember me login keys automatically log you in when you visit the board. If you logout, the remember me login key is deleted only on the computer you are using to logout. Here you can see remember login keys created on other computers you used to access this site.',
+	'PROFILE_NO_AUTOLOGIN_KEYS'	=> 'There are no saved remember me login keys.',
 
 	'RECIPIENT'							=> 'Recipient',
 	'RECIPIENTS'						=> 'Recipients',
@@ -476,7 +476,7 @@ $lang = array_merge($lang, array(
 	'UCP_PROFILE_PROFILE_INFO'	=> 'Edit profile',
 	'UCP_PROFILE_REG_DETAILS'	=> 'Edit account settings',
 	'UCP_PROFILE_SIGNATURE'		=> 'Edit signature',
-	'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Edit persistent login keys',
+	'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Edit remember me login keys',
 
 	'UCP_USERGROUPS'			=> 'Usergroups',
 	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
-- 
cgit v1.2.1


From 37f2841af2d1027b92953ee2c08da44481d0a06e Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 2 Dec 2012 15:20:43 +0530
Subject: [ticket/10771] fix remember me language

PHPBB3-10771
---
 phpBB/language/en/acp/board.php | 8 ++++----
 phpBB/language/en/ucp.php       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 4adcbd689e..1b99c87938 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -449,10 +449,10 @@ $lang = array_merge($lang, array(
 	'ACP_SECURITY_SETTINGS_EXPLAIN'		=> 'Here you are able to define session and login related settings.',
 
 	'ALL'							=> 'All',
-	'ALLOW_AUTOLOGIN'				=> 'Allow remember me logins',
-	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users can select remember me option when they visit the board.',
-	'AUTOLOGIN_LENGTH'				=> 'Remember me login key expiration length (in days)',
-	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which remember me login keys are removed or zero to disable.',
+	'ALLOW_AUTOLOGIN'				=> 'Allow "Remember Me" logins',
+	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users are given "Remember Me" option when they visit the board.',
+	'AUTOLOGIN_LENGTH'				=> '"Remember Me" login key expiration length (in days)',
+	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which "Remember Me" login keys are removed or zero to disable.',
 	'BROWSER_VALID'					=> 'Validate browser',
 	'BROWSER_VALID_EXPLAIN'			=> 'Enables browser validation for each session improving security.',
 	'CHECK_DNSBL'					=> 'Check IP against DNS Blackhole List',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 0ae58392d5..b919699ea0 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -87,7 +87,7 @@ $lang = array_merge($lang, array(
 	'ATTACHMENTS_EXPLAIN'			=> 'This is a list of attachments you have made in posts to this board.',
 	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
 	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
-	'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected remember me login keys were successfully deleted.',
+	'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected "Remember Me" login keys were successfully deleted.',
 	'AVATAR_CATEGORY'				=> 'Category',
 	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$s, height: %2$s, file size: %3$.2f KiB.',
 	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
@@ -380,8 +380,8 @@ $lang = array_merge($lang, array(
 	'PREFERENCES_UPDATED'		=> 'Your preferences have been updated.',
 	'PROFILE_INFO_NOTICE'		=> 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
 	'PROFILE_UPDATED'			=> 'Your profile has been updated.',
-	'PROFILE_AUTOLOGIN_KEYS'	=> 'The remember me login keys automatically log you in when you visit the board. If you logout, the remember me login key is deleted only on the computer you are using to logout. Here you can see remember login keys created on other computers you used to access this site.',
-	'PROFILE_NO_AUTOLOGIN_KEYS'	=> 'There are no saved remember me login keys.',
+	'PROFILE_AUTOLOGIN_KEYS'	=> 'The "Remember Me" login keys automatically log you in when you visit the board. If you logout, the remember me login key is deleted only on the computer you are using to logout. Here you can see remember login keys created on other computers you used to access this site.',
+	'PROFILE_NO_AUTOLOGIN_KEYS'	=> 'There are no saved "Remember Me" login keys.',
 
 	'RECIPIENT'							=> 'Recipient',
 	'RECIPIENTS'						=> 'Recipients',
@@ -476,7 +476,7 @@ $lang = array_merge($lang, array(
 	'UCP_PROFILE_PROFILE_INFO'	=> 'Edit profile',
 	'UCP_PROFILE_REG_DETAILS'	=> 'Edit account settings',
 	'UCP_PROFILE_SIGNATURE'		=> 'Edit signature',
-	'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Edit remember me login keys',
+	'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Edit "Remember Me" login keys',
 
 	'UCP_USERGROUPS'			=> 'Usergroups',
 	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
-- 
cgit v1.2.1


From b67f112e03cf37436bdd650ea4b9a75b35000fdd Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 02:52:18 -0500
Subject: [ticket/10091] Bump minimum supported postgresql version to 8.3.

PHPBB3-10091
---
 phpBB/language/en/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index cb6a17afa2..1c45deae11 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -210,7 +210,7 @@ $lang = array_merge($lang, array(
 	<p>phpBB3 supports the following databases:</p>
 	<ul>
 		<li>MySQL 3.23 or above (MySQLi supported)</li>
-		<li>PostgreSQL 7.3+</li>
+		<li>PostgreSQL 8.3+</li>
 		<li>SQLite 2.8.2+</li>
 		<li>Firebird 2.1+</li>
 		<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
-- 
cgit v1.2.1


From 4103c99a8676653a868014a6f58a76e8986bd5ed Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 1 Mar 2012 16:15:11 +0100
Subject: [ticket/10679] Add new permission for changing profile field
 information

The setting is copied from "Can use signature"

PHPBB3-10679
---
 phpBB/language/en/acp/permissions_phpbb.php | 1 +
 phpBB/language/en/ucp.php                   | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index b142cfd9aa..27ef714f8b 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -102,6 +102,7 @@ $lang = array_merge($lang, array(
 	'acl_u_chgemail'	=> array('lang' => 'Can change email address', 'cat' => 'profile'),
 	'acl_u_chgavatar'	=> array('lang' => 'Can change avatar', 'cat' => 'profile'),
 	'acl_u_chggrp'		=> array('lang' => 'Can change default usergroup', 'cat' => 'profile'),
+	'acl_u_chgprofileinfo'	=> array('lang' => 'Can change profile field information', 'cat' => 'profile'),
 
 	'acl_u_attach'		=> array('lang' => 'Can attach files', 'cat' => 'post'),
 	'acl_u_download'	=> array('lang' => 'Can download files', 'cat' => 'post'),
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index b919699ea0..267ae00710 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -318,6 +318,7 @@ $lang = array_merge($lang, array(
 	'NO_AUTH_FORWARD_MESSAGE'		=> 'You are not authorised to forward private messages.',
 	'NO_AUTH_GROUP_MESSAGE'			=> 'You are not authorised to send private messages to groups.',
 	'NO_AUTH_PASSWORD_REMINDER'		=> 'You are not authorised to request a new password.',
+	'NO_AUTH_PROFILEINFO'			=> 'You are not authorised to change your profile information.',
 	'NO_AUTH_READ_HOLD_MESSAGE'		=> 'You are not authorised to read private messages that are on hold.',
 	'NO_AUTH_READ_MESSAGE'			=> 'You are not authorised to read private messages.',
 	'NO_AUTH_READ_REMOVED_MESSAGE'	=> 'You are not able to read this message because it was removed by the author.',
-- 
cgit v1.2.1


From b91ba8d5f1c05bc285e3f3b24fc5ffd50f6ee3ed Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Dec 2012 13:18:11 -0600
Subject: [ticket/11103] Newlines at end of files

PHPBB3-11103
---
 phpBB/language/en/email/newtopic_notify.txt         | 2 +-
 phpBB/language/en/email/post_disapproved.txt        | 2 +-
 phpBB/language/en/email/privmsg_notify.txt          | 2 +-
 phpBB/language/en/email/short/newtopic_notify.txt   | 2 +-
 phpBB/language/en/email/short/post_disapproved.txt  | 2 +-
 phpBB/language/en/email/short/privmsg_notify.txt    | 2 +-
 phpBB/language/en/email/short/topic_approved.txt    | 2 +-
 phpBB/language/en/email/short/topic_disapproved.txt | 2 +-
 phpBB/language/en/email/short/topic_notify.txt      | 2 +-
 phpBB/language/en/email/topic_approved.txt          | 2 +-
 phpBB/language/en/email/topic_disapproved.txt       | 2 +-
 phpBB/language/en/email/topic_notify.txt            | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt
index d4f5cae620..bf6799e5be 100644
--- a/phpBB/language/en/email/newtopic_notify.txt
+++ b/phpBB/language/en/email/newtopic_notify.txt
@@ -10,4 +10,4 @@ If you no longer wish to watch this forum you can either click the "Unsubscribe
 
 {U_STOP_WATCHING_FORUM}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt
index 3bc64bb611..2f8a8381cb 100644
--- a/phpBB/language/en/email/post_disapproved.txt
+++ b/phpBB/language/en/email/post_disapproved.txt
@@ -9,4 +9,4 @@ The following reason was given for the disapproval:
 {REASON}
 
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt
index d3a86cc73c..41fdbb782c 100644
--- a/phpBB/language/en/email/privmsg_notify.txt
+++ b/phpBB/language/en/email/privmsg_notify.txt
@@ -12,4 +12,4 @@ You can view your new message by clicking on the following link:
 
 You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt
index d4f5cae620..bf6799e5be 100644
--- a/phpBB/language/en/email/short/newtopic_notify.txt
+++ b/phpBB/language/en/email/short/newtopic_notify.txt
@@ -10,4 +10,4 @@ If you no longer wish to watch this forum you can either click the "Unsubscribe
 
 {U_STOP_WATCHING_FORUM}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/post_disapproved.txt b/phpBB/language/en/email/short/post_disapproved.txt
index 3bc64bb611..2f8a8381cb 100644
--- a/phpBB/language/en/email/short/post_disapproved.txt
+++ b/phpBB/language/en/email/short/post_disapproved.txt
@@ -9,4 +9,4 @@ The following reason was given for the disapproval:
 {REASON}
 
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/privmsg_notify.txt b/phpBB/language/en/email/short/privmsg_notify.txt
index d3a86cc73c..41fdbb782c 100644
--- a/phpBB/language/en/email/short/privmsg_notify.txt
+++ b/phpBB/language/en/email/short/privmsg_notify.txt
@@ -12,4 +12,4 @@ You can view your new message by clicking on the following link:
 
 You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_approved.txt b/phpBB/language/en/email/short/topic_approved.txt
index ffda378d30..0b09918b89 100644
--- a/phpBB/language/en/email/short/topic_approved.txt
+++ b/phpBB/language/en/email/short/topic_approved.txt
@@ -8,4 +8,4 @@ If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_disapproved.txt b/phpBB/language/en/email/short/topic_disapproved.txt
index 49ef58bf39..a4bd9c151e 100644
--- a/phpBB/language/en/email/short/topic_disapproved.txt
+++ b/phpBB/language/en/email/short/topic_disapproved.txt
@@ -9,4 +9,4 @@ The following reason was given for the disapproval:
 {REASON}
 
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt
index fa2481dd9a..472375fb22 100644
--- a/phpBB/language/en/email/short/topic_notify.txt
+++ b/phpBB/language/en/email/short/topic_notify.txt
@@ -17,4 +17,4 @@ If you no longer wish to watch this topic you can either click the "Unsubscribe
 
 {U_STOP_WATCHING_TOPIC}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt
index ffda378d30..0b09918b89 100644
--- a/phpBB/language/en/email/topic_approved.txt
+++ b/phpBB/language/en/email/topic_approved.txt
@@ -8,4 +8,4 @@ If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt
index 49ef58bf39..a4bd9c151e 100644
--- a/phpBB/language/en/email/topic_disapproved.txt
+++ b/phpBB/language/en/email/topic_disapproved.txt
@@ -9,4 +9,4 @@ The following reason was given for the disapproval:
 {REASON}
 
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
index fa2481dd9a..472375fb22 100644
--- a/phpBB/language/en/email/topic_notify.txt
+++ b/phpBB/language/en/email/topic_notify.txt
@@ -17,4 +17,4 @@ If you no longer wish to watch this topic you can either click the "Unsubscribe
 
 {U_STOP_WATCHING_TOPIC}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
-- 
cgit v1.2.1


From 6dee2539419ba2c050830b7677294603a63b559a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Dec 2012 17:01:08 -0600
Subject: [ticket/11259] Make phpbb_admin_path available everywhere

PHPBB3-11259
---
 phpBB/language/en/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 1c45deae11..f7820714e1 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -374,7 +374,7 @@ $lang = array_merge($lang, array(
 
 // Updater
 $lang = array_merge($lang, array(
-	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">Send statistics</a> module in your ACP.',
+	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version. You should now <a href="%1$s">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="%2$s">Send statistics</a> module in your ACP.',
 	'ARCHIVE_FILE'				=> 'Source file within archive',
 
 	'BACK'				=> 'Back',
-- 
cgit v1.2.1


From 4980d8b01150593175274dad45890544f56075d6 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 2 Sep 2012 23:44:13 -0400
Subject: [ticket/11088] Move style, extension and language pack management to
 customise

Instead of being separated, these related ACP modules are now grouped
intuitively.

PHPBB3-11088
---
 phpBB/language/en/acp/common.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 5eb10d50b3..61fc704b65 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -59,6 +59,7 @@ $lang = array_merge($lang, array(
 
 	'ACP_CAPTCHA'				=> 'CAPTCHA',
 
+	'ACP_CAT_CUSTOMISE'			=> 'Customise',
 	'ACP_CAT_DATABASE'			=> 'Database',
 	'ACP_CAT_DOT_MODS'			=> '.MODs',
 	'ACP_CAT_FORUMS'			=> 'Forums',
@@ -80,8 +81,10 @@ $lang = array_merge($lang, array(
 	'ACP_DISALLOW_USERNAMES'	=> 'Disallow usernames',
 
 	'ACP_EMAIL_SETTINGS'		=> 'Email settings',
-	'ACP_EXTENSION_GROUPS'		=> 'Manage extension groups',
-	'ACP_EXTENSIONS'			=> 'Manage board extensions',
+	'ACP_EXTENSION_GROUPS'		=> 'Manage file extension groups',
+	'ACP_EXTENSIONS'			=> 'Extensions',
+	'ACP_EXTENSIONS_MANAGEMENT'	=> 'Extension management',
+
 
 	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
 	'ACP_FORUM_LOGS'				=> 'Forum logs',
@@ -119,7 +122,7 @@ $lang = array_merge($lang, array(
 	'ACP_MANAGE_ATTACHMENTS'			=> 'Manage attachments',
 	'ACP_MANAGE_ATTACHMENTS_EXPLAIN'	=> 'Here you can list and delete files attached to posts and private messages.',
 
-	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions',
+	'ACP_MANAGE_EXTENSIONS'		=> 'Manage file extensions',
 	'ACP_MANAGE_FORUMS'			=> 'Manage forums',
 	'ACP_MANAGE_RANKS'			=> 'Manage ranks',
 	'ACP_MANAGE_REASONS'		=> 'Manage report/denial reasons',
@@ -165,8 +168,7 @@ $lang = array_merge($lang, array(
 	'ACP_SERVER_CONFIGURATION'	=> 'Server configuration',
 	'ACP_SERVER_SETTINGS'		=> 'Server settings',
 	'ACP_SIGNATURE_SETTINGS'	=> 'Signature settings',
-	'ACP_SMILIES'				=> 'Smilies',
-	'ACP_STYLE_COMPONENTS'		=> 'Style components',
+	'ACP_SMILIES'				=> 'Smilies',	
 	'ACP_STYLE_MANAGEMENT'		=> 'Style management',
 	'ACP_STYLES'				=> 'Styles',
 	'ACP_STYLES_CACHE'			=> 'Purge Cache',
-- 
cgit v1.2.1


From f7d9b15a973feec355ed50313207f4b71c50930e Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 3 Sep 2012 12:32:57 -0300
Subject: [ticket/11088] Removed added space

PHPBB3-11088
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 61fc704b65..e490a2c31f 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -168,7 +168,7 @@ $lang = array_merge($lang, array(
 	'ACP_SERVER_CONFIGURATION'	=> 'Server configuration',
 	'ACP_SERVER_SETTINGS'		=> 'Server settings',
 	'ACP_SIGNATURE_SETTINGS'	=> 'Signature settings',
-	'ACP_SMILIES'				=> 'Smilies',	
+	'ACP_SMILIES'				=> 'Smilies',
 	'ACP_STYLE_MANAGEMENT'		=> 'Style management',
 	'ACP_STYLES'				=> 'Styles',
 	'ACP_STYLES_CACHE'			=> 'Purge Cache',
-- 
cgit v1.2.1


From 70aea6fd7c1af79774d800eaafe11c5381e3ff32 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 12 Dec 2012 12:48:27 -0500
Subject: [ticket/11088] Fix the database updater to correctly manipulate the
 modules

PHPBB3-11088
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index e490a2c31f..037b76b907 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -82,8 +82,8 @@ $lang = array_merge($lang, array(
 
 	'ACP_EMAIL_SETTINGS'		=> 'Email settings',
 	'ACP_EXTENSION_GROUPS'		=> 'Manage file extension groups',
+	'ACP_EXTENSION_MANAGEMENT'	=> 'Extension management',
 	'ACP_EXTENSIONS'			=> 'Extensions',
-	'ACP_EXTENSIONS_MANAGEMENT'	=> 'Extension management',
 
 
 	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
-- 
cgit v1.2.1


From 6dc89d6e31442f8d2024b8e9b7b0071f199f7952 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 12 Dec 2012 19:36:52 -0500
Subject: [ticket/11088] Changed "file extensions" to "attachment extensions"

PHPBB3-11088
---
 phpBB/language/en/acp/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 037b76b907..427e4f4d98 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -81,7 +81,7 @@ $lang = array_merge($lang, array(
 	'ACP_DISALLOW_USERNAMES'	=> 'Disallow usernames',
 
 	'ACP_EMAIL_SETTINGS'		=> 'Email settings',
-	'ACP_EXTENSION_GROUPS'		=> 'Manage file extension groups',
+	'ACP_EXTENSION_GROUPS'		=> 'Manage attachment extension groups',
 	'ACP_EXTENSION_MANAGEMENT'	=> 'Extension management',
 	'ACP_EXTENSIONS'			=> 'Extensions',
 
@@ -122,7 +122,7 @@ $lang = array_merge($lang, array(
 	'ACP_MANAGE_ATTACHMENTS'			=> 'Manage attachments',
 	'ACP_MANAGE_ATTACHMENTS_EXPLAIN'	=> 'Here you can list and delete files attached to posts and private messages.',
 
-	'ACP_MANAGE_EXTENSIONS'		=> 'Manage file extensions',
+	'ACP_MANAGE_EXTENSIONS'		=> 'Manage attachment extensions',
 	'ACP_MANAGE_FORUMS'			=> 'Manage forums',
 	'ACP_MANAGE_RANKS'			=> 'Manage ranks',
 	'ACP_MANAGE_REASONS'		=> 'Manage report/denial reasons',
-- 
cgit v1.2.1


From 45d1558b7e5dde0e9be1aa90ba013fc6536aa0cb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 18 Dec 2012 15:41:36 +0100
Subject: [feature/soft-delete] Add missing language strings

PHPBB3-9657
---
 phpBB/language/en/mcp.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index e2533e2352..d260093cdb 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -52,6 +52,10 @@ $lang = array_merge($lang, array(
 	'APPROVE_POST_CONFIRM'	=> 'Are you sure you want to approve this post?',
 	'APPROVE_POSTS'			=> 'Approve posts',
 	'APPROVE_POSTS_CONFIRM'	=> 'Are you sure you want to approve the selected posts?',
+	'APPROVE_TOPIC'			=> 'Approve topic',
+	'APPROVE_TOPIC_CONFIRM'	=> 'Are you sure you want to approve this topic?',
+	'APPROVE_TOPICS'		=> 'Approve topics',
+	'APPROVE_TOPICS_CONFIRM'=> 'Are you sure you want to approve the selected topics?',
 
 	'CANNOT_MOVE_SAME_FORUM'=> 'You cannot move a topic to the forum it’s already in.',
 	'CANNOT_WARN_ANONYMOUS'	=> 'You cannot warn unregistered guest users.',
-- 
cgit v1.2.1


From 4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Jan 2013 10:25:08 +0100
Subject: [feature/avatars] Inform user of no available local avatars

Rather than showing the user an empty drop-down list for the local avatar
categories, inform him/her that there are currently no (local) avatars
available.

PHPBB3-10018
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6277457af7..02b4443a56 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -396,6 +396,7 @@ $lang = array_merge($lang, array(
 	'NO_AUTH_ADMIN'				=> 'Access to the Administration Control Panel is not allowed as you do not have administrative permissions.',
 	'NO_AUTH_ADMIN_USER_DIFFER'	=> 'You are not able to re-authenticate as a different user.',
 	'NO_AUTH_OPERATION'			=> 'You do not have the necessary permissions to complete this operation.',
+	'NO_AVATARS'				=> 'No avatars currently available',
 	'NO_CONNECT_TO_SMTP_HOST'	=> 'Could not connect to smtp host : %1$s : %2$s',
 	'NO_BIRTHDAYS'				=> 'No birthdays today',
 	'NO_EMAIL_MESSAGE'			=> 'Email message was blank.',
-- 
cgit v1.2.1


From 8f8527a416be41ba5f2ac984e944f76817260ed2 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Jan 2013 17:23:22 +0100
Subject: [feature/avatars] Improve handling of incorrect input for avatars

The upload avatar driver will now inform the user if insufficient data has
been entered for both remote and local avatar uploads.
The local avatar driver (gallery avatar) will also inform the user if he
didn't select a category and/or file before submitting.

PHPBB3-10018
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 02b4443a56..f064dd43ac 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -397,6 +397,7 @@ $lang = array_merge($lang, array(
 	'NO_AUTH_ADMIN_USER_DIFFER'	=> 'You are not able to re-authenticate as a different user.',
 	'NO_AUTH_OPERATION'			=> 'You do not have the necessary permissions to complete this operation.',
 	'NO_AVATARS'				=> 'No avatars currently available',
+	'NO_AVATAR_SELECTED'		=> 'You have not selected any avatar.',
 	'NO_CONNECT_TO_SMTP_HOST'	=> 'Could not connect to smtp host : %1$s : %2$s',
 	'NO_BIRTHDAYS'				=> 'No birthdays today',
 	'NO_EMAIL_MESSAGE'			=> 'Email message was blank.',
-- 
cgit v1.2.1


From 9affd6f7e7b95442f1ef14894858d8213f3fbd2a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 11 Jan 2013 00:41:03 +0100
Subject: [ticket/11201] Remove MSN/WLM fields

WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype
uses a different login ID and service, the values in this field are useless.
So we can safely remove the field and the links/functions we create.

PHPBB3-11201
---
 phpBB/language/en/acp/styles.php | 1 -
 phpBB/language/en/common.php     | 3 ---
 phpBB/language/en/memberlist.php | 4 ----
 phpBB/language/en/ucp.php        | 1 -
 4 files changed, 9 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index e7954ff148..3cb2e741ca 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -186,7 +186,6 @@ $lang = array_merge($lang, array(
 	'IMG_ICON_CONTACT_EMAIL'	=> 'Send email',
 	'IMG_ICON_CONTACT_ICQ'		=> 'ICQ',
 	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
-	'IMG_ICON_CONTACT_MSNM'		=> 'WLM',
 	'IMG_ICON_CONTACT_PM'		=> 'Send message',
 	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',
 	'IMG_ICON_CONTACT_WWW'		=> 'Website',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6277457af7..6cad4136a2 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -368,7 +368,6 @@ $lang = array_merge($lang, array(
 	'MODERATORS'			=> 'Moderators',
 	'MONTH'					=> 'Month',
 	'MOVE'					=> 'Move',
-	'MSNM'					=> 'WLM',
 
 	'NA'						=> 'N/A',
 	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
@@ -627,7 +626,6 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_INTERESTS'			=> 'The interests you entered is too long.',
 	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
 	'TOO_LONG_LOCATION'				=> 'The location you entered is too long.',
-	'TOO_LONG_MSN'					=> 'The WLM name you entered is too long.',
 	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
 	'TOO_LONG_OCCUPATION'			=> 'The occupation you entered is too long.',
 	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
@@ -648,7 +646,6 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_INTERESTS'			=> 'The interests you entered is too short.',
 	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
 	'TOO_SHORT_LOCATION'			=> 'The location you entered is too short.',
-	'TOO_SHORT_MSN'					=> 'The WLM name you entered is too short.',
 	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_OCCUPATION'			=> 'The occupation you entered is too short.',
 	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index ec21e8e904..bc5a0c100b 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -78,9 +78,6 @@ $lang = array_merge($lang, array(
 	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
 	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
 	'IM_MESSAGE'			=> 'Your message',
-	'IM_MSNM'				=> 'Please note that you need Windows Live Messenger installed to use this.',
-	'IM_MSNM_BROWSER'		=> 'Your browser does not support this.',
-	'IM_MSNM_CONNECT'		=> 'WLM is not connected.\nYou have to connect to WLM to continue.',
 	'IM_NAME'				=> 'Your Name',
 	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
 	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
@@ -123,7 +120,6 @@ $lang = array_merge($lang, array(
 	'SEND_IM'				=> 'Instant messaging',
 	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
 	'SEND_MESSAGE'			=> 'Message',
-	'SEND_MSNM_MESSAGE'		=> 'Send WLM message',
 	'SEND_YIM_MESSAGE'		=> 'Send YIM message',
 	'SORT_EMAIL'			=> 'Email',
 	'SORT_LAST_ACTIVE'		=> 'Last active',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 267ae00710..2eb34b3713 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -455,7 +455,6 @@ $lang = array_merge($lang, array(
 	'UCP_MAIN_FRONT'			=> 'Front page',
 	'UCP_MAIN_SUBSCRIBED'		=> 'Manage subscriptions',
 
-	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
 	'UCP_PREFS'					=> 'Board preferences',
-- 
cgit v1.2.1


From 1d5f8a2bbf13305f9ba651c7ed131911dbcfa016 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 16 Jan 2013 11:37:13 +0200
Subject: [ticket/11328] Add language variables for buttons

New language variables for buttons

PHPBB3-11328
---
 phpBB/language/en/common.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6cad4136a2..63241b71b5 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -119,6 +119,17 @@ $lang = array_merge($lang, array(
 		1	=> 'Users browsing this forum: %2$s and %1$d guest',
 		2	=> 'Users browsing this forum: %2$s and %1$d guests',
 	),
+	'BUTTON_EDIT'			=> 'Edit',
+	'BUTTON_FORUM_LOCKED'	=> 'Locked',
+	'BUTTON_NEW_TOPIC'		=> 'New Topic',
+	'BUTTON_PM'				=> 'PM',
+	'BUTTON_PM_FORWARD'		=> 'Forward',
+	'BUTTON_PM_NEW'			=> 'New PM',
+	'BUTTON_PM_REPLY'		=> 'Send Reply',
+	'BUTTON_PM_REPLY_ALL'	=> 'Reply All',
+	'BUTTON_POST_REPLY'		=> 'Post Reply',
+	'BUTTON_QUOTE'			=> 'Quote',
+	'BUTTON_TOPIC_LOCKED'	=> 'Locked',
 	'BYTES'					=> 'Bytes',
 
 	'CANCEL'				=> 'Cancel',
-- 
cgit v1.2.1


From 336187151a2010197ddda1bcdabc311fd10c1c87 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Feb 2013 01:30:04 +0100
Subject: [ticket/11201] Revert WLM dropping because it is still used in China.

Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.

This commit reverts commits
 - 460470229d972b93ef5a98b0d1d97a2a970d684f
 - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.

PHPBB3-11201
---
 phpBB/language/en/acp/styles.php | 1 +
 phpBB/language/en/common.php     | 3 +++
 phpBB/language/en/memberlist.php | 4 ++++
 phpBB/language/en/ucp.php        | 1 +
 4 files changed, 9 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 3cb2e741ca..e7954ff148 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -186,6 +186,7 @@ $lang = array_merge($lang, array(
 	'IMG_ICON_CONTACT_EMAIL'	=> 'Send email',
 	'IMG_ICON_CONTACT_ICQ'		=> 'ICQ',
 	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
+	'IMG_ICON_CONTACT_MSNM'		=> 'WLM',
 	'IMG_ICON_CONTACT_PM'		=> 'Send message',
 	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',
 	'IMG_ICON_CONTACT_WWW'		=> 'Website',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 63241b71b5..8158209a68 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -379,6 +379,7 @@ $lang = array_merge($lang, array(
 	'MODERATORS'			=> 'Moderators',
 	'MONTH'					=> 'Month',
 	'MOVE'					=> 'Move',
+	'MSNM'					=> 'WLM',
 
 	'NA'						=> 'N/A',
 	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
@@ -637,6 +638,7 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_INTERESTS'			=> 'The interests you entered is too long.',
 	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
 	'TOO_LONG_LOCATION'				=> 'The location you entered is too long.',
+	'TOO_LONG_MSN'					=> 'The WLM name you entered is too long.',
 	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
 	'TOO_LONG_OCCUPATION'			=> 'The occupation you entered is too long.',
 	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
@@ -657,6 +659,7 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_INTERESTS'			=> 'The interests you entered is too short.',
 	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
 	'TOO_SHORT_LOCATION'			=> 'The location you entered is too short.',
+	'TOO_SHORT_MSN'					=> 'The WLM name you entered is too short.',
 	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_OCCUPATION'			=> 'The occupation you entered is too short.',
 	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index bc5a0c100b..ec21e8e904 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -78,6 +78,9 @@ $lang = array_merge($lang, array(
 	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
 	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
 	'IM_MESSAGE'			=> 'Your message',
+	'IM_MSNM'				=> 'Please note that you need Windows Live Messenger installed to use this.',
+	'IM_MSNM_BROWSER'		=> 'Your browser does not support this.',
+	'IM_MSNM_CONNECT'		=> 'WLM is not connected.\nYou have to connect to WLM to continue.',
 	'IM_NAME'				=> 'Your Name',
 	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
 	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
@@ -120,6 +123,7 @@ $lang = array_merge($lang, array(
 	'SEND_IM'				=> 'Instant messaging',
 	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
 	'SEND_MESSAGE'			=> 'Message',
+	'SEND_MSNM_MESSAGE'		=> 'Send WLM message',
 	'SEND_YIM_MESSAGE'		=> 'Send YIM message',
 	'SORT_EMAIL'			=> 'Email',
 	'SORT_LAST_ACTIVE'		=> 'Last active',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 2eb34b3713..267ae00710 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -455,6 +455,7 @@ $lang = array_merge($lang, array(
 	'UCP_MAIN_FRONT'			=> 'Front page',
 	'UCP_MAIN_SUBSCRIBED'		=> 'Manage subscriptions',
 
+	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
 	'UCP_PREFS'					=> 'Board preferences',
-- 
cgit v1.2.1


From babdb92aa998728b58eec1e3f2c036b5f2342492 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 17:25:53 -0600
Subject: [feature/migrations] Remove hardcoded language, use lang instead.

PHPBB3-9737
---
 phpBB/language/en/install.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index f7820714e1..7607512eab 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -397,7 +397,10 @@ $lang = array_merge($lang, array(
 	'CURRENT_VERSION'				=> 'Current version',
 
 	'DATABASE_TYPE'						=> 'Database type',
+	'DATABASE_UPDATE_COMPLETE'			=> 'Database updater has completed!',
+	'DATABASE_UPDATE_CONTINUE'			=> 'Continue database update.',
 	'DATABASE_UPDATE_INFO_OLD'			=> 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.',
+	'DATABASE_UPDATE_NOT_COMPLETED'		=> 'The database update has not yet completed.',
 	'DELETE_USER_REMOVE'				=> 'Delete user and remove posts',
 	'DELETE_USER_RETAIN'				=> 'Delete user but keep posts',
 	'DESTINATION'						=> 'Destination file',
-- 
cgit v1.2.1


From cacaffee6e013e43b75212d49960922f88f9f69a Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Feb 2013 20:56:42 -0600
Subject: [feature/migrations] Add language strings for migrations errors

Unfulfillable returns string of the missing dependency name now if
the migration is unfulfillable (this is significantly more helpful).

PHPBB3-11351
---
 phpBB/language/en/migrator.php | 55 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 phpBB/language/en/migrator.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
new file mode 100644
index 0000000000..bc9fbc57af
--- /dev/null
+++ b/phpBB/language/en/migrator.php
@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* migrator [English]
+*
+* @package language
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'CONFIG_ALREADY_EXIST'				=> 'The config setting "%s" unexpectedly already exists.',
+	'CONFIG_NOT_EXIST'					=> 'The config setting "%s" unexpectedly does not exist.',
+
+	'GROUP_NOT_EXIST'					=> 'The group "%s" unexpectedly does not exist.',
+
+	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
+
+	'MODULE_ALREADY_EXIST'				=> 'The module "%s" unexpectedly already exists.',
+	'MODULE_ERROR'						=> 'An error occured while creating a module: %s',
+	'MODULE_INFO_FILE_NOT_EXIST'		=> 'A required module info file is missing: %2$s',
+	'MODULE_NOT_EXIST'					=> 'A required module does not exist: %s',
+	'MODULE_NOT_REMOVABLE'				=> 'Module %1$s was unable to be removed: %2$s',
+
+	'PERMISSION_ALREADY_EXIST'			=> 'The permission setting "%s" unexpectedly already exists.',
+	'PERMISSION_NOT_EXIST'				=> 'The permission setting "%s" unexpectedly does not exist.',
+
+	'ROLE_NOT_EXIST'					=> 'The permission role "%s" unexpectedly does not exist.',
+));
-- 
cgit v1.2.1


From f409697137b0b1d01b663bb81d12f6179c3922e3 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Feb 2013 21:06:08 -0600
Subject: [feature/migrations] Add explanatory language string for migration
 errors

This should be used if an exception is thrown to inform the user of
what occurred.

PHPBB3-11351
---
 phpBB/language/en/migrator.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index bc9fbc57af..84074c391c 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -40,6 +40,7 @@ $lang = array_merge($lang, array(
 
 	'GROUP_NOT_EXIST'					=> 'The group "%s" unexpectedly does not exist.',
 
+	'MIGRATION_EXCEPTION_ERROR'			=> 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.',
 	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
 
 	'MODULE_ALREADY_EXIST'				=> 'The module "%s" unexpectedly already exists.',
-- 
cgit v1.2.1


From dc9cfcd613a722e65ac8645cf8e2d0b60d5fa21f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 13 Feb 2013 13:30:05 -0600
Subject: [ticket/11103] Make the number of notifications strong if > 0

PHPBB3-11103
---
 phpBB/language/en/common.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5954ec0501..b747310e5e 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -403,8 +403,9 @@ $lang = array_merge($lang, array(
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
 	'NOTIFICATIONS'				=> 'Notifications',
 	'NOTIFICATIONS_COUNT'		=> array(
-		1	=> '%d Notification',
-		2	=> '%d Notifications',
+		0	=> '%d Notifications',
+		1	=> '<strong>%d</strong> Notification',
+		2	=> '<strong>%d</strong> Notifications',
 	),
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
-- 
cgit v1.2.1


From 3cc4746ad3220910b6cbb17772ba594ae26e7c32 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 19 Feb 2013 12:45:08 +0100
Subject: [feature/avatars] Use "Main" as category for avatars in root of
 gallery

Before this change the whole avatar gallery path would show as category.
Additionally, the avatars that were selected like that had an incorrect
path and didn't show up correctly.
With this patch it'll display "Main" as category and properly work.

PHPBBB3-10018
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6c723a5060..7758d0af16 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -358,6 +358,7 @@ $lang = array_merge($lang, array(
 	'LOGOUT_USER'						=> 'Logout [ %s ]',
 	'LOG_ME_IN'							=> 'Remember me',
 
+	'MAIN'					=> 'Main',
 	'MARK'					=> 'Mark',
 	'MARK_ALL'				=> 'Mark all',
 	'MARK_FORUMS_READ'		=> 'Mark forums read',
-- 
cgit v1.2.1


From 9ea48dbd45aaa7d239998910feddcc827aaaafe9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 25 Feb 2013 20:24:11 +0100
Subject: [ticket/10411] Use template loops instead of defining the html in php
 files

PHPBB3-10411
---
 phpBB/language/en/acp/groups.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 18e5cbaa1d..58101e5f60 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -36,14 +36,13 @@ if (empty($lang) || !is_array($lang))
 
 $lang = array_merge($lang, array(
 	'ACP_GROUPS_MANAGE_EXPLAIN'		=> 'From this panel you can administer all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.',
-	'ADD_CATEGORY'					=> 'Add category',
+	'ADD_GROUP_CATEGORY'			=> 'Add category',
 	'ADD_USERS'						=> 'Add users',
 	'ADD_USERS_EXPLAIN'				=> 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.',
 
 	'COPY_PERMISSIONS'				=> 'Copy permissions from',
 	'COPY_PERMISSIONS_EXPLAIN'		=> 'Once created, the group will have the same permissions as the one you select here.',
 	'CREATE_GROUP'					=> 'Create new group',
-	'CATEGORY_NAME'					=> 'Category name',
 
 	'GROUPS_NO_MEMBERS'				=> 'This group has no members',
 	'GROUPS_NO_MODS'				=> 'No group leaders defined',
@@ -52,6 +51,7 @@ $lang = array_merge($lang, array(
 	'GROUP_APPROVED'				=> 'Approved members',
 	'GROUP_AVATAR'					=> 'Group avatar',
 	'GROUP_AVATAR_EXPLAIN'			=> 'This image will be displayed in the Group Control Panel.',
+	'GROUP_CATEGORY_NAME'			=> 'Category name',
 	'GROUP_CLOSED'					=> 'Closed',
 	'GROUP_COLOR'					=> 'Group colour',
 	'GROUP_COLOR_EXPLAIN'			=> 'Defines the colour members’ usernames will appear in, leave blank for user default.',
-- 
cgit v1.2.1


From db5a05418d251c65ee6cdc1571d4a23c5dd7a7fe Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 28 Feb 2013 17:48:46 -0600
Subject: [ticket/11103] Few more minor language things

PHPBB3-11103
---
 phpBB/language/en/ucp.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 65a8711733..c8b0686a5b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -290,7 +290,7 @@ $lang = array_merge($lang, array(
 
 	'NOTIFICATIONS_MARK_ALL_READ'						=> 'Mark all notifications read',
 	'NOTIFICATIONS_MARK_ALL_READ_CONFIRM'				=> 'Are you sure you want to mark all notifications read?',
-	'NOTIFICATIONS_MARK_ALL_READ_SUCCESS'				=> 'All notifications have been marked read successfully.',
+	'NOTIFICATIONS_MARK_ALL_READ_SUCCESS'				=> 'All notifications have been marked read.',
 	'NOTIFICATION_GROUP_MISCELLANEOUS'					=> 'Miscellaneous Notifications',
 	'NOTIFICATION_GROUP_MODERATION'						=> 'Moderation Notifications',
 	'NOTIFICATION_GROUP_POSTING'						=> 'Posting Notifications',
@@ -301,10 +301,10 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'				=> 'A post or topic needs approval',
 	'NOTIFICATION_TYPE_MODERATION_QUEUE'   				=> 'Your topics/posts are approved or disapproved by a moderator',
 	'NOTIFICATION_TYPE_PM'								=> 'Someone sends you a private message',
-	'NOTIFICATION_TYPE_POST'							=> 'Someone replies to a topic you are subscribed to',
+	'NOTIFICATION_TYPE_POST'							=> 'Someone replies to a topic to which you are subscribed',
 	'NOTIFICATION_TYPE_QUOTE'							=> 'Someone quotes you in a post',
 	'NOTIFICATION_TYPE_REPORT'							=> 'Someone reports a post',
-	'NOTIFICATION_TYPE_TOPIC'				   			=> 'Someone creates a topic in a forum you are subscribed to',
+	'NOTIFICATION_TYPE_TOPIC'				   			=> 'Someone creates a topic in a forum to which you are subscribed',
 
 	'NOTIFY_METHOD'					=> 'Notification method',
 	'NOTIFY_METHOD_BOTH'			=> 'Both',
-- 
cgit v1.2.1


From 6cad032fbb2ceba892c861f8a2abab82574b12ae Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 3 Mar 2013 20:18:05 -0600
Subject: [ticket/11393] Give more information on database updater

PHPBB3-11393
---
 phpBB/language/en/migrator.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index 84074c391c..a62da483cf 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -40,8 +40,11 @@ $lang = array_merge($lang, array(
 
 	'GROUP_NOT_EXIST'					=> 'The group "%s" unexpectedly does not exist.',
 
+	'MIGRATION_DATA_DONE'				=> 'Installed Data: %s',
+	'MIGRATION_EFFECTIVELY_INSTALLED'	=> 'Migration already effectively installed (skipped): %s',
 	'MIGRATION_EXCEPTION_ERROR'			=> 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.',
 	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
+	'MIGRATION_SCHEMA_DONE'				=> 'Installed Schema: %s',
 
 	'MODULE_ALREADY_EXIST'				=> 'The module "%s" unexpectedly already exists.',
 	'MODULE_ERROR'						=> 'An error occured while creating a module: %s',
-- 
cgit v1.2.1


From 2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 3 Mar 2013 20:25:31 -0600
Subject: [ticket/11394] Relax Migration Tools

Do not throw as many exceptions in the migration tools (when something
unexpected occurs but can be safely ignored).

PHPBB3-11394
---
 phpBB/language/en/migrator.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index 84074c391c..59e6f06884 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -35,7 +35,6 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 $lang = array_merge($lang, array(
-	'CONFIG_ALREADY_EXIST'				=> 'The config setting "%s" unexpectedly already exists.',
 	'CONFIG_NOT_EXIST'					=> 'The config setting "%s" unexpectedly does not exist.',
 
 	'GROUP_NOT_EXIST'					=> 'The group "%s" unexpectedly does not exist.',
@@ -43,13 +42,10 @@ $lang = array_merge($lang, array(
 	'MIGRATION_EXCEPTION_ERROR'			=> 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.',
 	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
 
-	'MODULE_ALREADY_EXIST'				=> 'The module "%s" unexpectedly already exists.',
 	'MODULE_ERROR'						=> 'An error occured while creating a module: %s',
 	'MODULE_INFO_FILE_NOT_EXIST'		=> 'A required module info file is missing: %2$s',
 	'MODULE_NOT_EXIST'					=> 'A required module does not exist: %s',
-	'MODULE_NOT_REMOVABLE'				=> 'Module %1$s was unable to be removed: %2$s',
 
-	'PERMISSION_ALREADY_EXIST'			=> 'The permission setting "%s" unexpectedly already exists.',
 	'PERMISSION_NOT_EXIST'				=> 'The permission setting "%s" unexpectedly does not exist.',
 
 	'ROLE_NOT_EXIST'					=> 'The permission role "%s" unexpectedly does not exist.',
-- 
cgit v1.2.1


From d4aae49aa0d2a0ab67b5815c682e330e255b6879 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 6 Mar 2013 12:31:01 +0100
Subject: [ticket/9657] Move softdelete permission to new post-tab

PHPBB3-9657
---
 phpBB/language/en/acp/permissions_phpbb.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 616dd46332..cf3a80e811 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -153,7 +153,7 @@ $lang = array_merge($lang, array(
 	'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
 	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'post'),
 	'acl_f_delete'		=> array('lang' => 'Can permanently delete own posts', 'cat' => 'post'),
-	'acl_f_softdelete'  => array('lang' => 'Can delete own posts', 'cat' => 'actions'),
+	'acl_f_softdelete'  => array('lang' => 'Can delete own posts', 'cat' => 'post'),
 	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'post'),
 	'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'post'),
 	'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'post'),	
-- 
cgit v1.2.1


From 0f7303627550da228e18251256ce180e309cda11 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 7 Mar 2013 14:10:16 +0100
Subject: [ticket/9657] Explain soft delete permission in ACP

PHPBB3-9657
---
 phpBB/language/en/acp/permissions_phpbb.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index cf3a80e811..87e316383c 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -153,7 +153,7 @@ $lang = array_merge($lang, array(
 	'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
 	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'post'),
 	'acl_f_delete'		=> array('lang' => 'Can permanently delete own posts', 'cat' => 'post'),
-	'acl_f_softdelete'  => array('lang' => 'Can delete own posts', 'cat' => 'post'),
+	'acl_f_softdelete'  => array('lang' => 'Can soft delete own posts<br /><em>Soft deleted posts can be restored by moderators, having the approve posts permission.</em>', 'cat' => 'post'),
 	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'post'),
 	'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'post'),
 	'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'post'),	
@@ -178,7 +178,7 @@ $lang = array_merge($lang, array(
 	'acl_m_approve'		=> array('lang' => 'Can approve posts', 'cat' => 'post_actions'),
 	'acl_m_report'		=> array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
 	'acl_m_chgposter'	=> array('lang' => 'Can change post author', 'cat' => 'post_actions'),
-	'acl_m_softdelete'	=> array('lang' => 'Can delete posts', 'cat' => 'post_actions'),
+	'acl_m_softdelete'	=> array('lang' => 'Can soft delete posts<br /><em>Soft deleted posts can be restored by moderators, having the approve posts permission.</em>', 'cat' => 'post_actions'),
 	'acl_m_restore'		=> array('lang' => 'Can restore deleted posts', 'cat' => 'post_actions'),
 
 	'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
-- 
cgit v1.2.1


From 8b24ccb894b2ec515b4bed3c582b215d1d6baab9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 11 Mar 2013 12:13:59 +0100
Subject: [ticket/9657] Fix some language problems and inconsistences

PHPBB3-9657
---
 phpBB/language/en/acp/permissions_phpbb.php | 6 +++---
 phpBB/language/en/common.php                | 2 +-
 phpBB/language/en/mcp.php                   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 87e316383c..d2834c24f7 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -153,7 +153,7 @@ $lang = array_merge($lang, array(
 	'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
 	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'post'),
 	'acl_f_delete'		=> array('lang' => 'Can permanently delete own posts', 'cat' => 'post'),
-	'acl_f_softdelete'  => array('lang' => 'Can soft delete own posts<br /><em>Soft deleted posts can be restored by moderators, having the approve posts permission.</em>', 'cat' => 'post'),
+	'acl_f_softdelete'  => array('lang' => 'Can soft delete own posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>', 'cat' => 'post'),
 	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'post'),
 	'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'post'),
 	'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'post'),	
@@ -174,11 +174,11 @@ $lang = array_merge($lang, array(
 // Moderator Permissions
 $lang = array_merge($lang, array(
 	'acl_m_edit'		=> array('lang' => 'Can edit posts', 'cat' => 'post_actions'),
-	'acl_m_delete'		=> array('lang' => 'Can delete posts permanently', 'cat' => 'post_actions'),
+	'acl_m_delete'		=> array('lang' => 'Can permanently delete posts', 'cat' => 'post_actions'),
+	'acl_m_softdelete'	=> array('lang' => 'Can soft delete posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>', 'cat' => 'post_actions'),
 	'acl_m_approve'		=> array('lang' => 'Can approve posts', 'cat' => 'post_actions'),
 	'acl_m_report'		=> array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
 	'acl_m_chgposter'	=> array('lang' => 'Can change post author', 'cat' => 'post_actions'),
-	'acl_m_softdelete'	=> array('lang' => 'Can soft delete posts<br /><em>Soft deleted posts can be restored by moderators, having the approve posts permission.</em>', 'cat' => 'post_actions'),
 	'acl_m_restore'		=> array('lang' => 'Can restore deleted posts', 'cat' => 'post_actions'),
 
 	'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index ab18a4b1e1..51862830cd 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -513,7 +513,7 @@ $lang = array_merge($lang, array(
 	'POSTS'					=> 'Posts',
 	'POSTS_UNAPPROVED'		=> 'At least one post in this topic has not been approved.',
 	'POST_BY_AUTHOR'		=> 'by',
-	'POST_BY_FOE'			=> 'This post was made by <strong>%1$s</strong> who is currently on your ignore list.',
+	'POST_BY_FOE'			=> '<strong>%1$s</strong>, who is currently on your ignore list, made this post.',
 	'POST_DISPLAY'			=> '%1$sDisplay this post%2$s.',
 	'POST_DAY'				=> '%.2f posts per day',
 	'POST_DELETED'			=> 'Deleted post:',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index d260093cdb..f25c104545 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -202,9 +202,9 @@ $lang = array_merge($lang, array(
 	'MCP_QUEUE_UNAPPROVED_TOPICS'			=> 'Topics awaiting approval',
 	'MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN'	=> 'This is a list of all topics which require approving before they will be visible to users.',
 	'MCP_QUEUE_DELETED_POSTS'				=> 'Deleted posts',
-	'MCP_QUEUE_DELETED_POSTS_EXPLAIN'		=> 'This is a list of all posts which have been deleted. You can restore or permanently delete the posts from this screen.',
+	'MCP_QUEUE_DELETED_POSTS_EXPLAIN'		=> 'This is a list of all soft deleted posts. You can restore or permanently delete the posts from this screen.',
 	'MCP_QUEUE_DELETED_TOPICS'				=> 'Deleted topics',
-	'MCP_QUEUE_DELETED_TOPICS_EXPLAIN'		=> 'This is a list of all topics which have been deleted. You can restore or permanently delete the topics from this screen.',
+	'MCP_QUEUE_DELETED_TOPICS_EXPLAIN'		=> 'This is a list of all soft deleted topics. You can restore or permanently delete the topics from this screen.',
 
 	'MCP_VIEW_USER'			=> 'View warnings for a specific user',
 
-- 
cgit v1.2.1


From cd95d3abf73d954618b370d6b20f9de86e267ba7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 11 Mar 2013 12:22:47 +0100
Subject: [ticket/9657] Include poster name in "deleted post" message

Also switched from passive to active form

PHPBB3-9657
---
 phpBB/language/en/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 51862830cd..5ca685a8be 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -517,8 +517,8 @@ $lang = array_merge($lang, array(
 	'POST_DISPLAY'			=> '%1$sDisplay this post%2$s.',
 	'POST_DAY'				=> '%.2f posts per day',
 	'POST_DELETED'			=> 'Deleted post:',
-	'POST_DELETED_BY'		=> 'This post was deleted by <strong>%1$s</strong> on %2$s.',
-	'POST_DELETED_BY_REASON'=> 'This post was deleted by <strong>%1$s</strong> on %2$s for reason: %3$s',
+	'POST_DELETED_BY'		=> '<strong>%2$s</strong> deleted the post by <strong>%1$s</strong> on %3$s.',
+	'POST_DELETED_BY_REASON'=> '<strong>%2$s</strong> deleted the post by <strong>%1$s</strong> on %3$s for the following reason: %4$s',
 	'POST_DETAILS'			=> 'Post details',
 	'POST_NEW_TOPIC'		=> 'Post new topic',
 	'POST_PCT'				=> '%.2f%% of all posts',
-- 
cgit v1.2.1


From b727e1eedaab27c99a733b94bcdddbc55cc929d9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 11 Mar 2013 16:37:43 +0100
Subject: [ticket/9657] Correctly split disapproving from perma deleting posts

PHPBB3-9657
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index a21831bd39..e647485828 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -569,7 +569,7 @@ $lang = array_merge($lang, array(
 	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br />» from %s',
 
 	'LOG_TOPIC_APPROVED'		=> '<strong>Approved topic</strong><br />» %s',
-	'LOG_TOPIC_RESTORED'        => '<strong>Restored topic</strong><br />» %s',
+	'LOG_TOPIC_RESTORED'		=> '<strong>Restored topic</strong><br />» %s',
 	'LOG_TOPIC_DISAPPROVED'		=> '<strong>Disapproved topic “%1$s” with the following reason</strong><br />%2$s',
 	'LOG_TOPIC_RESYNC'			=> '<strong>Resynchronised topic counters</strong><br />» %s',
 	'LOG_TOPIC_TYPE_CHANGED'	=> '<strong>Changed topic type</strong><br />» %s',
-- 
cgit v1.2.1


From 4e9cf27394da2481a8ac81a2965873a3a16b136f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 11 Mar 2013 23:08:40 +0100
Subject: [ticket/9657] Remove softdelete reason field when permanent delete is
 selected

PHPBB3-9657
---
 phpBB/language/en/posting.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 1ed312f68c..c1d8c71783 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -83,8 +83,8 @@ $lang = array_merge($lang, array(
 	'DELETE_POST_PERMANENTLY'	=> 'Permanently delete this post so it can not be recovered',
 	'DELETE_POSTS_CONFIRM'		=> 'Are you sure you want to delete these posts?',
 	'DELETE_POSTS_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete these posts?',
-	'DELETE_REASON'				=> 'Delete reason',
-	'DELETE_REASON_EXPLAIN'		=> 'The reason is only used when the post is not deleted permanently.',
+	'DELETE_REASON'				=> 'Soft delete reason',
+	'DELETE_REASON_EXPLAIN'		=> 'The reason is only shown to moderators when post is soft deleted.',
 	'DELETE_POST_WARN'			=> 'Deleted this post',
 	'DELETE_TOPIC_CONFIRM'		=> 'Are you sure you want to delete this topic?',
 	'DELETE_TOPIC_PERMANENTLY'	=> 'Permanently delete this topic so it can not be recovered',
-- 
cgit v1.2.1


From 9e5cde7f668a614ff74dc15d9c72df48dd114dbc Mon Sep 17 00:00:00 2001
From: Tabitha Backoff <t_backoff@yahoo.com>
Date: Thu, 28 Mar 2013 02:34:36 -0400
Subject: Ticket# 11477 - Allow customisation of "Board index"

---
 phpBB/language/en/acp/board.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index ff686f2360..bfc2a22e39 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -37,6 +37,8 @@ if (empty($lang) || !is_array($lang))
 // Board Settings
 $lang = array_merge($lang, array(
 	'ACP_BOARD_SETTINGS_EXPLAIN'	=> 'Here you can determine the basic operation of your board, give it a fitting name and description, and among other settings adjust the default values for timezone and language.',
+	'BOARD_HOME_TEXT'				=> 'Board index text',
+	'BOARD_HOME_TEXT_EXPLAIN'		=> 'This text is displayed as the board index in the board’s breadcrumbs. If not specified, it will default to “Board index”.',
 	'CUSTOM_DATEFORMAT'				=> 'Custom…',
 	'DEFAULT_DATE_FORMAT'			=> 'Date format',
 	'DEFAULT_DATE_FORMAT_EXPLAIN'	=> 'The date format is the same as the PHP <code>date</code> function.',
-- 
cgit v1.2.1


From a8f5695666229512ccd5d122daa0a7ad7004015b Mon Sep 17 00:00:00 2001
From: Tabitha Backoff <t_backoff@yahoo.com>
Date: Thu, 28 Mar 2013 17:53:14 -0400
Subject: Migration file and change board_home_text to board_index_text

---
 phpBB/language/en/acp/board.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index bfc2a22e39..f387158a0b 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -37,8 +37,8 @@ if (empty($lang) || !is_array($lang))
 // Board Settings
 $lang = array_merge($lang, array(
 	'ACP_BOARD_SETTINGS_EXPLAIN'	=> 'Here you can determine the basic operation of your board, give it a fitting name and description, and among other settings adjust the default values for timezone and language.',
-	'BOARD_HOME_TEXT'				=> 'Board index text',
-	'BOARD_HOME_TEXT_EXPLAIN'		=> 'This text is displayed as the board index in the board’s breadcrumbs. If not specified, it will default to “Board index”.',
+	'BOARD_INDEX_TEXT'				=> 'Board index text',
+	'BOARD_INDEX_TEXT_EXPLAIN'		=> 'This text is displayed as the board index in the board’s breadcrumbs. If not specified, it will default to “Board index”.',
 	'CUSTOM_DATEFORMAT'				=> 'Custom…',
 	'DEFAULT_DATE_FORMAT'			=> 'Date format',
 	'DEFAULT_DATE_FORMAT_EXPLAIN'	=> 'The date format is the same as the PHP <code>date</code> function.',
-- 
cgit v1.2.1


From 9f545a7f6ba7ddd54fae083563b5b582e05f5c1c Mon Sep 17 00:00:00 2001
From: asperous <theandychase@gmail.com>
Date: Tue, 23 Apr 2013 09:55:36 -0700
Subject: [ticket/9975] Moved a few E_USER_ERROR errors to /language

There were a few error messages that a user could experience that would, previously, be without any the ability to be localized. There are some more E_USER_ERRORs that I did not change to a constant, for example the error message that is displayed if there aren't any folders in /language.

PHPBB3-9975
---
 phpBB/language/en/captcha_recaptcha.php | 1 +
 phpBB/language/en/common.php            | 2 ++
 phpBB/language/en/mcp.php               | 2 ++
 3 files changed, 5 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php
index c72957ca16..3d91a9d110 100644
--- a/phpBB/language/en/captcha_recaptcha.php
+++ b/phpBB/language/en/captcha_recaptcha.php
@@ -46,4 +46,5 @@ $lang = array_merge($lang, array(
 	'RECAPTCHA_PRIVATE_EXPLAIN'		=> 'Your private reCaptcha key. Keys can be obtained on <a href="http://www.google.com/recaptcha">www.google.com/recaptcha</a>.',
 
 	'RECAPTCHA_EXPLAIN'				=> 'In an effort to prevent automatic submissions, we require that you enter both of the words displayed into the text field underneath.',
+	'RECAPTCHA_SOCKET_ERROR'		=> 'There was a problem connecting to the RECAPTCHA service: could not open socket. Try again later.',
 ));
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5d6fe03b5f..c2db496437 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -313,6 +313,7 @@ $lang = array_merge($lang, array(
 	'IN'						=> 'in',
 	'INDEX'						=> 'Index page',
 	'INFORMATION'				=> 'Information',
+	'INSECURE_REDIRECT'			=> 'Tried to redirect to potentially insecure url.',
 	'INTERESTS'					=> 'Interests',
 	'INVALID_DIGEST_CHALLENGE'	=> 'Invalid digest challenge.',
 	'INVALID_EMAIL_LOG'			=> '<strong>%s</strong> possibly an invalid email address?',
@@ -638,6 +639,7 @@ $lang = array_merge($lang, array(
 	'STATISTICS'				=> 'Statistics',
 	'START_WATCHING_FORUM'		=> 'Subscribe forum',
 	'START_WATCHING_TOPIC'		=> 'Subscribe topic',
+	'STYLE_NOT_FOUND'			=> 'Could not get style data',
 	'STOP_WATCHING_FORUM'		=> 'Unsubscribe forum',
 	'STOP_WATCHING_TOPIC'		=> 'Unsubscribe topic',
 	'SUBFORUM'					=> 'Subforum',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index eaa2d7e3a5..29f418183f 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -250,6 +250,8 @@ $lang = array_merge($lang, array(
 	'ONLY_TOPIC'			=> 'Only topic “%s”',
 	'OTHER_USERS'			=> 'Other users posting from this IP',
 
+	'QUICKMOD_ACTION_NOT_ALLOWED' => "%s not allowed as quickmod",
+
 	'PM_REPORT_CLOSED_SUCCESS'	=> 'The selected PM report has been closed successfully.',
 	'PM_REPORT_DELETED_SUCCESS'	=> 'The selected PM report has been deleted successfully.',
 	'PM_REPORTED_SUCCESS'		=> 'This private message has been successfully reported.',
-- 
cgit v1.2.1


From 1f6f2435d0d4c18bd0b7586a32534f030710c929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= <m.gaetan89@gmail.com>
Date: Mon, 22 Apr 2013 20:57:19 +0200
Subject: [ticket/11471] Unrelated text in e-mail templates

Some e-mail templates contain text unrelated
with the subject of the e-mail

PHPBB3-11471
---
 phpBB/language/en/email/post_approved.txt           | 1 -
 phpBB/language/en/email/post_disapproved.txt        | 1 -
 phpBB/language/en/email/post_in_queue.txt           | 6 +-----
 phpBB/language/en/email/report_closed.txt           | 3 +--
 phpBB/language/en/email/report_deleted.txt          | 3 +--
 phpBB/language/en/email/report_pm.txt               | 6 +-----
 phpBB/language/en/email/report_post.txt             | 6 +-----
 phpBB/language/en/email/short/post_approved.txt     | 1 -
 phpBB/language/en/email/short/post_disapproved.txt  | 1 -
 phpBB/language/en/email/short/post_in_queue.txt     | 6 +-----
 phpBB/language/en/email/short/report_pm.txt         | 6 +-----
 phpBB/language/en/email/short/report_post.txt       | 6 +-----
 phpBB/language/en/email/short/topic_approved.txt    | 1 -
 phpBB/language/en/email/short/topic_disapproved.txt | 1 -
 phpBB/language/en/email/short/topic_in_queue.txt    | 6 +-----
 phpBB/language/en/email/topic_approved.txt          | 1 -
 phpBB/language/en/email/topic_disapproved.txt       | 1 -
 phpBB/language/en/email/topic_in_queue.txt          | 6 +-----
 phpBB/language/en/email/user_reactivate_account.txt | 1 -
 phpBB/language/en/email/user_resend_inactive.txt    | 1 -
 20 files changed, 10 insertions(+), 54 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt
index e715b54026..a02dba142a 100644
--- a/phpBB/language/en/email/post_approved.txt
+++ b/phpBB/language/en/email/post_approved.txt
@@ -10,5 +10,4 @@ If you want to view the post, click the following link:
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
-
 {EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt
index 2f8a8381cb..9b2ee643ff 100644
--- a/phpBB/language/en/email/post_disapproved.txt
+++ b/phpBB/language/en/email/post_disapproved.txt
@@ -8,5 +8,4 @@ The following reason was given for the disapproval:
 
 {REASON}
 
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/post_in_queue.txt b/phpBB/language/en/email/post_in_queue.txt
index 8d56ce6c4d..941f070d37 100644
--- a/phpBB/language/en/email/post_in_queue.txt
+++ b/phpBB/language/en/email/post_in_queue.txt
@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Post moderation notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -10,8 +10,4 @@ If you want to view the post, click the following link:
 If you want to view the topic, click the following link:
 {U_TOPIC}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt
index eb7ef22b5e..f248018f9a 100644
--- a/phpBB/language/en/email/report_closed.txt
+++ b/phpBB/language/en/email/report_closed.txt
@@ -4,5 +4,4 @@ Hello {USERNAME},
 
 You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message.
 
-
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/report_deleted.txt b/phpBB/language/en/email/report_deleted.txt
index 4292ca2239..9a30ea2ddd 100644
--- a/phpBB/language/en/email/report_deleted.txt
+++ b/phpBB/language/en/email/report_deleted.txt
@@ -4,5 +4,4 @@ Hello {USERNAME},
 
 You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was deleted by a moderator or by an administrator.
 
-
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/report_pm.txt b/phpBB/language/en/email/report_pm.txt
index 66ae82d074..a101a014ff 100644
--- a/phpBB/language/en/email/report_pm.txt
+++ b/phpBB/language/en/email/report_pm.txt
@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Private Message report - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -7,8 +7,4 @@ You are receiving this notification because a Private Message titled "{SUBJECT}"
 If you want to view the report, click the following link:
 {U_VIEW_REPORT}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/report_post.txt b/phpBB/language/en/email/report_post.txt
index 46983be1ed..8eb24ec6af 100644
--- a/phpBB/language/en/email/report_post.txt
+++ b/phpBB/language/en/email/report_post.txt
@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Post report - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -10,8 +10,4 @@ If you want to view the report, click the following link:
 If you want to view the post, click the following link:
 {U_VIEW_POST}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/post_approved.txt b/phpBB/language/en/email/short/post_approved.txt
index e715b54026..a02dba142a 100644
--- a/phpBB/language/en/email/short/post_approved.txt
+++ b/phpBB/language/en/email/short/post_approved.txt
@@ -10,5 +10,4 @@ If you want to view the post, click the following link:
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
-
 {EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/short/post_disapproved.txt b/phpBB/language/en/email/short/post_disapproved.txt
index 2f8a8381cb..9b2ee643ff 100644
--- a/phpBB/language/en/email/short/post_disapproved.txt
+++ b/phpBB/language/en/email/short/post_disapproved.txt
@@ -8,5 +8,4 @@ The following reason was given for the disapproval:
 
 {REASON}
 
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/post_in_queue.txt b/phpBB/language/en/email/short/post_in_queue.txt
index 8d56ce6c4d..941f070d37 100644
--- a/phpBB/language/en/email/short/post_in_queue.txt
+++ b/phpBB/language/en/email/short/post_in_queue.txt
@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Post moderation notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -10,8 +10,4 @@ If you want to view the post, click the following link:
 If you want to view the topic, click the following link:
 {U_TOPIC}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/report_pm.txt b/phpBB/language/en/email/short/report_pm.txt
index 66ae82d074..a101a014ff 100644
--- a/phpBB/language/en/email/short/report_pm.txt
+++ b/phpBB/language/en/email/short/report_pm.txt
@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Private Message report - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -7,8 +7,4 @@ You are receiving this notification because a Private Message titled "{SUBJECT}"
 If you want to view the report, click the following link:
 {U_VIEW_REPORT}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/report_post.txt b/phpBB/language/en/email/short/report_post.txt
index 46983be1ed..8eb24ec6af 100644
--- a/phpBB/language/en/email/short/report_post.txt
+++ b/phpBB/language/en/email/short/report_post.txt
@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Post report - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -10,8 +10,4 @@ If you want to view the report, click the following link:
 If you want to view the post, click the following link:
 {U_VIEW_POST}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_approved.txt b/phpBB/language/en/email/short/topic_approved.txt
index 0b09918b89..60c7ef4c09 100644
--- a/phpBB/language/en/email/short/topic_approved.txt
+++ b/phpBB/language/en/email/short/topic_approved.txt
@@ -7,5 +7,4 @@ You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITE
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_disapproved.txt b/phpBB/language/en/email/short/topic_disapproved.txt
index a4bd9c151e..9c821e2bba 100644
--- a/phpBB/language/en/email/short/topic_disapproved.txt
+++ b/phpBB/language/en/email/short/topic_disapproved.txt
@@ -8,5 +8,4 @@ The following reason was given for the disapproval:
 
 {REASON}
 
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/topic_in_queue.txt b/phpBB/language/en/email/short/topic_in_queue.txt
index ae8f9e2484..706dddf64f 100644
--- a/phpBB/language/en/email/short/topic_in_queue.txt
+++ b/phpBB/language/en/email/short/topic_in_queue.txt
@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Topic moderation notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -10,8 +10,4 @@ If you want to view the topic, click the following link:
 If you want to view the forum, click the following link:
 {U_FORUM}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt
index 0b09918b89..60c7ef4c09 100644
--- a/phpBB/language/en/email/topic_approved.txt
+++ b/phpBB/language/en/email/topic_approved.txt
@@ -7,5 +7,4 @@ You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITE
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt
index a4bd9c151e..9c821e2bba 100644
--- a/phpBB/language/en/email/topic_disapproved.txt
+++ b/phpBB/language/en/email/topic_disapproved.txt
@@ -8,5 +8,4 @@ The following reason was given for the disapproval:
 
 {REASON}
 
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/topic_in_queue.txt b/phpBB/language/en/email/topic_in_queue.txt
index ae8f9e2484..706dddf64f 100644
--- a/phpBB/language/en/email/topic_in_queue.txt
+++ b/phpBB/language/en/email/topic_in_queue.txt
@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Topic moderation notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -10,8 +10,4 @@ If you want to view the topic, click the following link:
 If you want to view the forum, click the following link:
 {U_FORUM}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt
index 7e25018f4d..385c09f4c5 100644
--- a/phpBB/language/en/email/user_reactivate_account.txt
+++ b/phpBB/language/en/email/user_reactivate_account.txt
@@ -15,5 +15,4 @@ Please visit the following link to reactivate your account:
 
 {U_ACTIVATE}
 
-
 {EMAIL_SIG}
\ No newline at end of file
diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt
index 7879b914b9..b9b95ce9e5 100644
--- a/phpBB/language/en/email/user_resend_inactive.txt
+++ b/phpBB/language/en/email/user_resend_inactive.txt
@@ -14,7 +14,6 @@ Please visit the following link in order to activate your account:
 
 {U_ACTIVATE}
 
-
 Thank you for registering.
 
 {EMAIL_SIG}
\ No newline at end of file
-- 
cgit v1.2.1


From 5de14b940e71941853d3bb279779631ae75b9b6f Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 26 Jan 2013 00:22:56 +0530
Subject: [ticket/10325] add allow forgot password option in acp

PHPBB3-10325
---
 phpBB/language/en/acp/board.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index f387158a0b..4b2020b894 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -454,6 +454,8 @@ $lang = array_merge($lang, array(
 	'ALL'							=> 'All',
 	'ALLOW_AUTOLOGIN'				=> 'Allow "Remember Me" logins',
 	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users are given "Remember Me" option when they visit the board.',
+	'ALLOW_FORGOT_PASSWORD'			=> 'Allow "forgot password"',
+	'ALLOW_FORGOT_PASSWORD_EXPLAIN'	=> 'Determines whether users can use the "forgot password" option to recover their account',
 	'AUTOLOGIN_LENGTH'				=> '"Remember Me" login key expiration length (in days)',
 	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which "Remember Me" login keys are removed or zero to disable.',
 	'BROWSER_VALID'					=> 'Validate browser',
-- 
cgit v1.2.1


From c6e9bd13a75441e9b35a1bfa5d2a08cc38ff1fa5 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 26 Jan 2013 01:01:57 +0530
Subject: [ticket/10325] trigger error if forgot password option disabled

PHPBB3-10325
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 3e090a8aec..a98dc6f11e 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -521,6 +521,7 @@ $lang = array_merge($lang, array(
 	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
 	'UCP_USERGROUPS_MANAGE'		=> 'Manage groups',
 
+	'UCP_FORGOT_PASSWORD_DISABLE'	=> 'Function has been disabled.',
 	'UCP_REGISTER_DISABLE'			=> 'Creating a new account is currently not possible.',
 	'UCP_REMIND'					=> 'Send password',
 	'UCP_RESEND'					=> 'Send activation email',
-- 
cgit v1.2.1


From f8012cc239d8b442e78bbbb8a5cc5856d2a714a0 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 26 Jan 2013 11:10:17 +0530
Subject: [ticket/10325] fix language

PHPBB3-10325
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index a98dc6f11e..ce93c7bcf8 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -521,7 +521,7 @@ $lang = array_merge($lang, array(
 	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
 	'UCP_USERGROUPS_MANAGE'		=> 'Manage groups',
 
-	'UCP_FORGOT_PASSWORD_DISABLE'	=> 'Function has been disabled.',
+	'UCP_FORGOT_PASSWORD_DISABLE'	=> 'The administrator has disabled the password reset ability. If you need help accessing your account, please contact the %sBoard Administrator%s',
 	'UCP_REGISTER_DISABLE'			=> 'Creating a new account is currently not possible.',
 	'UCP_REMIND'					=> 'Send password',
 	'UCP_RESEND'					=> 'Send activation email',
-- 
cgit v1.2.1


From 1a51abcca293b0e2bd836af0dcb9d77054c1d401 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 27 Jan 2013 03:07:52 +0530
Subject: [ticket/10325] change language var

PHPBB3-10325
---
 phpBB/language/en/acp/board.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 4b2020b894..c0f6153788 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -454,8 +454,8 @@ $lang = array_merge($lang, array(
 	'ALL'							=> 'All',
 	'ALLOW_AUTOLOGIN'				=> 'Allow "Remember Me" logins',
 	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users are given "Remember Me" option when they visit the board.',
-	'ALLOW_FORGOT_PASSWORD'			=> 'Allow "forgot password"',
-	'ALLOW_FORGOT_PASSWORD_EXPLAIN'	=> 'Determines whether users can use the "forgot password" option to recover their account',
+	'ALLOW_PASSWORD_RESET'			=> 'Allow "forgot password"',
+	'ALLOW_PASSWORD_RESET_EXPLAIN'	=> 'Determines whether users can use the "forgot password" option to recover their account',
 	'AUTOLOGIN_LENGTH'				=> '"Remember Me" login key expiration length (in days)',
 	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which "Remember Me" login keys are removed or zero to disable.',
 	'BROWSER_VALID'					=> 'Validate browser',
-- 
cgit v1.2.1


From f1e615c4297a509325b764e1966118fe171ebbb5 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 27 Jan 2013 03:09:52 +0530
Subject: [ticket/10325] fix language variable

PHPBB3-10325
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index ce93c7bcf8..3864414af0 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -521,7 +521,7 @@ $lang = array_merge($lang, array(
 	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
 	'UCP_USERGROUPS_MANAGE'		=> 'Manage groups',
 
-	'UCP_FORGOT_PASSWORD_DISABLE'	=> 'The administrator has disabled the password reset ability. If you need help accessing your account, please contact the %sBoard Administrator%s',
+	'UCP_FORGOT_PASSWORD_DISABLED'	=> 'The administrator has disabled the password reset ability. If you need help accessing your account, please contact the %sBoard Administrator%s',
 	'UCP_REGISTER_DISABLE'			=> 'Creating a new account is currently not possible.',
 	'UCP_REMIND'					=> 'Send password',
 	'UCP_RESEND'					=> 'Send activation email',
-- 
cgit v1.2.1


From c048067bbd45b51595cc243cc4edde1d84eda405 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 27 Jan 2013 11:27:28 +0530
Subject: [ticket/10325] fix language key

PHPBB3-10325
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 3864414af0..920dfaf176 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -521,7 +521,7 @@ $lang = array_merge($lang, array(
 	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
 	'UCP_USERGROUPS_MANAGE'		=> 'Manage groups',
 
-	'UCP_FORGOT_PASSWORD_DISABLED'	=> 'The administrator has disabled the password reset ability. If you need help accessing your account, please contact the %sBoard Administrator%s',
+	'UCP_PASSWORD_RESET_DISABLED'	=> 'The administrator has disabled the password reset ability. If you need help accessing your account, please contact the %sBoard Administrator%s',
 	'UCP_REGISTER_DISABLE'			=> 'Creating a new account is currently not possible.',
 	'UCP_REMIND'					=> 'Send password',
 	'UCP_RESEND'					=> 'Send activation email',
-- 
cgit v1.2.1


From 419aaa402f025d16e8b823586e32917d1d036599 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Mon, 28 Jan 2013 01:05:04 +0530
Subject: [ticket/10325] improve acp option language

PHPBB3-10325
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index c0f6153788..c084779a26 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -455,7 +455,7 @@ $lang = array_merge($lang, array(
 	'ALLOW_AUTOLOGIN'				=> 'Allow "Remember Me" logins',
 	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users are given "Remember Me" option when they visit the board.',
 	'ALLOW_PASSWORD_RESET'			=> 'Allow "forgot password"',
-	'ALLOW_PASSWORD_RESET_EXPLAIN'	=> 'Determines whether users can use the "forgot password" option to recover their account',
+	'ALLOW_PASSWORD_RESET_EXPLAIN'	=> 'Determines whether or not users are able to use the "I forgot my password" link on the login page to recover their account. This feature can be disabled when using an external authentication plugin.',
 	'AUTOLOGIN_LENGTH'				=> '"Remember Me" login key expiration length (in days)',
 	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which "Remember Me" login keys are removed or zero to disable.',
 	'BROWSER_VALID'					=> 'Validate browser',
-- 
cgit v1.2.1


From d242b7a1a5c9b6ecc8bc21027a33bc344501a0ce Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Thu, 25 Apr 2013 21:05:02 +0530
Subject: [ticket/10325] fix language in acp and ucp

PHPBB3-10325
---
 phpBB/language/en/acp/board.php | 2 +-
 phpBB/language/en/ucp.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index c084779a26..39ad5b78bb 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -455,7 +455,7 @@ $lang = array_merge($lang, array(
 	'ALLOW_AUTOLOGIN'				=> 'Allow "Remember Me" logins',
 	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users are given "Remember Me" option when they visit the board.',
 	'ALLOW_PASSWORD_RESET'			=> 'Allow "forgot password"',
-	'ALLOW_PASSWORD_RESET_EXPLAIN'	=> 'Determines whether or not users are able to use the "I forgot my password" link on the login page to recover their account. This feature can be disabled when using an external authentication plugin.',
+	'ALLOW_PASSWORD_RESET_EXPLAIN'	=> 'Determines whether or not users are able to use the "I forgot my password" link on the login page to recover their account. If you use an external authentication mechanism you may wish to disable this feature.',
 	'AUTOLOGIN_LENGTH'				=> '"Remember Me" login key expiration length (in days)',
 	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which "Remember Me" login keys are removed or zero to disable.',
 	'BROWSER_VALID'					=> 'Validate browser',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 920dfaf176..372e44a94d 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -521,7 +521,7 @@ $lang = array_merge($lang, array(
 	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
 	'UCP_USERGROUPS_MANAGE'		=> 'Manage groups',
 
-	'UCP_PASSWORD_RESET_DISABLED'	=> 'The administrator has disabled the password reset ability. If you need help accessing your account, please contact the %sBoard Administrator%s',
+	'UCP_PASSWORD_RESET_DISABLED'	=> 'The administrator has disabled the password reset functionality. If you need help accessing your account, please contact the %sBoard Administrator%s',
 	'UCP_REGISTER_DISABLE'			=> 'Creating a new account is currently not possible.',
 	'UCP_REMIND'					=> 'Send password',
 	'UCP_RESEND'					=> 'Send activation email',
-- 
cgit v1.2.1


From e7cb0f687df93120b003ad205fc6cb3315379c80 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 25 Apr 2013 11:23:09 -0500
Subject: [ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN language

PHPBB3-11236
---
 phpBB/language/en/acp/prune.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index fcc085205b..3e890182c0 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -51,7 +51,7 @@ $lang = array_merge($lang, array(
 	'LAST_ACTIVE_EXPLAIN'		=> 'Enter a date in <kbd>YYYY-MM-DD</kbd> format. Enter <kbd>0000-00-00</kbd> to prune users who never logged in, <em>Before</em> and <em>After</em> conditions will be ignored.',
 
 	'POSTS_ON_QUEUE'			=> 'Posts Awaiting Approval',
-	'PRUNE_USERS_GROUP_EXPLAIN'	=> 'Selects all members of the group for pruning.',
+	'PRUNE_USERS_GROUP_EXPLAIN'	=> 'Limit to users within the selected group.',
 	'PRUNE_USERS_LIST'				=> 'Users to be pruned',
 	'PRUNE_USERS_LIST_DELETE'		=> 'With the selected critera for pruning users the following accounts will be removed. You can remove individual users from the deletion list by unchecking the box next to their username.',
 	'PRUNE_USERS_LIST_DEACTIVATE'	=> 'With the selected critera for pruning users the following accounts will be deactivated. You can remove individual users from the deactivation list by unchecking the box next to their username.',
-- 
cgit v1.2.1


From a90a0b087ca3b1e29561a08019ca8ba2fa21c19d Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Tue, 30 Apr 2013 22:59:32 +0530
Subject: [ticket/10325] fix language in acp and ucp

PHPBB3-10325
---
 phpBB/language/en/acp/board.php | 2 +-
 phpBB/language/en/ucp.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 39ad5b78bb..1bc8d1cf46 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -454,7 +454,7 @@ $lang = array_merge($lang, array(
 	'ALL'							=> 'All',
 	'ALLOW_AUTOLOGIN'				=> 'Allow "Remember Me" logins',
 	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users are given "Remember Me" option when they visit the board.',
-	'ALLOW_PASSWORD_RESET'			=> 'Allow "forgot password"',
+	'ALLOW_PASSWORD_RESET'			=> 'Allow "Forgot Password"',
 	'ALLOW_PASSWORD_RESET_EXPLAIN'	=> 'Determines whether or not users are able to use the "I forgot my password" link on the login page to recover their account. If you use an external authentication mechanism you may wish to disable this feature.',
 	'AUTOLOGIN_LENGTH'				=> '"Remember Me" login key expiration length (in days)',
 	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which "Remember Me" login keys are removed or zero to disable.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 372e44a94d..a91b6b84d5 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -521,7 +521,7 @@ $lang = array_merge($lang, array(
 	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
 	'UCP_USERGROUPS_MANAGE'		=> 'Manage groups',
 
-	'UCP_PASSWORD_RESET_DISABLED'	=> 'The administrator has disabled the password reset functionality. If you need help accessing your account, please contact the %sBoard Administrator%s',
+	'UCP_PASSWORD_RESET_DISABLED'	=> 'The password reset functionality has been disabled. If you need help accessing your account, please contact the %sBoard Administrator%s',
 	'UCP_REGISTER_DISABLE'			=> 'Creating a new account is currently not possible.',
 	'UCP_REMIND'					=> 'Send password',
 	'UCP_RESEND'					=> 'Send activation email',
-- 
cgit v1.2.1


From 00d5cde04eb56b53179385c3ada075b1c207c3a3 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 4 May 2013 14:44:33 +0530
Subject: [ticket/10325] fix acp language

PHPBB3-10325
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 1bc8d1cf46..ce15dfefb4 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -454,7 +454,7 @@ $lang = array_merge($lang, array(
 	'ALL'							=> 'All',
 	'ALLOW_AUTOLOGIN'				=> 'Allow "Remember Me" logins',
 	'ALLOW_AUTOLOGIN_EXPLAIN'		=> 'Determines whether users are given "Remember Me" option when they visit the board.',
-	'ALLOW_PASSWORD_RESET'			=> 'Allow "Forgot Password"',
+	'ALLOW_PASSWORD_RESET'			=> 'Allow password reset ("Forgot Password")',
 	'ALLOW_PASSWORD_RESET_EXPLAIN'	=> 'Determines whether or not users are able to use the "I forgot my password" link on the login page to recover their account. If you use an external authentication mechanism you may wish to disable this feature.',
 	'AUTOLOGIN_LENGTH'				=> '"Remember Me" login key expiration length (in days)',
 	'AUTOLOGIN_LENGTH_EXPLAIN'		=> 'Number of days after which "Remember Me" login keys are removed or zero to disable.',
-- 
cgit v1.2.1


From 7d66a9ad525049b8df453ba0325e3dd38fb1157a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 10 May 2013 13:42:54 -0500
Subject: [ticket/11413] Translate the error

PHPBB3-11413
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index c1d6ef4af3..47a77d1dee 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -424,6 +424,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved for reason: "%2$s".',
 	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by %1$s and needs approval.',
+	'NOTIFICATION_TYPE_NOT_EXIST'		=> 'The notification type "%s" is missing from the file system.',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
 	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
-- 
cgit v1.2.1


From beafabbcb3ff5e1f06612f9205598ac12abbd2e3 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Sun, 23 Sep 2012 18:21:17 +0200
Subject: [ticket/11010] adding type="number" and type="date" to prosilver

PHPBB3-11010
---
 phpBB/language/en/posting.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index f5478dded5..7651ff2b63 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -161,7 +161,7 @@ $lang = array_merge($lang, array(
 	'PLACE_INLINE'				=> 'Place inline',
 	'POLL_DELETE'				=> 'Delete poll',
 	'POLL_FOR'					=> 'Run poll for',
-	'POLL_FOR_EXPLAIN'			=> 'Enter 0 or leave blank for a never ending poll.',
+	'POLL_FOR_EXPLAIN'			=> 'Enter 0 for a never ending poll.',
 	'POLL_MAX_OPTIONS'			=> 'Options per user',
 	'POLL_MAX_OPTIONS_EXPLAIN'	=> 'This is the number of options each user may select when voting.',
 	'POLL_OPTIONS'				=> 'Poll options',
@@ -211,7 +211,7 @@ $lang = array_merge($lang, array(
 	'SMILIES_ARE_ON'			=> 'Smilies are <em>ON</em>',
 	'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement time limit',
 	'STICK_TOPIC_FOR'			=> 'Stick topic for',
-	'STICK_TOPIC_FOR_EXPLAIN'	=> 'Enter 0 or leave blank for a never ending Sticky/Announcement. Please note that this number is relative to the date of the post.',
+	'STICK_TOPIC_FOR_EXPLAIN'	=> 'Enter 0 for a never ending Sticky/Announcement. Please note that this number is relative to the date of the post.',
 	'STYLES_TIP'				=> 'Tip: Styles can be applied quickly to selected text.',
 
 	'TOO_FEW_CHARS'				=> 'Your message contains too few characters.',
-- 
cgit v1.2.1


From a9c9448ebbaaeef9c120bdf2eaf7360380eabe03 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 20 May 2013 21:35:51 +0300
Subject: [ticket/11279] Clearer AJAX errors

Display clearer AJAX errors rather than generic error

PHPBB3-11279
---
 phpBB/language/en/common.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 47a77d1dee..6e1782d551 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -70,6 +70,9 @@ $lang = array_merge($lang, array(
 	'AIM'							=> 'AIM',
 	'AJAX_ERROR_TITLE'				=> 'AJAX error',
 	'AJAX_ERROR_TEXT'				=> 'Something went wrong when processing your request.',
+	'AJAX_ERROR_TEXT_ABORT'			=> 'User aborted request.',
+	'AJAX_ERROR_TEXT_TIMEOUT'		=> 'Your request timed out; please try again.',
+	'AJAX_ERROR_TEXT_PARSERERROR'	=> 'Something went wrong with the request and the server returned an invalid reply.',
 	'ALLOWED'						=> 'Allowed',
 	'ALL_FILES'						=> 'All files',
 	'ALL_FORUMS'					=> 'All forums',
-- 
cgit v1.2.1


From d43645adfa182d609b3a0c27e329c97642d16fcd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 22:46:34 -0400
Subject: [ticket/9657] Fix english language :(

PHPBB3-9657
---
 phpBB/language/en/mcp.php     | 2 +-
 phpBB/language/en/posting.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 8eb4b7a777..b75e0ea495 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -372,7 +372,7 @@ $lang = array_merge($lang, array(
 	'TOPIC_LOCKED_SUCCESS'		=> 'The selected topic has been locked.',
 	'TOPIC_MOVED_SUCCESS'		=> 'The selected topic has been moved successfully.',
 	'TOPIC_NOT_EXIST'			=> 'The topic you selected does not exist.',
-	'TOPIC_RESTORED_SUCCESS'	=> 'This topic has been restored successfully.',
+	'TOPIC_RESTORED_SUCCESS'	=> 'The selected topic has been restored successfully.',
 	'TOPIC_RESYNC_SUCCESS'		=> 'The selected topic has been resynchronised.',
 	'TOPIC_SPLIT_SUCCESS'		=> 'The selected topic has been split successfully.',
 	'TOPIC_TIME'				=> 'Topic time',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index eddc906659..0e8d59a92e 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -84,7 +84,7 @@ $lang = array_merge($lang, array(
 	'DELETE_POSTS_CONFIRM'		=> 'Are you sure you want to delete these posts?',
 	'DELETE_POSTS_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete these posts?',
 	'DELETE_REASON'				=> 'Soft delete reason',
-	'DELETE_REASON_EXPLAIN'		=> 'The reason is only shown to moderators when post is soft deleted.',
+	'DELETE_REASON_EXPLAIN'		=> 'The specified reason for deletion will be visible to moderators.',
 	'DELETE_POST_WARN'			=> 'Deleted this post',
 	'DELETE_TOPIC_CONFIRM'		=> 'Are you sure you want to delete this topic?',
 	'DELETE_TOPIC_PERMANENTLY'	=> 'Permanently delete this topic so it can not be recovered',
-- 
cgit v1.2.1


From e1bf87844b09e1359088ee55e4d500af97179926 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 12 Jul 2013 07:24:35 -0400
Subject: [ticket/9657] Remove last references to m_restore permission

PHPBB3-9657
---
 phpBB/language/en/acp/permissions_phpbb.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index d2834c24f7..98679ad544 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -176,10 +176,9 @@ $lang = array_merge($lang, array(
 	'acl_m_edit'		=> array('lang' => 'Can edit posts', 'cat' => 'post_actions'),
 	'acl_m_delete'		=> array('lang' => 'Can permanently delete posts', 'cat' => 'post_actions'),
 	'acl_m_softdelete'	=> array('lang' => 'Can soft delete posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>', 'cat' => 'post_actions'),
-	'acl_m_approve'		=> array('lang' => 'Can approve posts', 'cat' => 'post_actions'),
+	'acl_m_approve'		=> array('lang' => 'Can approve and restore posts', 'cat' => 'post_actions'),
 	'acl_m_report'		=> array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
 	'acl_m_chgposter'	=> array('lang' => 'Can change post author', 'cat' => 'post_actions'),
-	'acl_m_restore'		=> array('lang' => 'Can restore deleted posts', 'cat' => 'post_actions'),
 
 	'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
 	'acl_m_lock'	=> array('lang' => 'Can lock topics', 'cat' => 'topic_actions'),
-- 
cgit v1.2.1


From 658b378b6375aec3df9a4f4a576428ba817cdda8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 12 Jul 2013 17:51:29 +0200
Subject: [ticket/11662] Typos: occured -> occurred

PHPBB3-11662
---
 phpBB/language/en/migrator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index f94c27be8c..34dcbf4c52 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -45,7 +45,7 @@ $lang = array_merge($lang, array(
 	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
 	'MIGRATION_SCHEMA_DONE'				=> 'Installed Schema: %s',
 
-	'MODULE_ERROR'						=> 'An error occured while creating a module: %s',
+	'MODULE_ERROR'						=> 'An error occurred while creating a module: %s',
 	'MODULE_INFO_FILE_NOT_EXIST'		=> 'A required module info file is missing: %2$s',
 	'MODULE_NOT_EXIST'					=> 'A required module does not exist: %s',
 
-- 
cgit v1.2.1


From 573987d2d2defe3425c083b093bb5a5d3ec2db2a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Jun 2013 10:52:13 +0200
Subject: [ticket/11582] Add new service for permissions

Replace calls to the language-array type with a call to get_types()

PHPBB3-11582
---
 phpBB/language/en/acp/permissions_phpbb.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 98679ad544..70312261a1 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -82,16 +82,12 @@ $lang = array_merge($lang, array(
 		'user_group'	=> 'Users &amp; Groups',
 	),
 
-	// With defining 'global' here we are able to specify what is printed out if the permission is within the global scope.
-	'permission_type'	=> array(
-		'u_'			=> 'User permissions',
-		'a_'			=> 'Admin permissions',
-		'm_'			=> 'Moderator permissions',
-		'f_'			=> 'Forum permissions',
-		'global'		=> array(
-			'm_'			=> 'Global moderator permissions',
-		),
-	),
+
+	'ACL_TYPE_USER'				=> 'User permissions',
+	'ACL_TYPE_ADMIN'			=> 'Admin permissions',
+	'ACL_TYPE_MODERATOR'		=> 'Moderator permissions',
+	'ACL_TYPE_FORUM'			=> 'Forum permissions',
+	'ACL_TYPE_GLOBAL_MODERATOR'	=> 'Global moderator permissions',
 ));
 
 // User Permissions
-- 
cgit v1.2.1


From e8d2a2fd8861e5ef2473aa670808dc6098aa1241 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Jun 2013 11:10:33 +0200
Subject: [ticket/11582] Use new class for categories

PHPBB3-11582
---
 phpBB/language/en/acp/permissions_phpbb.php | 30 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 70312261a1..0a669a4b8d 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -65,22 +65,20 @@ if (empty($lang) || !is_array($lang))
 
 // Define categories and permission types
 $lang = array_merge($lang, array(
-	'permission_cat'	=> array(
-		'actions'		=> 'Actions',
-		'content'		=> 'Content',
-		'forums'		=> 'Forums',
-		'misc'			=> 'Misc',
-		'permissions'	=> 'Permissions',
-		'pm'			=> 'Private messages',
-		'polls'			=> 'Polls',
-		'post'			=> 'Post',
-		'post_actions'	=> 'Post actions',
-		'posting'		=> 'Posting',
-		'profile'		=> 'Profile',
-		'settings'		=> 'Settings',
-		'topic_actions'	=> 'Topic actions',
-		'user_group'	=> 'Users &amp; Groups',
-	),
+	'ACL_CAT_ACTIONS'		=> 'Actions',
+	'ACL_CAT_CONTENT'		=> 'Content',
+	'ACL_CAT_FORUMS'		=> 'Forums',
+	'ACL_CAT_MISC'			=> 'Misc',
+	'ACL_CAT_PERMISSIONS'	=> 'Permissions',
+	'ACL_CAT_PM'			=> 'Private messages',
+	'ACL_CAT_POLLS'			=> 'Polls',
+	'ACL_CAT_POST'			=> 'Post',
+	'ACL_CAT_POST_ACTIONS'	=> 'Post actions',
+	'ACL_CAT_POSTING'		=> 'Posting',
+	'ACL_CAT_PROFILE'		=> 'Profile',
+	'ACL_CAT_SETTINGS'		=> 'Settings',
+	'ACL_CAT_TOPIC_ACTIONS'	=> 'Topic actions',
+	'ACL_CAT_USER_GROUP'	=> 'Users &amp; Groups',
 
 
 	'ACL_TYPE_USER'				=> 'User permissions',
-- 
cgit v1.2.1


From 9c653341e4d747302bdde1273fd71199ca3b40ef Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Jul 2013 13:37:59 +0200
Subject: [ticket/11582] Use new methods and remove duplicated entries

PHPBB3-11582
---
 phpBB/language/en/acp/permissions_phpbb.php | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 0a669a4b8d..4f2c9067d2 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -63,7 +63,6 @@ if (empty($lang) || !is_array($lang))
 *	</code>
 */
 
-// Define categories and permission types
 $lang = array_merge($lang, array(
 	'ACL_CAT_ACTIONS'		=> 'Actions',
 	'ACL_CAT_CONTENT'		=> 'Content',
@@ -79,13 +78,6 @@ $lang = array_merge($lang, array(
 	'ACL_CAT_SETTINGS'		=> 'Settings',
 	'ACL_CAT_TOPIC_ACTIONS'	=> 'Topic actions',
 	'ACL_CAT_USER_GROUP'	=> 'Users &amp; Groups',
-
-
-	'ACL_TYPE_USER'				=> 'User permissions',
-	'ACL_TYPE_ADMIN'			=> 'Admin permissions',
-	'ACL_TYPE_MODERATOR'		=> 'Moderator permissions',
-	'ACL_TYPE_FORUM'			=> 'Forum permissions',
-	'ACL_TYPE_GLOBAL_MODERATOR'	=> 'Global moderator permissions',
 ));
 
 // User Permissions
-- 
cgit v1.2.1


From 0e86c0247381b141cba53b6ab3fbdba276c521e3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Jul 2013 15:55:25 +0200
Subject: [ticket/11582] Split permission language strings from logic

PHPBB3-11582
---
 phpBB/language/en/acp/permissions_phpbb.php | 253 +++++++++++++---------------
 1 file changed, 121 insertions(+), 132 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 4f2c9067d2..edcc812830 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -56,8 +56,8 @@ if (empty($lang) || !is_array($lang))
 *
 *	// Adding the permissions
 *	$lang = array_merge($lang, array(
-*		'acl_bug_view'		=> array('lang' => 'Can view bug reports', 'cat' => 'bugs'),
-*		'acl_bug_post'		=> array('lang' => 'Can post bugs', 'cat' => 'post'), // Using a phpBB category here
+*		'acl_bug_view'		=> 'Can view bug reports', 'cat' => 'bugs'),
+*		'acl_bug_post'		=> 'Can post bugs', // Using a phpBB category here
 *	));
 *
 *	</code>
@@ -82,146 +82,135 @@ $lang = array_merge($lang, array(
 
 // User Permissions
 $lang = array_merge($lang, array(
-	'acl_u_viewprofile'	=> array('lang' => 'Can view profiles, memberlist and online list', 'cat' => 'profile'),
-	'acl_u_chgname'		=> array('lang' => 'Can change username', 'cat' => 'profile'),
-	'acl_u_chgpasswd'	=> array('lang' => 'Can change password', 'cat' => 'profile'),
-	'acl_u_chgemail'	=> array('lang' => 'Can change email address', 'cat' => 'profile'),
-	'acl_u_chgavatar'	=> array('lang' => 'Can change avatar', 'cat' => 'profile'),
-	'acl_u_chggrp'		=> array('lang' => 'Can change default usergroup', 'cat' => 'profile'),
-	'acl_u_chgprofileinfo'	=> array('lang' => 'Can change profile field information', 'cat' => 'profile'),
-
-	'acl_u_attach'		=> array('lang' => 'Can attach files', 'cat' => 'post'),
-	'acl_u_download'	=> array('lang' => 'Can download files', 'cat' => 'post'),
-	'acl_u_savedrafts'	=> array('lang' => 'Can save drafts', 'cat' => 'post'),
-	'acl_u_chgcensors'	=> array('lang' => 'Can disable word censors', 'cat' => 'post'),
-	'acl_u_sig'			=> array('lang' => 'Can use signature', 'cat' => 'post'),
-
-	'acl_u_sendpm'		=> array('lang' => 'Can send private messages', 'cat' => 'pm'),
-	'acl_u_masspm'		=> array('lang' => 'Can send messages to multiple users', 'cat' => 'pm'),
-	'acl_u_masspm_group'=> array('lang' => 'Can send messages to groups', 'cat' => 'pm'),
-	'acl_u_readpm'		=> array('lang' => 'Can read private messages', 'cat' => 'pm'),
-	'acl_u_pm_edit'		=> array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
-	'acl_u_pm_delete'	=> array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),
-	'acl_u_pm_forward'	=> array('lang' => 'Can forward private messages', 'cat' => 'pm'),
-	'acl_u_pm_emailpm'	=> array('lang' => 'Can email private messages', 'cat' => 'pm'),
-	'acl_u_pm_printpm'	=> array('lang' => 'Can print private messages', 'cat' => 'pm'),
-	'acl_u_pm_attach'	=> array('lang' => 'Can attach files in private messages', 'cat' => 'pm'),
-	'acl_u_pm_download'	=> array('lang' => 'Can download files in private messages', 'cat' => 'pm'),
-	'acl_u_pm_bbcode'	=> array('lang' => 'Can use BBCode in private messages', 'cat' => 'pm'),
-	'acl_u_pm_smilies'	=> array('lang' => 'Can use smilies in private messages', 'cat' => 'pm'),
-	'acl_u_pm_img'		=> array('lang' => 'Can use [img] BBCode tag in private messages', 'cat' => 'pm'),
-	'acl_u_pm_flash'	=> array('lang' => 'Can use [flash] BBCode tag in private messages', 'cat' => 'pm'),
-
-	'acl_u_sendemail'	=> array('lang' => 'Can send emails', 'cat' => 'misc'),
-	'acl_u_sendim'		=> array('lang' => 'Can send instant messages', 'cat' => 'misc'),
-	'acl_u_ignoreflood'	=> array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
-	'acl_u_hideonline'	=> array('lang' => 'Can hide online status', 'cat' => 'misc'),
-	'acl_u_viewonline'	=> array('lang' => 'Can view hidden online users', 'cat' => 'misc'),
-	'acl_u_search'		=> array('lang' => 'Can search board', 'cat' => 'misc'),
+	'ACL_U_VIEWPROFILE'	=> 'Can view profiles, memberlist and online list',
+	'ACL_U_CHGNAME'		=> 'Can change username',
+	'ACL_U_CHGPASSWD'	=> 'Can change password',
+	'ACL_U_CHGEMAIL'	=> 'Can change email address',
+	'ACL_U_CHGAVATAR'	=> 'Can change avatar',
+	'ACL_U_CHGGRP'		=> 'Can change default usergroup',
+	'ACL_U_CHGPROFILEINFO'	=> 'Can change profile field information',
+
+	'ACL_U_ATTACH'		=> 'Can attach files',
+	'ACL_U_DOWNLOAD'	=> 'Can download files',
+	'ACL_U_SAVEDRAFTS'	=> 'Can save drafts',
+	'ACL_U_CHGCENSORS'	=> 'Can disable word censors',
+	'ACL_U_SIG'			=> 'Can use signature',
+
+	'ACL_U_SENDPM'		=> 'Can send private messages',
+	'ACL_U_MASSPM'		=> 'Can send messages to multiple users',
+	'ACL_U_MASSPM_GROUP'=> 'Can send messages to groups',
+	'ACL_U_READPM'		=> 'Can read private messages',
+	'ACL_U_PM_EDIT'		=> 'Can edit own private messages',
+	'ACL_U_PM_DELETE'	=> 'Can remove private messages from own folder',
+	'ACL_U_PM_FORWARD'	=> 'Can forward private messages',
+	'ACL_U_PM_EMAILPM'	=> 'Can email private messages',
+	'ACL_U_PM_PRINTPM'	=> 'Can print private messages',
+	'ACL_U_PM_ATTACH'	=> 'Can attach files in private messages',
+	'ACL_U_PM_DOWNLOAD'	=> 'Can download files in private messages',
+	'ACL_U_PM_BBCODE'	=> 'Can use BBCode in private messages',
+	'ACL_U_PM_SMILIES'	=> 'Can use smilies in private messages',
+	'ACL_U_PM_IMG'		=> 'Can use [img] BBCode tag in private messages',
+	'ACL_U_PM_FLASH'	=> 'Can use [flash] BBCode tag in private messages',
+
+	'ACL_U_SENDEMAIL'	=> 'Can send emails',
+	'ACL_U_SENDIM'		=> 'Can send instant messages',
+	'ACL_U_IGNOREFLOOD'	=> 'Can ignore flood limit',
+	'ACL_U_HIDEONLINE'	=> 'Can hide online status',
+	'ACL_U_VIEWONLINE'	=> 'Can view hidden online users',
+	'ACL_U_SEARCH'		=> 'Can search board',
 ));
 
 // Forum Permissions
 $lang = array_merge($lang, array(
-	'acl_f_list'		=> array('lang' => 'Can see forum', 'cat' => 'actions'),
-	'acl_f_read'		=> array('lang' => 'Can read forum', 'cat' => 'actions'),	
-	'acl_f_search'		=> array('lang' => 'Can search the forum', 'cat' => 'actions'),
-	'acl_f_subscribe'	=> array('lang' => 'Can subscribe forum', 'cat' => 'actions'),
-	'acl_f_print'		=> array('lang' => 'Can print topics', 'cat' => 'actions'),	
-	'acl_f_email'		=> array('lang' => 'Can email topics', 'cat' => 'actions'),	
-	'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
-	'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
-	'acl_f_download'	=> array('lang' => 'Can download files', 'cat' => 'actions'),	
-	'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
-
-	'acl_f_post'		=> array('lang' => 'Can start new topics', 'cat' => 'post'),
-	'acl_f_sticky'		=> array('lang' => 'Can post stickies', 'cat' => 'post'),
-	'acl_f_announce'	=> array('lang' => 'Can post announcements', 'cat' => 'post'),
-	'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
-	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'post'),
-	'acl_f_delete'		=> array('lang' => 'Can permanently delete own posts', 'cat' => 'post'),
-	'acl_f_softdelete'  => array('lang' => 'Can soft delete own posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>', 'cat' => 'post'),
-	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'post'),
-	'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'post'),
-	'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'post'),	
-
-	'acl_f_attach'		=> array('lang' => 'Can attach files', 'cat' => 'content'),	
-	'acl_f_icons'		=> array('lang' => 'Can use topic/post icons', 'cat' => 'content'),
-	'acl_f_bbcode'		=> array('lang' => 'Can use BBCode', 'cat' => 'content'),	
-	'acl_f_flash'		=> array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'),
-	'acl_f_img'			=> array('lang' => 'Can use [img] BBCode tag', 'cat' => 'content'),
-	'acl_f_sigs'		=> array('lang' => 'Can use signatures', 'cat' => 'content'),
-	'acl_f_smilies'		=> array('lang' => 'Can use smilies', 'cat' => 'content'),
-
-	'acl_f_poll'		=> array('lang' => 'Can create polls', 'cat' => 'polls'),
-	'acl_f_vote'		=> array('lang' => 'Can vote in polls', 'cat' => 'polls'),
-	'acl_f_votechg'		=> array('lang' => 'Can change existing vote', 'cat' => 'polls'),
+	'ACL_F_POST'		=> 'Can start new topics',
+	'ACL_F_STICKY'		=> 'Can post stickies',
+	'ACL_F_ANNOUNCE'	=> 'Can post announcements',
+	'ACL_F_REPLY'		=> 'Can reply to topics',
+	'ACL_F_EDIT'		=> 'Can edit own posts',
+	'ACL_F_DELETE'		=> 'Can permanently delete own posts',
+	'ACL_F_SOFTDELETE'	=> 'Can soft delete own posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>',
+	'ACL_F_IGNOREFLOOD' => 'Can ignore flood limit',
+	'ACL_F_POSTCOUNT'	=> 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>',
+	'ACL_F_NOAPPROVE'	=> 'Can post without approval',
+
+	'ACL_F_ATTACH'		=> 'Can attach files',
+	'ACL_F_ICONS'		=> 'Can use topic/post icons',
+	'ACL_F_BBCODE'		=> 'Can use BBCode',
+	'ACL_F_FLASH'		=> 'Can use [flash] BBCode tag',
+	'ACL_F_IMG'			=> 'Can use [img] BBCode tag',
+	'ACL_F_SIGS'		=> 'Can use signatures',
+	'ACL_F_SMILIES'		=> 'Can use smilies',
+
+	'ACL_F_POLL'		=> 'Can create polls',
+	'ACL_F_VOTE'		=> 'Can vote in polls',
+	'ACL_F_VOTECHG'		=> 'Can change existing vote',
 ));
 
 // Moderator Permissions
 $lang = array_merge($lang, array(
-	'acl_m_edit'		=> array('lang' => 'Can edit posts', 'cat' => 'post_actions'),
-	'acl_m_delete'		=> array('lang' => 'Can permanently delete posts', 'cat' => 'post_actions'),
-	'acl_m_softdelete'	=> array('lang' => 'Can soft delete posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>', 'cat' => 'post_actions'),
-	'acl_m_approve'		=> array('lang' => 'Can approve and restore posts', 'cat' => 'post_actions'),
-	'acl_m_report'		=> array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
-	'acl_m_chgposter'	=> array('lang' => 'Can change post author', 'cat' => 'post_actions'),
-
-	'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
-	'acl_m_lock'	=> array('lang' => 'Can lock topics', 'cat' => 'topic_actions'),
-	'acl_m_split'	=> array('lang' => 'Can split topics', 'cat' => 'topic_actions'),
-	'acl_m_merge'	=> array('lang' => 'Can merge topics', 'cat' => 'topic_actions'),
-
-	'acl_m_info'	=> array('lang' => 'Can view post details', 'cat' => 'misc'),
-	'acl_m_warn'	=> array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
-	'acl_m_ban'		=> array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
+	'ACL_M_EDIT'		=> 'Can edit posts',
+	'ACL_M_DELETE'		=> 'Can permanently delete posts',
+	'ACL_M_SOFTDELETE'	=> 'Can soft delete posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>',
+	'ACL_M_APPROVE'		=> 'Can approve posts',
+	'ACL_M_REPORT'		=> 'Can close and delete reports',
+	'ACL_M_CHGPOSTER'	=> 'Can change post author',
+
+	'ACL_M_MOVE'	=> 'Can move topics',
+	'ACL_M_LOCK'	=> 'Can lock topics',
+	'ACL_M_SPLIT'	=> 'Can split topics',
+	'ACL_M_MERGE'	=> 'Can merge topics',
+
+	'ACL_M_INFO'	=> 'Can view post details',
+	'ACL_M_WARN'	=> 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
+	'ACL_M_BAN'		=> 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
 ));
 
 // Admin Permissions
 $lang = array_merge($lang, array(
-	'acl_a_board'		=> array('lang' => 'Can alter board settings/check for updates', 'cat' => 'settings'),
-	'acl_a_server'		=> array('lang' => 'Can alter server/communication settings', 'cat' => 'settings'),
-	'acl_a_jabber'		=> array('lang' => 'Can alter Jabber settings', 'cat' => 'settings'),
-	'acl_a_phpinfo'		=> array('lang' => 'Can view php settings', 'cat' => 'settings'),
-
-	'acl_a_forum'		=> array('lang' => 'Can manage forums', 'cat' => 'forums'),
-	'acl_a_forumadd'	=> array('lang' => 'Can add new forums', 'cat' => 'forums'),
-	'acl_a_forumdel'	=> array('lang' => 'Can delete forums', 'cat' => 'forums'),
-	'acl_a_prune'		=> array('lang' => 'Can prune forums', 'cat' => 'forums'),
-
-	'acl_a_icons'		=> array('lang' => 'Can alter topic/post icons and smilies', 'cat' => 'posting'),
-	'acl_a_words'		=> array('lang' => 'Can alter word censors', 'cat' => 'posting'),
-	'acl_a_bbcode'		=> array('lang' => 'Can define BBCode tags', 'cat' => 'posting'),
-	'acl_a_attach'		=> array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'),
-
-	'acl_a_user'		=> array('lang' => 'Can manage users<br /><em>This also includes seeing the users browser agent within the viewonline list.</em>', 'cat' => 'user_group'),
-	'acl_a_userdel'		=> array('lang' => 'Can delete/prune users', 'cat' => 'user_group'),
-	'acl_a_group'		=> array('lang' => 'Can manage groups', 'cat' => 'user_group'),
-	'acl_a_groupadd'	=> array('lang' => 'Can add new groups', 'cat' => 'user_group'),
-	'acl_a_groupdel'	=> array('lang' => 'Can delete groups', 'cat' => 'user_group'),
-	'acl_a_ranks'		=> array('lang' => 'Can manage ranks', 'cat' => 'user_group'),
-	'acl_a_profile'		=> array('lang' => 'Can manage custom profile fields', 'cat' => 'user_group'),
-	'acl_a_names'		=> array('lang' => 'Can manage disallowed names', 'cat' => 'user_group'),
-	'acl_a_ban'			=> array('lang' => 'Can manage bans', 'cat' => 'user_group'),
-
-	'acl_a_viewauth'	=> array('lang' => 'Can view permission masks', 'cat' => 'permissions'),
-	'acl_a_authgroups'	=> array('lang' => 'Can alter permissions for individual groups', 'cat' => 'permissions'),
-	'acl_a_authusers'	=> array('lang' => 'Can alter permissions for individual users', 'cat' => 'permissions'),
-	'acl_a_fauth'		=> array('lang' => 'Can alter forum permission class', 'cat' => 'permissions'),
-	'acl_a_mauth'		=> array('lang' => 'Can alter moderator permission class', 'cat' => 'permissions'),
-	'acl_a_aauth'		=> array('lang' => 'Can alter admin permission class', 'cat' => 'permissions'),
-	'acl_a_uauth'		=> array('lang' => 'Can alter user permission class', 'cat' => 'permissions'),
-	'acl_a_roles'		=> array('lang' => 'Can manage roles', 'cat' => 'permissions'),
-	'acl_a_switchperm'	=> array('lang' => 'Can use others permissions', 'cat' => 'permissions'),
-
-	'acl_a_styles'		=> array('lang' => 'Can manage styles', 'cat' => 'misc'),
-	'acl_a_extensions'	=> array('lang' => 'Can manage extensions', 'cat' => 'misc'),
-	'acl_a_viewlogs'	=> array('lang' => 'Can view logs', 'cat' => 'misc'),
-	'acl_a_clearlogs'	=> array('lang' => 'Can clear logs', 'cat' => 'misc'),
-	'acl_a_modules'		=> array('lang' => 'Can manage modules', 'cat' => 'misc'),
-	'acl_a_language'	=> array('lang' => 'Can manage language packs', 'cat' => 'misc'),
-	'acl_a_email'		=> array('lang' => 'Can send mass email', 'cat' => 'misc'),
-	'acl_a_bots'		=> array('lang' => 'Can manage bots', 'cat' => 'misc'),
-	'acl_a_reasons'		=> array('lang' => 'Can manage report/denial reasons', 'cat' => 'misc'),
-	'acl_a_backup'		=> array('lang' => 'Can backup/restore database', 'cat' => 'misc'),
-	'acl_a_search'		=> array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'),
+	'ACL_A_BOARD'		=> 'Can alter board settings/check for updates',
+	'ACL_A_SERVER'		=> 'Can alter server/communication settings',
+	'ACL_A_JABBER'		=> 'Can alter Jabber settings',
+	'ACL_A_PHPINFO'		=> 'Can view php settings',
+
+	'ACL_A_FORUM'		=> 'Can manage forums',
+	'ACL_A_FORUMADD'	=> 'Can add new forums',
+	'ACL_A_FORUMDEL'	=> 'Can delete forums',
+	'ACL_A_PRUNE'		=> 'Can prune forums',
+
+	'ACL_A_ICONS'		=> 'Can alter topic/post icons and smilies',
+	'ACL_A_WORDS'		=> 'Can alter word censors',
+	'ACL_A_BBCODE'		=> 'Can define BBCode tags',
+	'ACL_A_ATTACH'		=> 'Can alter attachment related settings',
+
+	'ACL_A_USER'		=> 'Can manage users<br /><em>This also includes seeing the users browser agent within the viewonline list.</em>',
+	'ACL_A_USERDEL'		=> 'Can delete/prune users',
+	'ACL_A_GROUP'		=> 'Can manage groups',
+	'ACL_A_GROUPADD'	=> 'Can add new groups',
+	'ACL_A_GROUPDEL'	=> 'Can delete groups',
+	'ACL_A_RANKS'		=> 'Can manage ranks',
+	'ACL_A_PROFILE'		=> 'Can manage custom profile fields',
+	'ACL_A_NAMES'		=> 'Can manage disallowed names',
+	'ACL_A_BAN'			=> 'Can manage bans',
+
+	'ACL_A_VIEWAUTH'	=> 'Can view permission masks',
+	'ACL_A_AUTHGROUPS'	=> 'Can alter permissions for individual groups',
+	'ACL_A_AUTHUSERS'	=> 'Can alter permissions for individual users',
+	'ACL_A_FAUTH'		=> 'Can alter forum permission class',
+	'ACL_A_MAUTH'		=> 'Can alter moderator permission class',
+	'ACL_A_AAUTH'		=> 'Can alter admin permission class',
+	'ACL_A_UAUTH'		=> 'Can alter user permission class',
+	'ACL_A_ROLES'		=> 'Can manage roles',
+	'ACL_A_SWITCHPERM'	=> 'Can use others permissions',
+
+	'ACL_A_STYLES'		=> 'Can manage styles',
+	'ACL_A_EXTENSIONS'	=> 'Can manage extensions',
+	'ACL_A_VIEWLOGS'	=> 'Can view logs',
+	'ACL_A_CLEARLOGS'	=> 'Can clear logs',
+	'ACL_A_MODULES'		=> 'Can manage modules',
+	'ACL_A_LANGUAGE'	=> 'Can manage language packs',
+	'ACL_A_EMAIL'		=> 'Can send mass email',
+	'ACL_A_BOTS'		=> 'Can manage bots',
+	'ACL_A_REASONS'		=> 'Can manage report/denial reasons',
+	'ACL_A_BACKUP'		=> 'Can backup/restore database',
+	'ACL_A_SEARCH'		=> 'Can manage search backends and settings',
 ));
-- 
cgit v1.2.1


From 4a64e2c2b3d4b39cdedec72551076595a9cd6a6e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Jul 2013 16:07:05 +0200
Subject: [ticket/11582] Fix documentation for adding permissions

PHPBB3-11582
---
 phpBB/language/en/acp/permissions_phpbb.php | 34 ++++++-----------------------
 1 file changed, 7 insertions(+), 27 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index edcc812830..d0128db34a 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -33,34 +33,14 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 /**
-*	MODDERS PLEASE NOTE
+*	EXTENSION-DEVELOPERS PLEASE NOTE
 *
-*	You are able to put your permission sets into a separate file too by
-*	prefixing the new file with permissions_ and putting it into the acp
-*	language folder.
-*
-*	An example of how the file could look like:
-*
-*	<code>
-*
-*	if (empty($lang) || !is_array($lang))
-*	{
-*		$lang = array();
-*	}
-*
-*	// Adding new category
-*	$lang['permission_cat']['bugs'] = 'Bugs';
-*
-*	// Adding new permission set
-*	$lang['permission_type']['bug_'] = 'Bug Permissions';
-*
-*	// Adding the permissions
-*	$lang = array_merge($lang, array(
-*		'acl_bug_view'		=> 'Can view bug reports', 'cat' => 'bugs'),
-*		'acl_bug_post'		=> 'Can post bugs', // Using a phpBB category here
-*	));
-*
-*	</code>
+*	You are able to put your permission sets into your extension.
+*	The permissions logic should be added via the 'core.permissions' event.
+*	You can easily add new permission categories, types and permissions, by
+*	simply merging them into the respective arrays.
+*	The respective language strings should be added into a language file, that
+*	start with 'permissions_', so they are automatically loaded within the ACP.
 */
 
 $lang = array_merge($lang, array(
-- 
cgit v1.2.1


From 1d2d3032d3f0f614b0df9851c373618e205580f8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 23 Jul 2013 16:26:01 +0200
Subject: [ticket/11734] Readd accidently removed language strings of forum
 permissions

PHPBB3-11734
---
 phpBB/language/en/acp/permissions_phpbb.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index d0128db34a..5ea151f6ea 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -102,6 +102,17 @@ $lang = array_merge($lang, array(
 
 // Forum Permissions
 $lang = array_merge($lang, array(
+	'ACL_F_LIST'		=> 'Can see forum',
+	'ACL_F_READ'		=> 'Can read forum',
+	'ACL_F_SEARCH'		=> 'Can search the forum',
+	'ACL_F_SUBSCRIBE'	=> 'Can subscribe forum',
+	'ACL_F_PRINT'		=> 'Can print topics',
+	'ACL_F_EMAIL'		=> 'Can email topics',
+	'ACL_F_BUMP'		=> 'Can bump topics',
+	'ACL_F_USER_LOCK'	=> 'Can lock own topics',
+	'ACL_F_DOWNLOAD'	=> 'Can download files',
+	'ACL_F_REPORT'		=> 'Can report posts',
+
 	'ACL_F_POST'		=> 'Can start new topics',
 	'ACL_F_STICKY'		=> 'Can post stickies',
 	'ACL_F_ANNOUNCE'	=> 'Can post announcements',
-- 
cgit v1.2.1


From 93cbdc37b51edf14cb2dbebb1ccb71a612f7fd94 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 23 Jul 2013 14:06:01 -0400
Subject: [feature/oauth] ACP options for OAuth, needs some work

PHPBB3-11673
---
 phpBB/language/en/acp/board.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index ce15dfefb4..892d3f61fe 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -394,6 +394,15 @@ $lang = array_merge($lang, array(
 
 	'AUTH_METHOD'				=> 'Select an authentication method',
 
+	'AUTH_PROVIDER_OAUTH_KEY'				=> 'Key',
+	'AUTH_PROVIDER_OAUTH_KEY_EXPLAIN'		=> '',
+	'AUTH_PROVIDER_OAUTH_SERVICE_BITLY'		=> 'Bitly',
+	'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK'	=> 'Facebook',
+	'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'	=> 'Google',
+	'AUTH_PROVIDER_OAUTH_TITLE'				=> 'OAuth',
+	'AUTH_PROVIDER_OAUTH_SECRET'			=> 'Secret',
+	'AUTH_PROVIDER_OAUTH_SECRET_EXPLAIN'	=> '',
+
 	'APACHE_SETUP_BEFORE_USE'	=> 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version) and safe_mode disabled.',
 
 	'LDAP_DN'						=> 'LDAP base <var>dn</var>',
-- 
cgit v1.2.1


From af6a4b21614c602ae8fe5323fab2b384c6ad5393 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 23 Jul 2013 14:29:38 -0400
Subject: [feature/oauth] Clean up the OAuth ACP template

PHPBB3-11673
---
 phpBB/language/en/acp/board.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 892d3f61fe..553cd1a6eb 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -394,14 +394,13 @@ $lang = array_merge($lang, array(
 
 	'AUTH_METHOD'				=> 'Select an authentication method',
 
+	'AUTH_PROVIDER_OAUTH_EXPLAIN'			=> 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server.<br />These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br />Any service that does not have both a key and a secret entered here will not be available for use by the forum users.',
 	'AUTH_PROVIDER_OAUTH_KEY'				=> 'Key',
-	'AUTH_PROVIDER_OAUTH_KEY_EXPLAIN'		=> '',
 	'AUTH_PROVIDER_OAUTH_SERVICE_BITLY'		=> 'Bitly',
 	'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK'	=> 'Facebook',
 	'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'	=> 'Google',
 	'AUTH_PROVIDER_OAUTH_TITLE'				=> 'OAuth',
 	'AUTH_PROVIDER_OAUTH_SECRET'			=> 'Secret',
-	'AUTH_PROVIDER_OAUTH_SECRET_EXPLAIN'	=> '',
 
 	'APACHE_SETUP_BEFORE_USE'	=> 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version) and safe_mode disabled.',
 
-- 
cgit v1.2.1


From 9805927fac30d9c5d99f5f5f8d7207c9a6064724 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 23 Jul 2013 15:26:33 -0400
Subject: [feature/oauth] OAuth init method to minimally validate entered data

PHPBB3-11673
---
 phpBB/language/en/acp/board.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 553cd1a6eb..f76834ae50 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -394,13 +394,14 @@ $lang = array_merge($lang, array(
 
 	'AUTH_METHOD'				=> 'Select an authentication method',
 
-	'AUTH_PROVIDER_OAUTH_EXPLAIN'			=> 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server.<br />These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br />Any service that does not have both a key and a secret entered here will not be available for use by the forum users.',
-	'AUTH_PROVIDER_OAUTH_KEY'				=> 'Key',
-	'AUTH_PROVIDER_OAUTH_SERVICE_BITLY'		=> 'Bitly',
-	'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK'	=> 'Facebook',
-	'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'	=> 'Google',
-	'AUTH_PROVIDER_OAUTH_TITLE'				=> 'OAuth',
-	'AUTH_PROVIDER_OAUTH_SECRET'			=> 'Secret',
+	'AUTH_PROVIDER_OAUTH_ERROR_ELEMENT_MISSING'	=> 'Both the key and secret of each enabled OAuth service provider must be provided. Only one was provided for an OAuth service provider.',
+	'AUTH_PROVIDER_OAUTH_EXPLAIN'				=> 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server.<br />These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br />Any service that does not have both a key and a secret entered here will not be available for use by the forum users.',
+	'AUTH_PROVIDER_OAUTH_KEY'					=> 'Key',
+	'AUTH_PROVIDER_OAUTH_SERVICE_BITLY'			=> 'Bitly',
+	'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK'		=> 'Facebook',
+	'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'		=> 'Google',
+	'AUTH_PROVIDER_OAUTH_TITLE'					=> 'OAuth',
+	'AUTH_PROVIDER_OAUTH_SECRET'				=> 'Secret',
 
 	'APACHE_SETUP_BEFORE_USE'	=> 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version) and safe_mode disabled.',
 
-- 
cgit v1.2.1


From c26b68cc54b19d91affae6f4dbab67a33939ca23 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 23 Jul 2013 19:27:55 -0400
Subject: [feature/oauth] Update error message with actual error

PHPBB3-11673
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b188d90f3a..a68c027554 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -351,6 +351,7 @@ $lang = array_merge($lang, array(
 	'LOGIN_CONFIRM_EXPLAIN'				=> 'To prevent brute forcing accounts the board requires you to enter a confirmation code after a maximum amount of failed logins. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', // unused
 	'LOGIN_ERROR_ATTEMPTS'				=> 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now also have to solve the CAPTCHA below.',
 	'LOGIN_ERROR_EXTERNAL_AUTH_APACHE'	=> 'You have not been authenticated by Apache.',
+	'LOGIN_ERROR_OAUTH_SERVICE_DOES_NOT_EXIST'	=> 'A non-existant OAuth service has been requested.',
 	'LOGIN_ERROR_PASSWORD'				=> 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
 	'LOGIN_ERROR_PASSWORD_CONVERT'		=> 'It was not possible to convert your password when updating this bulletin board’s software. Please %srequest a new password%s. If you continue to have problems please contact the %sBoard Administrator%s.',
 	'LOGIN_ERROR_USERNAME'				=> 'You have specified an incorrect username. Please check your username and try again. If you continue to have problems please contact the %sBoard Administrator%s.',
-- 
cgit v1.2.1


From 5401673f965aaef7048797d1f696bd5e43bbfaf6 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Wed, 24 Jul 2013 10:35:36 -0400
Subject: [feature/oauth] Move language constants for oauth services to
 common.php

PHPBB3-11673
---
 phpBB/language/en/acp/board.php | 3 ---
 phpBB/language/en/common.php    | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index f76834ae50..abc7738ee3 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -397,9 +397,6 @@ $lang = array_merge($lang, array(
 	'AUTH_PROVIDER_OAUTH_ERROR_ELEMENT_MISSING'	=> 'Both the key and secret of each enabled OAuth service provider must be provided. Only one was provided for an OAuth service provider.',
 	'AUTH_PROVIDER_OAUTH_EXPLAIN'				=> 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server.<br />These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br />Any service that does not have both a key and a secret entered here will not be available for use by the forum users.',
 	'AUTH_PROVIDER_OAUTH_KEY'					=> 'Key',
-	'AUTH_PROVIDER_OAUTH_SERVICE_BITLY'			=> 'Bitly',
-	'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK'		=> 'Facebook',
-	'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'		=> 'Google',
 	'AUTH_PROVIDER_OAUTH_TITLE'					=> 'OAuth',
 	'AUTH_PROVIDER_OAUTH_SECRET'				=> 'Secret',
 
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a68c027554..0b658f22b6 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -88,6 +88,9 @@ $lang = array_merge($lang, array(
 	'ATTACHED_IMAGE_NOT_IMAGE'		=> 'The image file you tried to attach is invalid.',
 	'AUTHOR'						=> 'Author',
 	'AUTH_NO_PROFILE_CREATED'		=> 'The creation of a user profile was unsuccessful.',
+	'AUTH_PROVIDER_OAUTH_SERVICE_BITLY'		=> 'Bitly',
+	'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK'	=> 'Facebook',
+	'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'	=> 'Google',
 	'AVATAR_DISALLOWED_CONTENT'		=> 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
 	'AVATAR_DISALLOWED_EXTENSION'	=> 'This file cannot be displayed because the extension <strong>%s</strong> is not allowed.',
 	'AVATAR_EMPTY_REMOTE_DATA'		=> 'The specified avatar could not be uploaded because the remote data appears to be invalid or corrupted.',
-- 
cgit v1.2.1


From 317a71a8384f137cedca3c9afbb02605876920c3 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 25 Jul 2013 12:49:30 -0400
Subject: [feature/oauth] Template for ucp_login_link started

PHPBB3-11673
---
 phpBB/language/en/ucp.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 51823ddb12..32b70e661b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -270,6 +270,7 @@ $lang = array_merge($lang, array(
 	'LINK_REMOTE_SIZE'			=> 'Avatar dimensions',
 	'LINK_REMOTE_SIZE_EXPLAIN'	=> 'Specify the width and height of the avatar, leave blank to attempt automatic verification.',
 	'LOGIN_EXPLAIN_UCP'			=> 'Please login in order to access the User Control Panel.',
+	'LOGIN_LINK'				=> 'Link or Register Your External Account with phpBB',
 	'LOGIN_KEY'					=> 'Login Key',
 	'LOGIN_TIME'				=> 'Login Time',
 	'LOGIN_REDIRECT'			=> 'You have been successfully logged in.',
@@ -480,6 +481,7 @@ $lang = array_merge($lang, array(
 	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. You will receive an email at the address you provide that contains an account activation link.',
 	'UCP_ICQ'					=> 'ICQ number',
 	'UCP_JABBER'				=> 'Jabber address',
+	'UCP_LOGIN_LINK'			=> 'Set up an external account',
 
 	'UCP_MAIN'					=> 'Overview',
 	'UCP_MAIN_ATTACHMENTS'		=> 'Manage attachments',
-- 
cgit v1.2.1


From 59852b5997905ed6f815c3cc4b9220872e1090d2 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 25 Jul 2013 14:53:05 -0400
Subject: [feature/oauth] More work on login linking accounts

PHPBB3-11673
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 32b70e661b..f44fd8905b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -271,6 +271,7 @@ $lang = array_merge($lang, array(
 	'LINK_REMOTE_SIZE_EXPLAIN'	=> 'Specify the width and height of the avatar, leave blank to attempt automatic verification.',
 	'LOGIN_EXPLAIN_UCP'			=> 'Please login in order to access the User Control Panel.',
 	'LOGIN_LINK'				=> 'Link or Register Your External Account with phpBB',
+	'LOGIN_LINK_EXPLAIN'		=> 'You have attempted to login with an external service that is not yet connected to an account on these forums. You may now either link this account to an existing account or you may create a new account.',
 	'LOGIN_KEY'					=> 'Login Key',
 	'LOGIN_TIME'				=> 'Login Time',
 	'LOGIN_REDIRECT'			=> 'You have been successfully logged in.',
-- 
cgit v1.2.1


From e0ef10128b68cfae9774f6c87cc1a841cacecd8d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 26 Jul 2013 10:26:52 -0500
Subject: [ticket/11744] Group join request notification

PHPBB3-11744
---
 phpBB/language/en/common.php | 1 +
 phpBB/language/en/ucp.php    | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b188d90f3a..8ababfcd2a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -414,6 +414,7 @@ $lang = array_merge($lang, array(
 		2	=> '<strong>%d</strong> Notifications',
 	),
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
+	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group you manage, %2$s.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 51823ddb12..dc09e8cdcb 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -313,6 +313,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
 	'NOTIFICATION_TYPE'									=> 'Notification type',
 	'NOTIFICATION_TYPE_BOOKMARK'						=> 'Someone replies to a topic you have bookmarked',
+	'NOTIFICATION_TYPE_GROUP_REQUEST'					=> 'Someone requests to join a group you lead',
 	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'				=> 'A post or topic needs approval',
 	'NOTIFICATION_TYPE_MODERATION_QUEUE'   				=> 'Your topics/posts are approved or disapproved by a moderator',
 	'NOTIFICATION_TYPE_PM'								=> 'Someone sends you a private message',
-- 
cgit v1.2.1


From 93db6190f582b2af41d3bf643758e48772ea9ba0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 27 Jul 2013 09:08:35 -0500
Subject: [ticket/11744] Language

PHPBB3-11744
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 8ababfcd2a..cdaf8269ed 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -414,7 +414,7 @@ $lang = array_merge($lang, array(
 		2	=> '<strong>%d</strong> Notifications',
 	),
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
-	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group you manage, %2$s.',
+	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group %2$s.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
-- 
cgit v1.2.1


From 46b4a405b1563c2fe15dad34c9ff2843271cd8f8 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 27 Jul 2013 17:02:45 -0500
Subject: [ticket/11745] Group request approved notification

PHPBB3-11745
---
 phpBB/language/en/common.php               |  1 +
 phpBB/language/en/email/group_approved.txt | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 phpBB/language/en/email/group_approved.txt

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index cdaf8269ed..91b1f6d9d9 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -415,6 +415,7 @@ $lang = array_merge($lang, array(
 	),
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
 	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group %2$s.',
+	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> 'Your request to join the "%1$s" group on has been approved.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
diff --git a/phpBB/language/en/email/group_approved.txt b/phpBB/language/en/email/group_approved.txt
deleted file mode 100644
index 24afefcd07..0000000000
--- a/phpBB/language/en/email/group_approved.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Subject: Your request has been approved
-
-Congratulations,
-
-Your request to join the "{GROUP_NAME}" group on "{SITENAME}" has been approved.
-Click on the following link to see your group membership.
-
-{U_GROUP}
-
-{EMAIL_SIG}
-- 
cgit v1.2.1


From a79e3b341578696c1dd6720d7589b10a3226dbb5 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 27 Jul 2013 20:37:50 -0500
Subject: [ticket/11373] Prune old read notifications with cron

PHPBB3-11373
---
 phpBB/language/en/acp/board.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index ce15dfefb4..a07150eb11 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -367,6 +367,8 @@ $lang = array_merge($lang, array(
 	'LOAD_JQUERY_CDN_EXPLAIN'		=> 'If this setting is enabled, jQuery will be served from Google’s AJAX API CDN instead of the copy included with phpBB on your server. If the CDN fails, phpBB will attempt to fall back to the copy included with phpBB.',
 	'LOAD_USER_ACTIVITY'			=> 'Show user’s activity',
 	'LOAD_USER_ACTIVITY_EXPLAIN'	=> 'Displays active topic/forum in user profiles and user control panel. It is recommended to disable this on boards with more than one million posts.',
+	'READ_NOTIFICATION_EXPIRE_DAYS'	=> 'Read Notification Expiration',
+	'READ_NOTIFICATION_EXPIRE_DAYS_EXPLAIN' => 'Number of days that will elapse before a read notification will automatically be deleted. Set this value to 0 to make notifications permanent.',
 	'RECOMPILE_STYLES'				=> 'Recompile stale style components',
 	'RECOMPILE_STYLES_EXPLAIN'		=> 'Check for updated style components on filesystem and recompile.',
 	'YES_ANON_READ_MARKING'			=> 'Enable topic marking for guests',
-- 
cgit v1.2.1


From 75206c74be23e17b2661faa0693cd308cab4d382 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 29 Jul 2013 11:58:24 -0400
Subject: [feature/oauth] Basic checking for data needed in login linking

PHPBB3-11673
---
 phpBB/language/en/ucp.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index f44fd8905b..6e48e3b801 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -270,8 +270,9 @@ $lang = array_merge($lang, array(
 	'LINK_REMOTE_SIZE'			=> 'Avatar dimensions',
 	'LINK_REMOTE_SIZE_EXPLAIN'	=> 'Specify the width and height of the avatar, leave blank to attempt automatic verification.',
 	'LOGIN_EXPLAIN_UCP'			=> 'Please login in order to access the User Control Panel.',
-	'LOGIN_LINK'				=> 'Link or Register Your External Account with phpBB',
-	'LOGIN_LINK_EXPLAIN'		=> 'You have attempted to login with an external service that is not yet connected to an account on these forums. You may now either link this account to an existing account or you may create a new account.',
+	'LOGIN_LINK'					=> 'Link or Register Your External Account with phpBB',
+	'LOGIN_LINK_EXPLAIN'			=> 'You have attempted to login with an external service that is not yet connected to an account on these forums. You may now either link this account to an existing account or you may create a new account.',
+	'LOGIN_LINK_NO_DATA_PROVIDED'	=> 'No data has been provided to this page to link an external account to a forum account. Please contact the board administrator if you continue to experience problems.',
 	'LOGIN_KEY'					=> 'Login Key',
 	'LOGIN_TIME'				=> 'Login Time',
 	'LOGIN_REDIRECT'			=> 'You have been successfully logged in.',
-- 
cgit v1.2.1


From c09bda10fcf3fc7b84908bc15d86eca86b71f232 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 29 Jul 2013 13:10:56 -0400
Subject: [feature/oauth] Properly check that all data needed is available

PHPBB3-11673
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 6e48e3b801..bfc27013fe 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -272,6 +272,7 @@ $lang = array_merge($lang, array(
 	'LOGIN_EXPLAIN_UCP'			=> 'Please login in order to access the User Control Panel.',
 	'LOGIN_LINK'					=> 'Link or Register Your External Account with phpBB',
 	'LOGIN_LINK_EXPLAIN'			=> 'You have attempted to login with an external service that is not yet connected to an account on these forums. You may now either link this account to an existing account or you may create a new account.',
+	'LOGIN_LINK_MISSING_DATA'		=> 'Data that is necessary to link your account with an external service is not available. Please restart the login process.',
 	'LOGIN_LINK_NO_DATA_PROVIDED'	=> 'No data has been provided to this page to link an external account to a forum account. Please contact the board administrator if you continue to experience problems.',
 	'LOGIN_KEY'					=> 'Login Key',
 	'LOGIN_TIME'				=> 'Login Time',
-- 
cgit v1.2.1


From 5bb08a1ab973ee13237876d11b001c4ed6658892 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 29 Jul 2013 21:30:01 +0200
Subject: [ticket/11574] Change order of files and database update

PHPBB3-11574
---
 phpBB/language/en/install.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index be45047861..f994f339a9 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -374,7 +374,7 @@ $lang = array_merge($lang, array(
 
 // Updater
 $lang = array_merge($lang, array(
-	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version. You should now <a href="%1$s">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="%2$s">Send statistics</a> module in your ACP.',
+	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version.',
 	'ARCHIVE_FILE'				=> 'Source file within archive',
 
 	'BACK'				=> 'Back',
@@ -419,8 +419,9 @@ $lang = array_merge($lang, array(
 	'DOWNLOAD_UPDATE_METHOD'			=> 'Download modified files archive',
 	'DOWNLOAD_UPDATE_METHOD_EXPLAIN'	=> 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.',
 
-	'ERROR'			=> 'Error',
 	'EDIT_USERNAME'	=> 'Edit username',
+	'ERROR'			=> 'Error',
+	'EVERYTHING_UP_TO_DATE'		=> 'Everything is up to date with the latest phpBB version. You should now <a href="%1$s">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="%2$s">Send statistics</a> module in your ACP.',
 
 	'FILE_ALREADY_UP_TO_DATE'		=> 'File is already up to date.',
 	'FILE_DIFF_NOT_ALLOWED'			=> 'File not allowed to be diffed.',
@@ -570,6 +571,7 @@ $lang = array_merge($lang, array(
 	'UPLOAD_METHOD'					=> 'Upload method',
 
 	'UPDATE_DB_SUCCESS'				=> 'Database update was successful.',
+	'UPDATE_FILE_SUCCESS'			=> 'File update was successful.',
 	'USER_ACTIVE'					=> 'Active user',
 	'USER_INACTIVE'					=> 'Inactive user',
 
-- 
cgit v1.2.1


From 32499c8808bb72812f66ba00e35c5af128a4d4e2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Jul 2013 01:38:06 +0200
Subject: [ticket/11574] Remove install/udpate/new/ fallback from
 database_update.php

Since we switched the order, everything should be in the normal root by
then.

PHPBB3-11574
---
 phpBB/language/en/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index f994f339a9..03c9562983 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -398,7 +398,7 @@ $lang = array_merge($lang, array(
 
 	'DATABASE_TYPE'						=> 'Database type',
 	'DATABASE_UPDATE_COMPLETE'			=> 'Database updater has completed!',
-	'DATABASE_UPDATE_CONTINUE'			=> 'Continue database update.',
+	'DATABASE_UPDATE_CONTINUE'			=> 'Continue database update',
 	'DATABASE_UPDATE_INFO_OLD'			=> 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.',
 	'DATABASE_UPDATE_NOT_COMPLETED'		=> 'The database update has not yet completed.',
 	'DELETE_USER_REMOVE'				=> 'Delete user and remove posts',
-- 
cgit v1.2.1


From c5515eaf5466f2122a69c35aacd17b3614f46462 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 30 Jul 2013 14:16:25 -0400
Subject: [feature/oauth] Reword some of the language text

PHPBB3-11673
---
 phpBB/language/en/ucp.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index bfc27013fe..101fc7663a 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -270,8 +270,8 @@ $lang = array_merge($lang, array(
 	'LINK_REMOTE_SIZE'			=> 'Avatar dimensions',
 	'LINK_REMOTE_SIZE_EXPLAIN'	=> 'Specify the width and height of the avatar, leave blank to attempt automatic verification.',
 	'LOGIN_EXPLAIN_UCP'			=> 'Please login in order to access the User Control Panel.',
-	'LOGIN_LINK'					=> 'Link or Register Your External Account with phpBB',
-	'LOGIN_LINK_EXPLAIN'			=> 'You have attempted to login with an external service that is not yet connected to an account on these forums. You may now either link this account to an existing account or you may create a new account.',
+	'LOGIN_LINK'					=> 'Link or Register Your External Account with This Board',
+	'LOGIN_LINK_EXPLAIN'			=> 'You have attempted to login with an external service that is not yet connected to an account on this board. You must now either link this account to an existing account or create a new account.',
 	'LOGIN_LINK_MISSING_DATA'		=> 'Data that is necessary to link your account with an external service is not available. Please restart the login process.',
 	'LOGIN_LINK_NO_DATA_PROVIDED'	=> 'No data has been provided to this page to link an external account to a forum account. Please contact the board administrator if you continue to experience problems.',
 	'LOGIN_KEY'					=> 'Login Key',
-- 
cgit v1.2.1


From baa3a750c4cd2112202c40b39d1f3fdf5b05bdb1 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 5 Aug 2013 15:34:26 -0400
Subject: [feature/oauth] Start general auth linking page

PHPBB3-11673
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 101fc7663a..a25fb54c8c 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -479,6 +479,7 @@ $lang = array_merge($lang, array(
 	'UCP_ADMIN_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will receive an email at the address you specified.',
 	'UCP_AIM'					=> 'AOL Instant Messenger',
 	'UCP_ATTACHMENTS'			=> 'Attachments',
+	'UCP_AUTH_LINK'				=> 'Link an external account',
 	'UCP_COPPA_BEFORE'			=> 'Before %s',
 	'UCP_COPPA_ON_AFTER'		=> 'On or after %s',
 	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. You will receive an email at the address you provide that contains an account activation link.',
-- 
cgit v1.2.1


From 4683c37682541f73deca1f1476daf8c24f6962d6 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 5 Aug 2013 15:38:58 -0400
Subject: [feature/oauth] Forgot to have login_link be "in login" in ucp

PHPBB3-11673
---
 phpBB/language/en/ucp.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index a25fb54c8c..993e5b56f8 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -479,7 +479,8 @@ $lang = array_merge($lang, array(
 	'UCP_ADMIN_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will receive an email at the address you specified.',
 	'UCP_AIM'					=> 'AOL Instant Messenger',
 	'UCP_ATTACHMENTS'			=> 'Attachments',
-	'UCP_AUTH_LINK'				=> 'Link an external account',
+	'UCP_AUTH_LINK'				=> 'External accounts',
+	'UCP_AUTH_LINK_MANAGE'		=> 'Manage external accounts',
 	'UCP_COPPA_BEFORE'			=> 'Before %s',
 	'UCP_COPPA_ON_AFTER'		=> 'On or after %s',
 	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. You will receive an email at the address you provide that contains an account activation link.',
-- 
cgit v1.2.1


From deb62d51fe4e06e52fbc4042b692071bcd8f9d39 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Fri, 9 Aug 2013 05:12:41 -0400
Subject: [feature/oauth] Start building the template

PHPBB3-11673
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 993e5b56f8..4798b1e81c 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -481,6 +481,7 @@ $lang = array_merge($lang, array(
 	'UCP_ATTACHMENTS'			=> 'Attachments',
 	'UCP_AUTH_LINK'				=> 'External accounts',
 	'UCP_AUTH_LINK_MANAGE'		=> 'Manage external accounts',
+	'UCP_AUTH_LINK_TITLE'		=> 'Manage Your External Accounts',
 	'UCP_COPPA_BEFORE'			=> 'Before %s',
 	'UCP_COPPA_ON_AFTER'		=> 'On or after %s',
 	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. You will receive an email at the address you provide that contains an account activation link.',
-- 
cgit v1.2.1


From d13a1788f0517f3ecb87d1ecedf24833cf3b403a Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Wed, 14 Aug 2013 17:07:38 -0400
Subject: [feature/oauth] Update language constants for ucp_auth_link

PHPBB3-11673
---
 phpBB/language/en/ucp.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 4798b1e81c..19892ce194 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -480,8 +480,12 @@ $lang = array_merge($lang, array(
 	'UCP_AIM'					=> 'AOL Instant Messenger',
 	'UCP_ATTACHMENTS'			=> 'Attachments',
 	'UCP_AUTH_LINK'				=> 'External accounts',
+	'UCP_AUTH_LINK_ASK'			=> 'You currently have no account tied to this external service. Click the button below to link your board account to an account with this external service.',
+	'UCP_AUTH_LINK_ID'			=> 'Unique identifier',
+	'UCP_AUTH_LINK_LINK'		=> 'Link',
 	'UCP_AUTH_LINK_MANAGE'		=> 'Manage external accounts',
-	'UCP_AUTH_LINK_TITLE'		=> 'Manage Your External Accounts',
+	'UCP_AUTH_LINK_TITLE'		=> 'Manage your external accounts',
+	'UCP_AUTH_LINK_UNLINK'		=> 'Unlink',
 	'UCP_COPPA_BEFORE'			=> 'Before %s',
 	'UCP_COPPA_ON_AFTER'		=> 'On or after %s',
 	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. You will receive an email at the address you provide that contains an account activation link.',
-- 
cgit v1.2.1


From 27ba57747ab46c0507acc3a87e5b73babda436b1 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Sat, 24 Aug 2013 17:14:30 -0400
Subject: [feature/oauth] Clean up TODOs

PHPBB3-11673
---
 phpBB/language/en/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 0b658f22b6..7d6c7aa1be 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -88,6 +88,8 @@ $lang = array_merge($lang, array(
 	'ATTACHED_IMAGE_NOT_IMAGE'		=> 'The image file you tried to attach is invalid.',
 	'AUTHOR'						=> 'Author',
 	'AUTH_NO_PROFILE_CREATED'		=> 'The creation of a user profile was unsuccessful.',
+	'AUTH_PROVIDER_OAUTH_ERROR_INVALID_ENTRY' => 'Invalid database entry.',
+	'AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE' => 'Invalid service type provided to OAuth service handler.',
 	'AUTH_PROVIDER_OAUTH_SERVICE_BITLY'		=> 'Bitly',
 	'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK'	=> 'Facebook',
 	'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'	=> 'Google',
-- 
cgit v1.2.1


From d398ae41c031f70946e82f71599f1821766f3eea Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Sat, 24 Aug 2013 17:20:01 -0400
Subject: [feature/oauth] Finish cleaning up TODOs

PHPBB3-11673
---
 phpBB/language/en/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 7d6c7aa1be..b558b0fad8 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -93,6 +93,8 @@ $lang = array_merge($lang, array(
 	'AUTH_PROVIDER_OAUTH_SERVICE_BITLY'		=> 'Bitly',
 	'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK'	=> 'Facebook',
 	'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'	=> 'Google',
+	'AUTH_PROVIDER_OAUTH_TOKEN_ERROR_NOT_STORED' => 'OAuth token not stored.',
+	'AUTH_PROVIDER_OAUTH_TOKEN_ERROR_INCORRECTLY_STORED' => 'OAuth token incorrectly stored.',
 	'AVATAR_DISALLOWED_CONTENT'		=> 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
 	'AVATAR_DISALLOWED_EXTENSION'	=> 'This file cannot be displayed because the extension <strong>%s</strong> is not allowed.',
 	'AVATAR_EMPTY_REMOTE_DATA'		=> 'The specified avatar could not be uploaded because the remote data appears to be invalid or corrupted.',
-- 
cgit v1.2.1


From 3df958502960b68e37f3cd9d3d51a4ff1d319fde Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Sat, 24 Aug 2013 17:21:02 -0400
Subject: [feature/oauth] Fix indentation on new language constants

PHPBB3-11673
---
 phpBB/language/en/common.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b558b0fad8..8c36edec58 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -88,13 +88,13 @@ $lang = array_merge($lang, array(
 	'ATTACHED_IMAGE_NOT_IMAGE'		=> 'The image file you tried to attach is invalid.',
 	'AUTHOR'						=> 'Author',
 	'AUTH_NO_PROFILE_CREATED'		=> 'The creation of a user profile was unsuccessful.',
-	'AUTH_PROVIDER_OAUTH_ERROR_INVALID_ENTRY' => 'Invalid database entry.',
-	'AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE' => 'Invalid service type provided to OAuth service handler.',
-	'AUTH_PROVIDER_OAUTH_SERVICE_BITLY'		=> 'Bitly',
-	'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK'	=> 'Facebook',
-	'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'	=> 'Google',
-	'AUTH_PROVIDER_OAUTH_TOKEN_ERROR_NOT_STORED' => 'OAuth token not stored.',
-	'AUTH_PROVIDER_OAUTH_TOKEN_ERROR_INCORRECTLY_STORED' => 'OAuth token incorrectly stored.',
+	'AUTH_PROVIDER_OAUTH_ERROR_INVALID_ENTRY'				=> 'Invalid database entry.',
+	'AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'		=> 'Invalid service type provided to OAuth service handler.',
+	'AUTH_PROVIDER_OAUTH_SERVICE_BITLY'						=> 'Bitly',
+	'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK'					=> 'Facebook',
+	'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'					=> 'Google',
+	'AUTH_PROVIDER_OAUTH_TOKEN_ERROR_NOT_STORED'			=> 'OAuth token not stored.',
+	'AUTH_PROVIDER_OAUTH_TOKEN_ERROR_INCORRECTLY_STORED'	=> 'OAuth token incorrectly stored.',
 	'AVATAR_DISALLOWED_CONTENT'		=> 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
 	'AVATAR_DISALLOWED_EXTENSION'	=> 'This file cannot be displayed because the extension <strong>%s</strong> is not allowed.',
 	'AVATAR_EMPTY_REMOTE_DATA'		=> 'The specified avatar could not be uploaded because the remote data appears to be invalid or corrupted.',
-- 
cgit v1.2.1


From a8ffbce99f9ea99bd1fdca0e009001026e2d6950 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Sat, 24 Aug 2013 22:00:16 -0400
Subject: [feature/oauth] Changes due to code review

PHPBB3-11673
---
 phpBB/language/en/common.php |  1 +
 phpBB/language/en/ucp.php    | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 8c36edec58..5c7df2c5fd 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -90,6 +90,7 @@ $lang = array_merge($lang, array(
 	'AUTH_NO_PROFILE_CREATED'		=> 'The creation of a user profile was unsuccessful.',
 	'AUTH_PROVIDER_OAUTH_ERROR_INVALID_ENTRY'				=> 'Invalid database entry.',
 	'AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE'		=> 'Invalid service type provided to OAuth service handler.',
+	'AUTH_PROVIDER_OAUTH_ERROR_SERVICE_NOT_CREATED'			=> 'OAuth service not created',
 	'AUTH_PROVIDER_OAUTH_SERVICE_BITLY'						=> 'Bitly',
 	'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK'					=> 'Facebook',
 	'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE'					=> 'Google',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 19892ce194..03a14336b5 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -270,7 +270,7 @@ $lang = array_merge($lang, array(
 	'LINK_REMOTE_SIZE'			=> 'Avatar dimensions',
 	'LINK_REMOTE_SIZE_EXPLAIN'	=> 'Specify the width and height of the avatar, leave blank to attempt automatic verification.',
 	'LOGIN_EXPLAIN_UCP'			=> 'Please login in order to access the User Control Panel.',
-	'LOGIN_LINK'					=> 'Link or Register Your External Account with This Board',
+	'LOGIN_LINK'					=> 'Link or register your account on an external service with your board account',
 	'LOGIN_LINK_EXPLAIN'			=> 'You have attempted to login with an external service that is not yet connected to an account on this board. You must now either link this account to an existing account or create a new account.',
 	'LOGIN_LINK_MISSING_DATA'		=> 'Data that is necessary to link your account with an external service is not available. Please restart the login process.',
 	'LOGIN_LINK_NO_DATA_PROVIDED'	=> 'No data has been provided to this page to link an external account to a forum account. Please contact the board administrator if you continue to experience problems.',
@@ -480,18 +480,18 @@ $lang = array_merge($lang, array(
 	'UCP_AIM'					=> 'AOL Instant Messenger',
 	'UCP_ATTACHMENTS'			=> 'Attachments',
 	'UCP_AUTH_LINK'				=> 'External accounts',
-	'UCP_AUTH_LINK_ASK'			=> 'You currently have no account tied to this external service. Click the button below to link your board account to an account with this external service.',
+	'UCP_AUTH_LINK_ASK'			=> 'You currently have no account associated with this external service. Click the button below to link your board account to an account with this external service.',
 	'UCP_AUTH_LINK_ID'			=> 'Unique identifier',
 	'UCP_AUTH_LINK_LINK'		=> 'Link',
-	'UCP_AUTH_LINK_MANAGE'		=> 'Manage external accounts',
-	'UCP_AUTH_LINK_TITLE'		=> 'Manage your external accounts',
+	'UCP_AUTH_LINK_MANAGE'		=> 'Manage external account associations',
+	'UCP_AUTH_LINK_TITLE'		=> 'Manage your external account associations',
 	'UCP_AUTH_LINK_UNLINK'		=> 'Unlink',
 	'UCP_COPPA_BEFORE'			=> 'Before %s',
 	'UCP_COPPA_ON_AFTER'		=> 'On or after %s',
 	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. You will receive an email at the address you provide that contains an account activation link.',
 	'UCP_ICQ'					=> 'ICQ number',
 	'UCP_JABBER'				=> 'Jabber address',
-	'UCP_LOGIN_LINK'			=> 'Set up an external account',
+	'UCP_LOGIN_LINK'			=> 'Set up an external account association',
 
 	'UCP_MAIN'					=> 'Overview',
 	'UCP_MAIN_ATTACHMENTS'		=> 'Manage attachments',
-- 
cgit v1.2.1


From 010da72f64ce325c27fb68c5c142ec01e1e53e61 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 3 Sep 2013 16:16:23 -0700
Subject: [ticket/11824] Add option for mod_rewrite

PHPBB3-11824
---
 phpBB/language/en/acp/board.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index ce15dfefb4..369317e6c9 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -427,6 +427,10 @@ $lang = array_merge($lang, array(
 	'FORCE_SERVER_VARS_EXPLAIN'	=> 'If set to yes the server settings defined here will be used in favour of the automatically determined values.',
 	'ICONS_PATH'				=> 'Post icons storage path',
 	'ICONS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/icons</samp>.',
+	'MOD_REWRITE_ENABLE'		=> 'Enable URL Rewriting',
+	'MOD_REWRITE_ENABLE_EXPLAIN' => 'When disabled, URL paths will include app.php. When enabled, URL paths will not include app.php.<br /><strong>This option requires the Apache module <samp>mod_rewrite</samp> to be enabled and the appropriate rewrite rules must be present in <samp>.htaccess</samp>.</strong>',
+	'MOD_REWRITE_DISABLED'		=> 'The <samp>mod_rewrite</samp> module on your Apache web server is disabled. Enable the module or contact your web hosting provider if you wish to enable this feature.',
+	'MOD_REWRITE_INFORMATION_UNAVAILABLE' => 'We are unable to determine whether or not this server supports URL rewriting. This setting may be enabled but if URL rewriting is not available, paths generated by this board (such as for use in links) may be broken. Contact your web hosting provider if you are unsure whether or not you can safely enable this feature.',
 	'PATH_SETTINGS'				=> 'Path settings',
 	'RANKS_PATH'				=> 'Rank image storage path',
 	'RANKS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/ranks</samp>.',
-- 
cgit v1.2.1


From 2ccc992da16cf4feaefef3deb230b1b7cae2cac3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 6 Sep 2013 12:48:09 -0700
Subject: [ticket/11824] Fix logic

PHPBB3-11824
---
 phpBB/language/en/acp/board.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 369317e6c9..cde96fe2fd 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -428,8 +428,8 @@ $lang = array_merge($lang, array(
 	'ICONS_PATH'				=> 'Post icons storage path',
 	'ICONS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/icons</samp>.',
 	'MOD_REWRITE_ENABLE'		=> 'Enable URL Rewriting',
-	'MOD_REWRITE_ENABLE_EXPLAIN' => 'When disabled, URL paths will include app.php. When enabled, URL paths will not include app.php.<br /><strong>This option requires the Apache module <samp>mod_rewrite</samp> to be enabled and the appropriate rewrite rules must be present in <samp>.htaccess</samp>.</strong>',
-	'MOD_REWRITE_DISABLED'		=> 'The <samp>mod_rewrite</samp> module on your Apache web server is disabled. Enable the module or contact your web hosting provider if you wish to enable this feature.',
+	'MOD_REWRITE_ENABLE_EXPLAIN' => 'When disabled, URL paths will include app.php. When enabled, URL paths will not include app.php.<br /><strong>This option requires the Apache module mod_rewrite to be enabled and the appropriate rewrite rules must be present in .htaccess.</strong>',
+	'MOD_REWRITE_DISABLED'		=> 'The <strong>mod_rewrite</strong> module on your Apache web server is disabled. Enable the module or contact your web hosting provider if you wish to enable this feature.',
 	'MOD_REWRITE_INFORMATION_UNAVAILABLE' => 'We are unable to determine whether or not this server supports URL rewriting. This setting may be enabled but if URL rewriting is not available, paths generated by this board (such as for use in links) may be broken. Contact your web hosting provider if you are unsure whether or not you can safely enable this feature.',
 	'PATH_SETTINGS'				=> 'Path settings',
 	'RANKS_PATH'				=> 'Rank image storage path',
-- 
cgit v1.2.1


From 6f4ad0bcfab67dfad074f6494edda6490bfb1d82 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 12 Sep 2013 09:21:40 -0700
Subject: [ticket/11824] Update language string for board settings

PHPBB3-11824
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index cde96fe2fd..3148880c9d 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -428,7 +428,7 @@ $lang = array_merge($lang, array(
 	'ICONS_PATH'				=> 'Post icons storage path',
 	'ICONS_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/icons</samp>.',
 	'MOD_REWRITE_ENABLE'		=> 'Enable URL Rewriting',
-	'MOD_REWRITE_ENABLE_EXPLAIN' => 'When disabled, URL paths will include app.php. When enabled, URL paths will not include app.php.<br /><strong>This option requires the Apache module mod_rewrite to be enabled and the appropriate rewrite rules must be present in .htaccess.</strong>',
+	'MOD_REWRITE_ENABLE_EXPLAIN' => 'When enabled, URLs containing ’app.php’ will be rewritten to remove the filename (i.e. app.php/foo will become /foo). <strong>Apache server’s mod_rewrite module is required for this functionality to work; if this option is enabled without mod_rewrite support, URLs on your board may be broken.</strong>',
 	'MOD_REWRITE_DISABLED'		=> 'The <strong>mod_rewrite</strong> module on your Apache web server is disabled. Enable the module or contact your web hosting provider if you wish to enable this feature.',
 	'MOD_REWRITE_INFORMATION_UNAVAILABLE' => 'We are unable to determine whether or not this server supports URL rewriting. This setting may be enabled but if URL rewriting is not available, paths generated by this board (such as for use in links) may be broken. Contact your web hosting provider if you are unsure whether or not you can safely enable this feature.',
 	'PATH_SETTINGS'				=> 'Path settings',
-- 
cgit v1.2.1


From 32b92547400c14a402f64463661ce7c1b44e81b3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 12 Sep 2013 22:59:42 -0500
Subject: [ticket/11745] Correct language, coding guidelines

PHPBB3-11745
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 91b1f6d9d9..bd34c51bef 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -415,7 +415,7 @@ $lang = array_merge($lang, array(
 	),
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
 	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group %2$s.',
-	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> 'Your request to join the "%1$s" group on has been approved.',
+	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> 'Your request to join the group %1$s has been approved.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
-- 
cgit v1.2.1


From b7ab068bbc5c58220bc93eb3daffc5642ccba797 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Fri, 13 Sep 2013 11:48:31 -0400
Subject: [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED

PHPBB3-11837
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 0222f92b1b..ac37591266 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -485,6 +485,7 @@ $lang = array_merge($lang, array(
 	'UCP_AUTH_LINK_ID'			=> 'Unique identifier',
 	'UCP_AUTH_LINK_LINK'		=> 'Link',
 	'UCP_AUTH_LINK_MANAGE'		=> 'Manage external account associations',
+	'UCP_AUTH_LINK_NOT_SUPPORTED'	=> 'Linking board accounts to external services is not supported by this board\'s current authentication method.',
 	'UCP_AUTH_LINK_TITLE'		=> 'Manage your external account associations',
 	'UCP_AUTH_LINK_UNLINK'		=> 'Unlink',
 	'UCP_COPPA_BEFORE'			=> 'Before %s',
-- 
cgit v1.2.1


From 3c6c1ec5f2d8f5d4c2e3f941c0112daa21d97631 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Fri, 13 Sep 2013 16:26:30 -0400
Subject: [ticket/11837] Replace escaped single quote with utf-8 single quote

PHPBB3-11837
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index ac37591266..e2d5dc5ad1 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -485,7 +485,7 @@ $lang = array_merge($lang, array(
 	'UCP_AUTH_LINK_ID'			=> 'Unique identifier',
 	'UCP_AUTH_LINK_LINK'		=> 'Link',
 	'UCP_AUTH_LINK_MANAGE'		=> 'Manage external account associations',
-	'UCP_AUTH_LINK_NOT_SUPPORTED'	=> 'Linking board accounts to external services is not supported by this board\'s current authentication method.',
+	'UCP_AUTH_LINK_NOT_SUPPORTED'	=> 'Linking board accounts to external services is not supported by this board’s current authentication method.',
 	'UCP_AUTH_LINK_TITLE'		=> 'Manage your external account associations',
 	'UCP_AUTH_LINK_UNLINK'		=> 'Unlink',
 	'UCP_COPPA_BEFORE'			=> 'Before %s',
-- 
cgit v1.2.1


From 30a26f23a4f9a206ee251e13520b04a6f8db68c7 Mon Sep 17 00:00:00 2001
From: Prosk8er <prosk8er@gotskillslounge.com>
Date: Sat, 14 Sep 2013 15:28:04 -0400
Subject: [ticket/11844] update acp/authentication language var

the language var ACP_AUTH_SETTINGS_EXPLAIN in language/en/acp/board.php

PHPBB3-11844
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 6eabe99d80..f786374ba6 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -392,7 +392,7 @@ $lang = array_merge($lang, array(
 
 // Auth settings
 $lang = array_merge($lang, array(
-	'ACP_AUTH_SETTINGS_EXPLAIN'	=> 'phpBB supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default three plug-ins are provided; DB, LDAP and Apache. Not all methods require additional information so only fill out fields if they are relevant to the selected method.',
+	'ACP_AUTH_SETTINGS_EXPLAIN'	=> 'phpBB supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default four plug-ins are provided: DB, LDAP, Apache, and OAuth. Not all methods require additional information so only fill out fields if they are relevant to the selected method.',
 
 	'AUTH_METHOD'				=> 'Select an authentication method',
 
-- 
cgit v1.2.1


From 621e6c93ed5517cedbf7a6a37c35786a1e2f27e8 Mon Sep 17 00:00:00 2001
From: Nathan <nathaniel.guse@gmail.com>
Date: Wed, 2 Oct 2013 14:27:46 -0500
Subject: [ticket/11883] Report completed data step in migration as "Installing
 Data"

PHPBB3-11883
---
 phpBB/language/en/migrator.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index 34dcbf4c52..1d8886d12b 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -39,11 +39,12 @@ $lang = array_merge($lang, array(
 
 	'GROUP_NOT_EXIST'					=> 'The group "%s" unexpectedly does not exist.',
 
-	'MIGRATION_DATA_DONE'				=> 'Installed Data: %s',
+	'MIGRATION_DATA_DONE'				=> 'Installed Data: %1$s; Time: %2$.2f seconds',
+	'MIGRATION_DATA_IN_PROGRESS'		=> 'Installing Data: %1$s; Time: %2$.2f seconds',
 	'MIGRATION_EFFECTIVELY_INSTALLED'	=> 'Migration already effectively installed (skipped): %s',
 	'MIGRATION_EXCEPTION_ERROR'			=> 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.',
 	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
-	'MIGRATION_SCHEMA_DONE'				=> 'Installed Schema: %s',
+	'MIGRATION_SCHEMA_DONE'				=> 'Installed Schema: %1$s; Time: %2$.2f seconds',
 
 	'MODULE_ERROR'						=> 'An error occurred while creating a module: %s',
 	'MODULE_INFO_FILE_NOT_EXIST'		=> 'A required module info file is missing: %2$s',
-- 
cgit v1.2.1


From 70c757a3a99b4232c13c31d968df5a9ad20a495d Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 5 Oct 2013 20:59:07 -0700
Subject: [ticket/11894] Fix typo in "Delete post" option

PHPBB3-11894
---
 phpBB/language/en/posting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 0e8d59a92e..ab851638ae 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -85,7 +85,7 @@ $lang = array_merge($lang, array(
 	'DELETE_POSTS_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete these posts?',
 	'DELETE_REASON'				=> 'Soft delete reason',
 	'DELETE_REASON_EXPLAIN'		=> 'The specified reason for deletion will be visible to moderators.',
-	'DELETE_POST_WARN'			=> 'Deleted this post',
+	'DELETE_POST_WARN'			=> 'Delete this post',
 	'DELETE_TOPIC_CONFIRM'		=> 'Are you sure you want to delete this topic?',
 	'DELETE_TOPIC_PERMANENTLY'	=> 'Permanently delete this topic so it can not be recovered',
 	'DELETE_TOPIC_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete this topic?',
-- 
cgit v1.2.1


From be9b767019bc91fa005fa592be6031d6bc39b078 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 5 Oct 2013 21:38:20 -0700
Subject: =?UTF-8?q?[ticket/11739]=20Rename=20=E2=80=9CRemember=20Me?=
 =?UTF-8?q?=E2=80=9D=20login=20keys=20module?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PHPBB3-11739
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index e2d5dc5ad1..2f4d35a5b4 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -529,7 +529,7 @@ $lang = array_merge($lang, array(
 	'UCP_PROFILE_PROFILE_INFO'	=> 'Edit profile',
 	'UCP_PROFILE_REG_DETAILS'	=> 'Edit account settings',
 	'UCP_PROFILE_SIGNATURE'		=> 'Edit signature',
-	'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Edit "Remember Me" login keys',
+	'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Manage “Remember Me” login keys',
 
 	'UCP_USERGROUPS'			=> 'Usergroups',
 	'UCP_USERGROUPS_MEMBER'		=> 'Edit memberships',
-- 
cgit v1.2.1


From 94b49d8a925e4bc7f10cbcf117ba81b071019b73 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 14 Jul 2013 20:44:00 +0200
Subject: [ticket/11703] Make jQuery CDN switch more generic.

Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN

PHPBB3-11703
---
 phpBB/language/en/acp/board.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index f786374ba6..8ca937a58d 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -354,6 +354,8 @@ $lang = array_merge($lang, array(
 $lang = array_merge($lang, array(
 	'ACP_LOAD_SETTINGS_EXPLAIN'	=> 'Here you can enable and disable certain board functions to reduce the amount of processing required. On most servers there is no need to disable any functions. However on certain systems or in shared hosting environments it may be beneficial to disable capabilities you do not really need. You can also specify limits for system load and active sessions beyond which the board will go offline.',
 
+	'ALLOW_CDN'						=> 'Allow usage of third party content delivery networks',
+	'ALLOW_CDN_EXPLAIN'				=> 'If this setting is enabled, some files will be served from external third party servers instead of your server. This reduces the network bandwidth required by your server, but may present a privacy issue for some board administrators.',
 	'CUSTOM_PROFILE_FIELDS'			=> 'Custom profile fields',
 	'LIMIT_LOAD'					=> 'Limit system load',
 	'LIMIT_LOAD_EXPLAIN'			=> 'If the system’s 1-minute load average exceeds this value the board will automatically go offline. A value of 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers and where this information is accessible. The value here resets itself to 0 if phpBB was unable to get the load limit.',
@@ -363,8 +365,6 @@ $lang = array_merge($lang, array(
 	'LOAD_CPF_PM'					=> 'Display custom profile fields in private messages',
 	'LOAD_CPF_VIEWPROFILE'			=> 'Display custom profile fields in user profiles',
 	'LOAD_CPF_VIEWTOPIC'			=> 'Display custom profile fields on topic pages',
-	'LOAD_JQUERY_CDN'				=> 'Serve jQuery using Google’s CDN',
-	'LOAD_JQUERY_CDN_EXPLAIN'		=> 'If this setting is enabled, jQuery will be served from Google’s AJAX API CDN instead of the copy included with phpBB on your server. If the CDN fails, phpBB will attempt to fall back to the copy included with phpBB.',
 	'LOAD_USER_ACTIVITY'			=> 'Show user’s activity',
 	'LOAD_USER_ACTIVITY_EXPLAIN'	=> 'Displays active topic/forum in user profiles and user control panel. It is recommended to disable this on boards with more than one million posts.',
 	'READ_NOTIFICATION_EXPIRE_DAYS'	=> 'Read Notification Expiration',
-- 
cgit v1.2.1


From 67530d132ac6eb1eae74bd184014bcc7c6b7d082 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 17 Jul 2013 02:42:24 +0200
Subject: [feature/plupload/cron] Add cronjob for cleaning plupload temporary
 directory.

PHPBB3-10929
---
 phpBB/language/en/acp/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 9c470efcd9..77a7618ce0 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -666,6 +666,8 @@ $lang = array_merge($lang, array(
 	'LOG_U_ROLE_EDIT'		=> '<strong>User role edited</strong><br />» %s',
 	'LOG_U_ROLE_REMOVED'	=> '<strong>User role removed</strong><br />» %s',
 
+	'LOG_PLUPLOAD_TIDY_FAILED'		=> '<strong>Unable to open %1$s for tidying, check permissions.</strong><br />Exception: %2$s<br />Trace: %3$s',
+
 	'LOG_PROFILE_FIELD_ACTIVATE'	=> '<strong>Profile field activated</strong><br />» %s',
 	'LOG_PROFILE_FIELD_CREATE'		=> '<strong>Profile field added</strong><br />» %s',
 	'LOG_PROFILE_FIELD_DEACTIVATE'	=> '<strong>Profile field deactivated</strong><br />» %s',
-- 
cgit v1.2.1


From 2050a39da793b9ed219beed868ec86ebade423f6 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 11 Oct 2013 17:40:16 +0200
Subject: [feature/plupload/integration] Integration of Plupload

This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".

PHPBB3-10929
---
 phpBB/language/en/plupload.php | 65 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 phpBB/language/en/plupload.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/plupload.php b/phpBB/language/en/plupload.php
new file mode 100644
index 0000000000..cfdce9810e
--- /dev/null
+++ b/phpBB/language/en/plupload.php
@@ -0,0 +1,65 @@
+<?php
+/**
+*
+* plupload [English]
+*
+* @package language
+* @copyright (c) 2010-2013 Moxiecode Systems AB
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// 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_merge($lang, array(
+	'PLUPLOAD_ADD_FILES'		=> 'Add files',
+	'PLUPLOAD_ADD_FILES_TO_QUEUE'	=> 'Add files to the upload queue and click the start button.',
+	'PLUPLOAD_DRAG'				=> 'Drag files here.',
+	'PLUPLOAD_ERR_INPUT'		=> 'Failed to open input stream.',
+	'PLUPLOAD_ERR_MOVE_UPLOADED'	=> 'Failed to move uploaded file.',
+	'PLUPLOAD_ERR_OUTPUT'		=> 'Failed to open output stream.',
+	'PLUPLOAD_EXTENSION_ERROR'	=> 'File extension error.',
+	'PLUPLOAD_FILENAME'			=> 'Filename',
+	'PLUPLOAD_FILES_QUEUED'		=> '%d files queued',
+	'PLUPLOAD_GENERIC_ERROR'	=> 'Generic error.',
+	'PLUPLOAD_HTTP_ERROR'		=> 'HTTP error.',
+	'PLUPLOAD_INIT_ERROR'		=> 'Init error.',
+	'PLUPLOAD_IO_ERROR'			=> 'IO error.',
+	'PLUPLOAD_NOT_APPLICABLE'	=> 'N/A',
+	'PLUPLOAD_SECURITY_ERROR'	=> 'Security error.',
+	'PLUPLOAD_SELECT_FILES'		=> 'Select files',
+	'PLUPLOAD_SIZE'				=> 'Size',
+	'PLUPLOAD_SIZE_ERROR'		=> 'File size error.',
+	'PLUPLOAD_STATUS'			=> 'Status',
+	'PLUPLOAD_START_UPLOAD'		=> 'Start upload',
+	'PLUPLOAD_START_CURRENT_UPLOAD'	=> 'Start uploading queue',
+	'PLUPLOAD_STOP_UPLOAD'		=> 'Stop upload',
+	'PLUPLOAD_STOP_CURRENT_UPLOAD'	=> 'Stop current upload',
+	// Note: This string is formatted independently by plupload and so does not
+	// use the same formatting rules as normal phpBB translation strings
+	'PLUPLOAD_UPLOADED'			=> 'Uploaded %d/%d files',
+));
-- 
cgit v1.2.1


From 9363986f43aeb6ff6b5f9627eb42aee1ea2eaf57 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 15 Oct 2013 10:27:00 -0700
Subject: [ticket/11921] Improve appearance of Notifications in linklist

PHPBB3-11921
---
 phpBB/language/en/common.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index e5c0478d98..d04fe96d97 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -417,11 +417,7 @@ $lang = array_merge($lang, array(
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
 	'NOTIFICATIONS'				=> 'Notifications',
-	'NOTIFICATIONS_COUNT'		=> array(
-		0	=> '%d Notifications',
-		1	=> '<strong>%d</strong> Notification',
-		2	=> '<strong>%d</strong> Notifications',
-	),
+	'NOTIFICATIONS_COUNT'		=> 'Notifications (<strong>%d</strong>)',
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
 	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group %2$s.',
 	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> 'Your request to join the group %1$s has been approved.',
-- 
cgit v1.2.1


From 86082040975ca453edb3871febce74517c676084 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 15 Oct 2013 10:29:15 -0700
Subject: [ticket/11921] Improve appearance of PM notifications in linklist

PHPBB3-11921
---
 phpBB/language/en/common.php | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index d04fe96d97..3afbc426aa 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -401,10 +401,6 @@ $lang = array_merge($lang, array(
 	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
 	'NEW_MESSAGE'				=> 'New message',
 	'NEW_MESSAGES'				=> 'New messages',
-	'NEW_PMS'					=> array(
-		1	=> '<strong>%d</strong> new message',
-		2	=> '<strong>%d</strong> new messages',
-	),
 	'NEW_POST'					=> 'New post',	// Not used anymore
 	'NEW_POSTS'					=> 'New posts',	// Not used anymore
 	'NEXT'						=> 'Next',		// Used in pagination
@@ -753,10 +749,6 @@ $lang = array_merge($lang, array(
 	'UNKNOWN_BROWSER'		=> 'Unknown browser',
 	'UNMARK_ALL'			=> 'Unmark all',
 	'UNREAD_MESSAGES'		=> 'Unread messages',
-	'UNREAD_PMS'			=> array(
-		1	=> '<strong>%d</strong> unread message',
-		2	=> '<strong>%d</strong> unread messages',
-	),
 	'UNREAD_POST'			=> 'Unread post',
 	'UNREAD_POSTS'			=> 'Unread posts',
 	'UNWATCH_FORUM_CONFIRM'		=> 'Are you sure you wish to unsubscribe from this forum?',
-- 
cgit v1.2.1


From 2867831232e8c4cb2e556b7fd157a9e0111fa696 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 16 Oct 2013 09:43:45 -0700
Subject: [ticket/11921] Move any HTML for Notifications to the templates
 PHPBB3-11921

---
 phpBB/language/en/common.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 3afbc426aa..bb1c4698ec 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -413,7 +413,6 @@ $lang = array_merge($lang, array(
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
 	'NOTIFICATIONS'				=> 'Notifications',
-	'NOTIFICATIONS_COUNT'		=> 'Notifications (<strong>%d</strong>)',
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
 	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group %2$s.',
 	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> 'Your request to join the group %1$s has been approved.',
-- 
cgit v1.2.1


From 6fce4b44a8daaad76e9f819c69699d78d1d763b4 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 19 Oct 2013 08:47:12 -0700
Subject: [ticket/11935] Fix <p> tags not allowed inside <strong> tags

PHPBB3-11935
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 0adaff10c8..369397ead2 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -39,7 +39,7 @@ $lang = array_merge($lang, array(
 	'EXTENSIONS'				=> 'Extensions',
 	'EXTENSIONS_ADMIN'			=> 'Extensions Manager',
 	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.',
-	'EXTENSION_INVALID_LIST'	=> 'The "%s" extension is not valid.<br /><p>%s</p>',
+	'EXTENSION_INVALID_LIST'	=> 'The "%s" extension is not valid.<br />%s<br /><br />',
 	'EXTENSION_NOT_AVAILABLE'	=> 'The selected extension is not available for this board, please verify your phpBB and PHP versions are allowed (see the details page).',
 
 	'DETAILS'				=> 'Details',
-- 
cgit v1.2.1


From d607f1c927ed6fb54d6c46eb13b5bcd4133f8cfc Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 24 Oct 2013 02:37:20 -0700
Subject: [ticket/11746] Add "admin activation required" notification.

PHPBB3-11746
---
 phpBB/language/en/common.php | 1 +
 phpBB/language/en/ucp.php    | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index bb1c4698ec..1d75c6ea0d 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -430,6 +430,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved for reason: "%2$s".',
 	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by %1$s and needs approval.',
 	'NOTIFICATION_TYPE_NOT_EXIST'		=> 'The notification type "%s" is missing from the file system.',
+	'NOTIFICATION_ADMIN_ACTIVATE_USER'	=> 'The user “%1$s” is newly registered and requires activation.',
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
 	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 2f4d35a5b4..161ec6c67f 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -312,6 +312,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATIONS_MARK_ALL_READ_SUCCESS'				=> 'All notifications have been marked read.',
 	'NOTIFICATION_GROUP_MISCELLANEOUS'					=> 'Miscellaneous Notifications',
 	'NOTIFICATION_GROUP_MODERATION'						=> 'Moderation Notifications',
+	'NOTIFICATION_GROUP_ADMINISTRATION'					=> 'Administration Notifications',
 	'NOTIFICATION_GROUP_POSTING'						=> 'Posting Notifications',
 	'NOTIFICATION_METHOD_EMAIL'							=> 'Email',
 	'NOTIFICATION_METHOD_JABBER'						=> 'Jabber',
@@ -325,6 +326,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TYPE_QUOTE'							=> 'Someone quotes you in a post',
 	'NOTIFICATION_TYPE_REPORT'							=> 'Someone reports a post',
 	'NOTIFICATION_TYPE_TOPIC'				   			=> 'Someone creates a topic in a forum to which you are subscribed',
+	'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER'				=> 'New registered user requiring activation',
 
 	'NOTIFY_METHOD'					=> 'Notification method',
 	'NOTIFY_METHOD_BOTH'			=> 'Both',
-- 
cgit v1.2.1


From 23954ac1b83f4cb778af9921ec85265d90c574f6 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 25 Oct 2013 14:17:51 +0300
Subject: [ticket/11969] New language strings for first and last post links

PHPBB3-11969
---
 phpBB/language/en/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index bb1c4698ec..1680f5f6ff 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -279,6 +279,8 @@ $lang = array_merge($lang, array(
 	'GB'						=> 'GB',
 	'GIB'						=> 'GiB',
 	'GO'						=> 'Go',
+	'GOTO_FIRST_POST'			=> 'Go to first post',
+	'GOTO_LAST_POST'			=> 'Go to last post',
 	'GOTO_PAGE'					=> 'Go to page',
 	'GROUP'						=> 'Group',
 	'GROUPS'					=> 'Groups',
-- 
cgit v1.2.1


From c5fc8c43cbca82d2a064859828950477cfd5d767 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 26 Oct 2013 01:01:08 -0700
Subject: [ticket/11746] Delete the notification after user is approved & fix
 language.

PHPBB3-11746
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 161ec6c67f..9a5713e1cd 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -326,7 +326,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TYPE_QUOTE'							=> 'Someone quotes you in a post',
 	'NOTIFICATION_TYPE_REPORT'							=> 'Someone reports a post',
 	'NOTIFICATION_TYPE_TOPIC'				   			=> 'Someone creates a topic in a forum to which you are subscribed',
-	'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER'				=> 'New registered user requiring activation',
+	'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER'				=> 'Newly registered user requiring activation',
 
 	'NOTIFY_METHOD'					=> 'Notification method',
 	'NOTIFY_METHOD_BOTH'			=> 'Both',
-- 
cgit v1.2.1


From 2086db0d7ab87aa5e71366cf36ca6344fdd9bd29 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 26 Oct 2013 10:33:02 +0200
Subject: [ticket/11974] Translate all timezones

PHPBB3-11974
---
 phpBB/language/en/common.php | 432 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 432 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index bb1c4698ec..bfaf986c4d 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -893,6 +893,8 @@ $lang = array_merge($lang, array(
 	// Timezones can be translated. We use this for the Etc/GMT timezones here,
 	// because they are named invers to their offset.
 	'timezones'		=> array(
+		'UTC'			=> 'UTC',
+
 		'Etc/GMT-12'	=> 'GMT+12',
 		'Etc/GMT-11'	=> 'GMT+11',
 		'Etc/GMT-10'	=> 'GMT+10',
@@ -917,6 +919,436 @@ $lang = array_merge($lang, array(
 		'Etc/GMT+10'	=> 'GMT-10',
 		'Etc/GMT+11'	=> 'GMT-11',
 		'Etc/GMT+12'	=> 'GMT-12',
+
+		'Africa/Abidjan'	=> 'Africa/Abidjan',
+		'Africa/Accra'		=> 'Africa/Accra',
+		'Africa/Addis_Ababa'	=> 'Africa/Addis_Ababa',
+		'Africa/Algiers'	=> 'Africa/Algiers',
+		'Africa/Asmara'		=> 'Africa/Asmara',
+		'Africa/Bamako'		=> 'Africa/Bamako',
+		'Africa/Bangui'		=> 'Africa/Bangui',
+		'Africa/Banjul'		=> 'Africa/Banjul',
+		'Africa/Bissau'		=> 'Africa/Bissau',
+		'Africa/Blantyre'	=> 'Africa/Blantyre',
+		'Africa/Brazzaville'	=> 'Africa/Brazzaville',
+		'Africa/Bujumbura'	=> 'Africa/Bujumbura',
+		'Africa/Cairo'		=> 'Africa/Cairo',
+		'Africa/Casablanca'	=> 'Africa/Casablanca',
+		'Africa/Ceuta'		=> 'Africa/Ceuta',
+		'Africa/Conakry'	=> 'Africa/Conakry',
+		'Africa/Dakar'		=> 'Africa/Dakar',
+		'Africa/Dar_es_Salaam'	=> 'Africa/Dar_es_Salaam',
+		'Africa/Djibouti'	=> 'Africa/Djibouti',
+		'Africa/Douala'		=> 'Africa/Douala',
+		'Africa/El_Aaiun'	=> 'Africa/El_Aaiun',
+		'Africa/Freetown'	=> 'Africa/Freetown',
+		'Africa/Gaborone'	=> 'Africa/Gaborone',
+		'Africa/Harare'		=> 'Africa/Harare',
+		'Africa/Johannesburg'	=> 'Africa/Johannesburg',
+		'Africa/Juba'		=> 'Africa/Juba',
+		'Africa/Kampala'	=> 'Africa/Kampala',
+		'Africa/Khartoum'	=> 'Africa/Khartoum',
+		'Africa/Kigali'		=> 'Africa/Kigali',
+		'Africa/Kinshasa'	=> 'Africa/Kinshasa',
+		'Africa/Lagos'		=> 'Africa/Lagos',
+		'Africa/Libreville'	=> 'Africa/Libreville',
+		'Africa/Lome'		=> 'Africa/Lome',
+		'Africa/Luanda'		=> 'Africa/Luanda',
+		'Africa/Lubumbashi'	=> 'Africa/Lubumbashi',
+		'Africa/Lusaka'		=> 'Africa/Lusaka',
+		'Africa/Malabo'		=> 'Africa/Malabo',
+		'Africa/Maputo'		=> 'Africa/Maputo',
+		'Africa/Maseru'		=> 'Africa/Maseru',
+		'Africa/Mbabane'	=> 'Africa/Mbabane',
+		'Africa/Mogadishu'	=> 'Africa/Mogadishu',
+		'Africa/Monrovia'	=> 'Africa/Monrovia',
+		'Africa/Nairobi'	=> 'Africa/Nairobi',
+		'Africa/Ndjamena'	=> 'Africa/Ndjamena',
+		'Africa/Niamey'		=> 'Africa/Niamey',
+		'Africa/Nouakchott'	=> 'Africa/Nouakchott',
+		'Africa/Ouagadougou'	=> 'Africa/Ouagadougou',
+		'Africa/Porto-Novo'	=> 'Africa/Porto-Novo',
+		'Africa/Sao_Tome'	=> 'Africa/Sao_Tome',
+		'Africa/Tripoli'	=> 'Africa/Tripoli',
+		'Africa/Tunis'		=> 'Africa/Tunis',
+		'Africa/Windhoek'	=> 'Africa/Windhoek',
+
+		'America/Adak'		=> 'America/Adak',
+		'America/Anchorage'	=> 'America/Anchorage',
+		'America/Anguilla'	=> 'America/Anguilla',
+		'America/Antigua'	=> 'America/Antigua',
+		'America/Araguaina'	=> 'America/Araguaina',
+
+		'America/Argentina/Buenos_Aires'	=> 'America/Argentina/Buenos_Aires',
+		'America/Argentina/Catamarca'	=> 'America/Argentina/Catamarca',
+		'America/Argentina/Cordoba'		=> 'America/Argentina/Cordoba',
+		'America/Argentina/Jujuy'		=> 'America/Argentina/Jujuy',
+		'America/Argentina/La_Rioja'	=> 'America/Argentina/La_Rioja',
+		'America/Argentina/Mendoza'		=> 'America/Argentina/Mendoza',
+		'America/Argentina/Rio_Gallegos'	=> 'America/Argentina/Rio_Gallegos',
+		'America/Argentina/Salta'		=> 'America/Argentina/Salta',
+		'America/Argentina/San_Juan'	=> 'America/Argentina/San_Juan',
+		'America/Argentina/San_Luis'	=> 'America/Argentina/San_Luis',
+		'America/Argentina/Tucuman'		=> 'America/Argentina/Tucuman',
+		'America/Argentina/Ushuaia'		=> 'America/Argentina/Ushuaia',
+
+		'America/Aruba'			=> 'America/Aruba',
+		'America/Asuncion'		=> 'America/Asuncion',
+		'America/Atikokan'		=> 'America/Atikokan',
+		'America/Bahia'			=> 'America/Bahia',
+		'America/Bahia_Banderas'	=> 'America/Bahia_Banderas',
+		'America/Barbados'		=> 'America/Barbados',
+		'America/Belem'			=> 'America/Belem',
+		'America/Belize'		=> 'America/Belize',
+		'America/Blanc-Sablon'	=> 'America/Blanc-Sablon',
+		'America/Boa_Vista'		=> 'America/Boa_Vista',
+		'America/Bogota'		=> 'America/Bogota',
+		'America/Boise'			=> 'America/Boise',
+		'America/Cambridge_Bay'	=> 'America/Cambridge_Bay',
+		'America/Campo_Grande'	=> 'America/Campo_Grande',
+		'America/Cancun'		=> 'America/Cancun',
+		'America/Caracas'		=> 'America/Caracas',
+		'America/Cayenne'		=> 'America/Cayenne',
+		'America/Cayman'		=> 'America/Cayman',
+		'America/Chicago'		=> 'America/Chicago',
+		'America/Chihuahua'		=> 'America/Chihuahua',
+		'America/Costa_Rica'	=> 'America/Costa_Rica',
+		'America/Creston'		=> 'America/Creston',
+		'America/Cuiaba'		=> 'America/Cuiaba',
+		'America/Curacao'		=> 'America/Curacao',
+		'America/Danmarkshavn'	=> 'America/Danmarkshavn',
+		'America/Dawson'		=> 'America/Dawson',
+		'America/Dawson_Creek'	=> 'America/Dawson_Creek',
+		'America/Denver'		=> 'America/Denver',
+		'America/Detroit'		=> 'America/Detroit',
+		'America/Dominica'		=> 'America/Dominica',
+		'America/Edmonton'		=> 'America/Edmonton',
+		'America/Eirunepe'		=> 'America/Eirunepe',
+		'America/El_Salvador'	=> 'America/El_Salvador',
+		'America/Fortaleza'		=> 'America/Fortaleza',
+		'America/Glace_Bay'		=> 'America/Glace_Bay',
+		'America/Godthab'		=> 'America/Godthab',
+		'America/Goose_Bay'		=> 'America/Goose_Bay',
+		'America/Grand_Turk'	=> 'America/Grand_Turk',
+		'America/Grenada'		=> 'America/Grenada',
+		'America/Guadeloupe'	=> 'America/Guadeloupe',
+		'America/Guatemala'		=> 'America/Guatemala',
+		'America/Guayaquil'		=> 'America/Guayaquil',
+		'America/Guyana'		=> 'America/Guyana',
+		'America/Halifax'		=> 'America/Halifax',
+		'America/Havana'		=> 'America/Havana',
+		'America/Hermosillo'		=> 'America/Hermosillo',
+		'America/Indiana/Indianapolis'	=> 'America/Indiana/Indianapolis',
+		'America/Indiana/Knox'		=> 'America/Indiana/Knox',
+		'America/Indiana/Marengo'	=> 'America/Indiana/Marengo',
+		'America/Indiana/Petersburg'	=> 'America/Indiana/Petersburg',
+		'America/Indiana/Tell_City'	=> 'America/Indiana/Tell_City',
+		'America/Indiana/Vevay'		=> 'America/Indiana/Vevay',
+		'America/Indiana/Vincennes'	=> 'America/Indiana/Vincennes',
+		'America/Indiana/Winamac'	=> 'America/Indiana/Winamac',
+		'America/Inuvik'		=> 'America/Inuvik',
+		'America/Iqaluit'		=> 'America/Iqaluit',
+		'America/Jamaica'		=> 'America/Jamaica',
+		'America/Juneau'		=> 'America/Juneau',
+		'America/Kentucky/Louisville'	=> 'America/Kentucky/Louisville',
+		'America/Kentucky/Monticello'	=> 'America/Kentucky/Monticello',
+		'America/Kralendijk'	=> 'America/Kralendijk',
+		'America/La_Paz'		=> 'America/La_Paz',
+		'America/Lima'			=> 'America/Lima',
+		'America/Los_Angeles'	=> 'America/Los_Angeles',
+		'America/Lower_Princes'	=> 'America/Lower_Princes',
+		'America/Maceio'		=> 'America/Maceio',
+		'America/Managua'		=> 'America/Managua',
+		'America/Manaus'		=> 'America/Manaus',
+		'America/Marigot'		=> 'America/Marigot',
+		'America/Martinique'	=> 'America/Martinique',
+		'America/Matamoros'		=> 'America/Matamoros',
+		'America/Mazatlan'		=> 'America/Mazatlan',
+		'America/Menominee'		=> 'America/Menominee',
+		'America/Merida'		=> 'America/Merida',
+		'America/Metlakatla'	=> 'America/Metlakatla',
+		'America/Mexico_City'	=> 'America/Mexico_City',
+		'America/Miquelon'		=> 'America/Miquelon',
+		'America/Moncton'		=> 'America/Moncton',
+		'America/Monterrey'		=> 'America/Monterrey',
+		'America/Montevideo'	=> 'America/Montevideo',
+		'America/Montreal'		=> 'America/Montreal',
+		'America/Montserrat'	=> 'America/Montserrat',
+		'America/Nassau'		=> 'America/Nassau',
+		'America/New_York'		=> 'America/New_York',
+		'America/Nipigon'		=> 'America/Nipigon',
+		'America/Nome'			=> 'America/Nome',
+		'America/Noronha'		=> 'America/Noronha',
+		'America/North_Dakota/Beulah'		=> 'America/North_Dakota/Beulah',
+		'America/North_Dakota/Center'		=> 'America/North_Dakota/Center',
+		'America/North_Dakota/New_Salem'	=> 'America/North_Dakota/New_Salem',
+		'America/Ojinaga'		=> 'America/Ojinaga',
+		'America/Panama'		=> 'America/Panama',
+		'America/Pangnirtung'	=> 'America/Pangnirtung',
+		'America/Paramaribo'	=> 'America/Paramaribo',
+		'America/Phoenix'		=> 'America/Phoenix',
+		'America/Port-au-Prince'	=> 'America/Port-au-Prince',
+		'America/Port_of_Spain'	=> 'America/Port_of_Spain',
+		'America/Porto_Velho'	=> 'America/Porto_Velho',
+		'America/Puerto_Rico'	=> 'America/Puerto_Rico',
+		'America/Rainy_River'	=> 'America/Rainy_River',
+		'America/Rankin_Inlet'	=> 'America/Rankin_Inlet',
+		'America/Recife'		=> 'America/Recife',
+		'America/Regina'		=> 'America/Regina',
+		'America/Resolute'		=> 'America/Resolute',
+		'America/Rio_Branco'	=> 'America/Rio_Branco',
+		'America/Santa_Isabel'	=> 'America/Santa_Isabel',
+		'America/Santarem'		=> 'America/Santarem',
+		'America/Santiago'		=> 'America/Santiago',
+		'America/Santo_Domingo'	=> 'America/Santo_Domingo',
+		'America/Sao_Paulo'		=> 'America/Sao_Paulo',
+		'America/Scoresbysund'	=> 'America/Scoresbysund',
+		'America/Shiprock'		=> 'America/Shiprock',
+		'America/Sitka'			=> 'America/Sitka',
+		'America/St_Barthelemy'	=> 'America/St_Barthelemy',
+		'America/St_Johns'		=> 'America/St_Johns',
+		'America/St_Kitts'		=> 'America/St_Kitts',
+		'America/St_Lucia'		=> 'America/St_Lucia',
+		'America/St_Thomas'		=> 'America/St_Thomas',
+		'America/St_Vincent'	=> 'America/St_Vincent',
+		'America/Swift_Current'	=> 'America/Swift_Current',
+		'America/Tegucigalpa'	=> 'America/Tegucigalpa',
+		'America/Thule'			=> 'America/Thule',
+		'America/Thunder_Bay'	=> 'America/Thunder_Bay',
+		'America/Tijuana'		=> 'America/Tijuana',
+		'America/Toronto'		=> 'America/Toronto',
+		'America/Tortola'		=> 'America/Tortola',
+		'America/Vancouver'		=> 'America/Vancouver',
+		'America/Whitehorse'	=> 'America/Whitehorse',
+		'America/Winnipeg'		=> 'America/Winnipeg',
+		'America/Yakutat'		=> 'America/Yakutat',
+		'America/Yellowknife'	=> 'America/Yellowknife',
+
+		'Antarctica/Casey'		=> 'Antarctica/Casey',
+		'Antarctica/Davis'		=> 'Antarctica/Davis',
+		'Antarctica/DumontDUrville'	=> 'Antarctica/DumontDUrville',
+		'Antarctica/Macquarie'	=> 'Antarctica/Macquarie',
+		'Antarctica/Mawson'		=> 'Antarctica/Mawson',
+		'Antarctica/McMurdo'	=> 'Antarctica/McMurdo',
+		'Antarctica/Palmer'		=> 'Antarctica/Palmer',
+		'Antarctica/Rothera'	=> 'Antarctica/Rothera',
+		'Antarctica/South_Pole'	=> 'Antarctica/South_Pole',
+		'Antarctica/Syowa'		=> 'Antarctica/Syowa',
+		'Antarctica/Vostok'		=> 'Antarctica/Vostok',
+
+		'Arctic/Longyearbyen'	=> 'Arctic/Longyearbyen',
+
+		'Asia/Aden'			=> 'Asia/Aden',
+		'Asia/Almaty'		=> 'Asia/Almaty',
+		'Asia/Amman'		=> 'Asia/Amman',
+		'Asia/Anadyr'		=> 'Asia/Anadyr',
+		'Asia/Aqtau'		=> 'Asia/Aqtau',
+		'Asia/Aqtobe'		=> 'Asia/Aqtobe',
+		'Asia/Ashgabat'		=> 'Asia/Ashgabat',
+		'Asia/Baghdad'		=> 'Asia/Baghdad',
+		'Asia/Bahrain'		=> 'Asia/Bahrain',
+		'Asia/Baku'			=> 'Asia/Baku',
+		'Asia/Bangkok'		=> 'Asia/Bangkok',
+		'Asia/Beirut'		=> 'Asia/Beirut',
+		'Asia/Bishkek'		=> 'Asia/Bishkek',
+		'Asia/Brunei'		=> 'Asia/Brunei',
+		'Asia/Choibalsan'	=> 'Asia/Choibalsan',
+		'Asia/Chongqing'	=> 'Asia/Chongqing',
+		'Asia/Colombo'		=> 'Asia/Colombo',
+		'Asia/Damascus'		=> 'Asia/Damascus',
+		'Asia/Dhaka'		=> 'Asia/Dhaka',
+		'Asia/Dili'			=> 'Asia/Dili',
+		'Asia/Dubai'		=> 'Asia/Dubai',
+		'Asia/Dushanbe'		=> 'Asia/Dushanbe',
+		'Asia/Gaza'			=> 'Asia/Gaza',
+		'Asia/Harbin'		=> 'Asia/Harbin',
+		'Asia/Hebron'		=> 'Asia/Hebron',
+		'Asia/Ho_Chi_Minh'	=> 'Asia/Ho_Chi_Minh',
+		'Asia/Hong_Kong'	=> 'Asia/Hong_Kong',
+		'Asia/Hovd'			=> 'Asia/Hovd',
+		'Asia/Irkutsk'		=> 'Asia/Irkutsk',
+		'Asia/Jakarta'		=> 'Asia/Jakarta',
+		'Asia/Jayapura'		=> 'Asia/Jayapura',
+		'Asia/Jerusalem'	=> 'Asia/Jerusalem',
+		'Asia/Kabul'		=> 'Asia/Kabul',
+		'Asia/Kamchatka'	=> 'Asia/Kamchatka',
+		'Asia/Karachi'		=> 'Asia/Karachi',
+		'Asia/Kashgar'		=> 'Asia/Kashgar',
+		'Asia/Kathmandu'	=> 'Asia/Kathmandu',
+		'Asia/Khandyga'		=> 'Asia/Khandyga',
+		'Asia/Kolkata'		=> 'Asia/Kolkata',
+		'Asia/Krasnoyarsk'	=> 'Asia/Krasnoyarsk',
+		'Asia/Kuala_Lumpur'	=> 'Asia/Kuala_Lumpur',
+		'Asia/Kuching'		=> 'Asia/Kuching',
+		'Asia/Kuwait'		=> 'Asia/Kuwait',
+		'Asia/Macau'		=> 'Asia/Macau',
+		'Asia/Magadan'		=> 'Asia/Magadan',
+		'Asia/Makassar'		=> 'Asia/Makassar',
+		'Asia/Manila'		=> 'Asia/Manila',
+		'Asia/Muscat'		=> 'Asia/Muscat',
+		'Asia/Nicosia'		=> 'Asia/Nicosia',
+		'Asia/Novokuznetsk'	=> 'Asia/Novokuznetsk',
+		'Asia/Novosibirsk'	=> 'Asia/Novosibirsk',
+		'Asia/Omsk'			=> 'Asia/Omsk',
+		'Asia/Oral'			=> 'Asia/Oral',
+		'Asia/Phnom_Penh'	=> 'Asia/Phnom_Penh',
+		'Asia/Pontianak'	=> 'Asia/Pontianak',
+		'Asia/Pyongyang'	=> 'Asia/Pyongyang',
+		'Asia/Qatar'		=> 'Asia/Qatar',
+		'Asia/Qyzylorda'	=> 'Asia/Qyzylorda',
+		'Asia/Rangoon'		=> 'Asia/Rangoon',
+		'Asia/Riyadh'		=> 'Asia/Riyadh',
+		'Asia/Sakhalin'		=> 'Asia/Sakhalin',
+		'Asia/Samarkand'	=> 'Asia/Samarkand',
+		'Asia/Seoul'		=> 'Asia/Seoul',
+		'Asia/Shanghai'		=> 'Asia/Shanghai',
+		'Asia/Singapore'	=> 'Asia/Singapore',
+		'Asia/Taipei'		=> 'Asia/Taipei',
+		'Asia/Tashkent'		=> 'Asia/Tashkent',
+		'Asia/Tbilisi'		=> 'Asia/Tbilisi',
+		'Asia/Tehran'		=> 'Asia/Tehran',
+		'Asia/Thimphu'		=> 'Asia/Thimphu',
+		'Asia/Tokyo'		=> 'Asia/Tokyo',
+		'Asia/Ulaanbaatar'	=> 'Asia/Ulaanbaatar',
+		'Asia/Urumqi'		=> 'Asia/Urumqi',
+		'Asia/Ust-Nera'		=> 'Asia/Ust-Nera',
+		'Asia/Vientiane'	=> 'Asia/Vientiane',
+		'Asia/Vladivostok'	=> 'Asia/Vladivostok',
+		'Asia/Yakutsk'		=> 'Asia/Yakutsk',
+		'Asia/Yekaterinburg'	=> 'Asia/Yekaterinburg',
+		'Asia/Yerevan'		=> 'Asia/Yerevan',
+
+		'Atlantic/Azores'		=> 'Atlantic/Azores',
+		'Atlantic/Bermuda'		=> 'Atlantic/Bermuda',
+		'Atlantic/Canary'		=> 'Atlantic/Canary',
+		'Atlantic/Cape_Verde'	=> 'Atlantic/Cape_Verde',
+		'Atlantic/Faroe'		=> 'Atlantic/Faroe',
+		'Atlantic/Madeira'		=> 'Atlantic/Madeira',
+		'Atlantic/Reykjavik'	=> 'Atlantic/Reykjavik',
+		'Atlantic/South_Georgia'	=> 'Atlantic/South_Georgia',
+		'Atlantic/St_Helena'	=> 'Atlantic/St_Helena',
+		'Atlantic/Stanley'		=> 'Atlantic/Stanley',
+
+		'Australia/Adelaide'	=> 'Australia/Adelaide',
+		'Australia/Brisbane'	=> 'Australia/Brisbane',
+		'Australia/Broken_Hill'	=> 'Australia/Broken_Hill',
+		'Australia/Currie'		=> 'Australia/Currie',
+		'Australia/Darwin'		=> 'Australia/Darwin',
+		'Australia/Eucla'		=> 'Australia/Eucla',
+		'Australia/Hobart'		=> 'Australia/Hobart',
+		'Australia/Lindeman'	=> 'Australia/Lindeman',
+		'Australia/Lord_Howe'	=> 'Australia/Lord_Howe',
+		'Australia/Melbourne'	=> 'Australia/Melbourne',
+		'Australia/Perth'		=> 'Australia/Perth',
+		'Australia/Sydney'		=> 'Australia/Sydney',
+
+		'Europe/Amsterdam'	=> 'Europe/Amsterdam',
+		'Europe/Andorra'	=> 'Europe/Andorra',
+		'Europe/Athens'		=> 'Europe/Athens',
+		'Europe/Belgrade'	=> 'Europe/Belgrade',
+		'Europe/Berlin'		=> 'Europe/Berlin',
+		'Europe/Bratislava'	=> 'Europe/Bratislava',
+		'Europe/Brussels'	=> 'Europe/Brussels',
+		'Europe/Bucharest'	=> 'Europe/Bucharest',
+		'Europe/Budapest'	=> 'Europe/Budapest',
+		'Europe/Busingen'	=> 'Europe/Busingen',
+		'Europe/Chisinau'	=> 'Europe/Chisinau',
+		'Europe/Copenhagen'	=> 'Europe/Copenhagen',
+		'Europe/Dublin'		=> 'Europe/Dublin',
+		'Europe/Gibraltar'	=> 'Europe/Gibraltar',
+		'Europe/Guernsey'	=> 'Europe/Guernsey',
+		'Europe/Helsinki'	=> 'Europe/Helsinki',
+		'Europe/Isle_of_Man'	=> 'Europe/Isle_of_Man',
+		'Europe/Istanbul'	=> 'Europe/Istanbul',
+		'Europe/Jersey'		=> 'Europe/Jersey',
+		'Europe/Kaliningrad'	=> 'Europe/Kaliningrad',
+		'Europe/Kiev'		=> 'Europe/Kiev',
+		'Europe/Lisbon'		=> 'Europe/Lisbon',
+		'Europe/Ljubljana'	=> 'Europe/Ljubljana',
+		'Europe/London'		=> 'Europe/London',
+		'Europe/Luxembourg'	=> 'Europe/Luxembourg',
+		'Europe/Madrid'		=> 'Europe/Madrid',
+		'Europe/Malta'		=> 'Europe/Malta',
+		'Europe/Mariehamn'	=> 'Europe/Mariehamn',
+		'Europe/Minsk'		=> 'Europe/Minsk',
+		'Europe/Monaco'		=> 'Europe/Monaco',
+		'Europe/Moscow'		=> 'Europe/Moscow',
+		'Europe/Oslo'		=> 'Europe/Oslo',
+		'Europe/Paris'		=> 'Europe/Paris',
+		'Europe/Podgorica'	=> 'Europe/Podgorica',
+		'Europe/Prague'		=> 'Europe/Prague',
+		'Europe/Riga'		=> 'Europe/Riga',
+		'Europe/Rome'		=> 'Europe/Rome',
+		'Europe/Samara'		=> 'Europe/Samara',
+		'Europe/San_Marino'	=> 'Europe/San_Marino',
+		'Europe/Sarajevo'	=> 'Europe/Sarajevo',
+		'Europe/Simferopol'	=> 'Europe/Simferopol',
+		'Europe/Skopje'		=> 'Europe/Skopje',
+		'Europe/Sofia'		=> 'Europe/Sofia',
+		'Europe/Stockholm'	=> 'Europe/Stockholm',
+		'Europe/Tallinn'	=> 'Europe/Tallinn',
+		'Europe/Tirane'		=> 'Europe/Tirane',
+		'Europe/Uzhgorod'	=> 'Europe/Uzhgorod',
+		'Europe/Vaduz'		=> 'Europe/Vaduz',
+		'Europe/Vatican'	=> 'Europe/Vatican',
+		'Europe/Vienna'		=> 'Europe/Vienna',
+		'Europe/Vilnius'	=> 'Europe/Vilnius',
+		'Europe/Volgograd'	=> 'Europe/Volgograd',
+		'Europe/Warsaw'		=> 'Europe/Warsaw',
+		'Europe/Zagreb'		=> 'Europe/Zagreb',
+		'Europe/Zaporozhye'	=> 'Europe/Zaporozhye',
+		'Europe/Zurich'		=> 'Europe/Zurich',
+
+		'Indian/Antananarivo'	=> 'Indian/Antananarivo',
+		'Indian/Chagos'		=> 'Indian/Chagos',
+		'Indian/Christmas'	=> 'Indian/Christmas',
+		'Indian/Cocos'		=> 'Indian/Cocos',
+		'Indian/Comoro'		=> 'Indian/Comoro',
+		'Indian/Kerguelen'	=> 'Indian/Kerguelen',
+		'Indian/Mahe'		=> 'Indian/Mahe',
+		'Indian/Maldives'	=> 'Indian/Maldives',
+		'Indian/Mauritius'	=> 'Indian/Mauritius',
+		'Indian/Mayotte'	=> 'Indian/Mayotte',
+		'Indian/Reunion'	=> 'Indian/Reunion',
+
+		'Pacific/Apia'		=> 'Pacific/Apia',
+		'Pacific/Auckland'	=> 'Pacific/Auckland',
+		'Pacific/Chatham'	=> 'Pacific/Chatham',
+		'Pacific/Chuuk'		=> 'Pacific/Chuuk',
+		'Pacific/Easter'	=> 'Pacific/Easter',
+		'Pacific/Efate'		=> 'Pacific/Efate',
+		'Pacific/Enderbury'	=> 'Pacific/Enderbury',
+		'Pacific/Fakaofo'	=> 'Pacific/Fakaofo',
+		'Pacific/Fiji'		=> 'Pacific/Fiji',
+		'Pacific/Funafuti'	=> 'Pacific/Funafuti',
+		'Pacific/Galapagos'	=> 'Pacific/Galapagos',
+		'Pacific/Gambier'	=> 'Pacific/Gambier',
+		'Pacific/Guadalcanal'	=> 'Pacific/Guadalcanal',
+		'Pacific/Guam'		=> 'Pacific/Guam',
+		'Pacific/Honolulu'	=> 'Pacific/Honolulu',
+		'Pacific/Johnston'	=> 'Pacific/Johnston',
+		'Pacific/Kiritimati'	=> 'Pacific/Kiritimati',
+		'Pacific/Kosrae'	=> 'Pacific/Kosrae',
+		'Pacific/Kwajalein'	=> 'Pacific/Kwajalein',
+		'Pacific/Majuro'	=> 'Pacific/Majuro',
+		'Pacific/Marquesas'	=> 'Pacific/Marquesas',
+		'Pacific/Midway'	=> 'Pacific/Midway',
+		'Pacific/Nauru'		=> 'Pacific/Nauru',
+		'Pacific/Niue'		=> 'Pacific/Niue',
+		'Pacific/Norfolk'	=> 'Pacific/Norfolk',
+		'Pacific/Noumea'	=> 'Pacific/Noumea',
+		'Pacific/Pago_Pago'	=> 'Pacific/Pago_Pago',
+		'Pacific/Palau'		=> 'Pacific/Palau',
+		'Pacific/Pitcairn'	=> 'Pacific/Pitcairn',
+		'Pacific/Pohnpei'	=> 'Pacific/Pohnpei',
+		'Pacific/Port_Moresby'	=> 'Pacific/Port_Moresby',
+		'Pacific/Rarotonga'	=> 'Pacific/Rarotonga',
+		'Pacific/Saipan'	=> 'Pacific/Saipan',
+		'Pacific/Tahiti'	=> 'Pacific/Tahiti',
+		'Pacific/Tarawa'	=> 'Pacific/Tarawa',
+		'Pacific/Tongatapu'	=> 'Pacific/Tongatapu',
+		'Pacific/Wake'		=> 'Pacific/Wake',
+		'Pacific/Wallis'	=> 'Pacific/Wallis',
 	),
 
 	// The value is only an example and will get replaced by the current time on view
-- 
cgit v1.2.1


From ce487aad09a617a66f5e92fa64deacbc3ff76e51 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 27 Oct 2013 00:48:23 +0200
Subject: [ticket/11974] Fix timezone names with underscores

PHPBB3-11974
---
 phpBB/language/en/common.php | 118 +++++++++++++++++++++----------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index bfaf986c4d..f26ca59764 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -922,7 +922,7 @@ $lang = array_merge($lang, array(
 
 		'Africa/Abidjan'	=> 'Africa/Abidjan',
 		'Africa/Accra'		=> 'Africa/Accra',
-		'Africa/Addis_Ababa'	=> 'Africa/Addis_Ababa',
+		'Africa/Addis_Ababa'	=> 'Africa/Addis Ababa',
 		'Africa/Algiers'	=> 'Africa/Algiers',
 		'Africa/Asmara'		=> 'Africa/Asmara',
 		'Africa/Bamako'		=> 'Africa/Bamako',
@@ -937,10 +937,10 @@ $lang = array_merge($lang, array(
 		'Africa/Ceuta'		=> 'Africa/Ceuta',
 		'Africa/Conakry'	=> 'Africa/Conakry',
 		'Africa/Dakar'		=> 'Africa/Dakar',
-		'Africa/Dar_es_Salaam'	=> 'Africa/Dar_es_Salaam',
+		'Africa/Dar_es_Salaam'	=> 'Africa/Dar es Salaam',
 		'Africa/Djibouti'	=> 'Africa/Djibouti',
 		'Africa/Douala'		=> 'Africa/Douala',
-		'Africa/El_Aaiun'	=> 'Africa/El_Aaiun',
+		'Africa/El_Aaiun'	=> 'Africa/El Aaiun',
 		'Africa/Freetown'	=> 'Africa/Freetown',
 		'Africa/Gaborone'	=> 'Africa/Gaborone',
 		'Africa/Harare'		=> 'Africa/Harare',
@@ -968,7 +968,7 @@ $lang = array_merge($lang, array(
 		'Africa/Nouakchott'	=> 'Africa/Nouakchott',
 		'Africa/Ouagadougou'	=> 'Africa/Ouagadougou',
 		'Africa/Porto-Novo'	=> 'Africa/Porto-Novo',
-		'Africa/Sao_Tome'	=> 'Africa/Sao_Tome',
+		'Africa/Sao_Tome'	=> 'Africa/Sao Tome',
 		'Africa/Tripoli'	=> 'Africa/Tripoli',
 		'Africa/Tunis'		=> 'Africa/Tunis',
 		'Africa/Windhoek'	=> 'Africa/Windhoek',
@@ -979,16 +979,16 @@ $lang = array_merge($lang, array(
 		'America/Antigua'	=> 'America/Antigua',
 		'America/Araguaina'	=> 'America/Araguaina',
 
-		'America/Argentina/Buenos_Aires'	=> 'America/Argentina/Buenos_Aires',
+		'America/Argentina/Buenos_Aires'	=> 'America/Argentina/Buenos Aires',
 		'America/Argentina/Catamarca'	=> 'America/Argentina/Catamarca',
 		'America/Argentina/Cordoba'		=> 'America/Argentina/Cordoba',
 		'America/Argentina/Jujuy'		=> 'America/Argentina/Jujuy',
-		'America/Argentina/La_Rioja'	=> 'America/Argentina/La_Rioja',
+		'America/Argentina/La_Rioja'	=> 'America/Argentina/La Rioja',
 		'America/Argentina/Mendoza'		=> 'America/Argentina/Mendoza',
-		'America/Argentina/Rio_Gallegos'	=> 'America/Argentina/Rio_Gallegos',
+		'America/Argentina/Rio_Gallegos'	=> 'America/Argentina/Rio Gallegos',
 		'America/Argentina/Salta'		=> 'America/Argentina/Salta',
-		'America/Argentina/San_Juan'	=> 'America/Argentina/San_Juan',
-		'America/Argentina/San_Luis'	=> 'America/Argentina/San_Luis',
+		'America/Argentina/San_Juan'	=> 'America/Argentina/San Juan',
+		'America/Argentina/San_Luis'	=> 'America/Argentina/San Luis',
 		'America/Argentina/Tucuman'		=> 'America/Argentina/Tucuman',
 		'America/Argentina/Ushuaia'		=> 'America/Argentina/Ushuaia',
 
@@ -996,40 +996,40 @@ $lang = array_merge($lang, array(
 		'America/Asuncion'		=> 'America/Asuncion',
 		'America/Atikokan'		=> 'America/Atikokan',
 		'America/Bahia'			=> 'America/Bahia',
-		'America/Bahia_Banderas'	=> 'America/Bahia_Banderas',
+		'America/Bahia_Banderas'	=> 'America/Bahia Banderas',
 		'America/Barbados'		=> 'America/Barbados',
 		'America/Belem'			=> 'America/Belem',
 		'America/Belize'		=> 'America/Belize',
 		'America/Blanc-Sablon'	=> 'America/Blanc-Sablon',
-		'America/Boa_Vista'		=> 'America/Boa_Vista',
+		'America/Boa_Vista'		=> 'America/Boa Vista',
 		'America/Bogota'		=> 'America/Bogota',
 		'America/Boise'			=> 'America/Boise',
-		'America/Cambridge_Bay'	=> 'America/Cambridge_Bay',
-		'America/Campo_Grande'	=> 'America/Campo_Grande',
+		'America/Cambridge_Bay'	=> 'America/Cambridge Bay',
+		'America/Campo_Grande'	=> 'America/Campo Grande',
 		'America/Cancun'		=> 'America/Cancun',
 		'America/Caracas'		=> 'America/Caracas',
 		'America/Cayenne'		=> 'America/Cayenne',
 		'America/Cayman'		=> 'America/Cayman',
 		'America/Chicago'		=> 'America/Chicago',
 		'America/Chihuahua'		=> 'America/Chihuahua',
-		'America/Costa_Rica'	=> 'America/Costa_Rica',
+		'America/Costa_Rica'	=> 'America/Costa Rica',
 		'America/Creston'		=> 'America/Creston',
 		'America/Cuiaba'		=> 'America/Cuiaba',
 		'America/Curacao'		=> 'America/Curacao',
 		'America/Danmarkshavn'	=> 'America/Danmarkshavn',
 		'America/Dawson'		=> 'America/Dawson',
-		'America/Dawson_Creek'	=> 'America/Dawson_Creek',
+		'America/Dawson_Creek'	=> 'America/Dawson Creek',
 		'America/Denver'		=> 'America/Denver',
 		'America/Detroit'		=> 'America/Detroit',
 		'America/Dominica'		=> 'America/Dominica',
 		'America/Edmonton'		=> 'America/Edmonton',
 		'America/Eirunepe'		=> 'America/Eirunepe',
-		'America/El_Salvador'	=> 'America/El_Salvador',
+		'America/El_Salvador'	=> 'America/El Salvador',
 		'America/Fortaleza'		=> 'America/Fortaleza',
-		'America/Glace_Bay'		=> 'America/Glace_Bay',
+		'America/Glace_Bay'		=> 'America/Glace Bay',
 		'America/Godthab'		=> 'America/Godthab',
-		'America/Goose_Bay'		=> 'America/Goose_Bay',
-		'America/Grand_Turk'	=> 'America/Grand_Turk',
+		'America/Goose_Bay'		=> 'America/Goose Bay',
+		'America/Grand_Turk'	=> 'America/Grand Turk',
 		'America/Grenada'		=> 'America/Grenada',
 		'America/Guadeloupe'	=> 'America/Guadeloupe',
 		'America/Guatemala'		=> 'America/Guatemala',
@@ -1042,7 +1042,7 @@ $lang = array_merge($lang, array(
 		'America/Indiana/Knox'		=> 'America/Indiana/Knox',
 		'America/Indiana/Marengo'	=> 'America/Indiana/Marengo',
 		'America/Indiana/Petersburg'	=> 'America/Indiana/Petersburg',
-		'America/Indiana/Tell_City'	=> 'America/Indiana/Tell_City',
+		'America/Indiana/Tell_City'	=> 'America/Indiana/Tell City',
 		'America/Indiana/Vevay'		=> 'America/Indiana/Vevay',
 		'America/Indiana/Vincennes'	=> 'America/Indiana/Vincennes',
 		'America/Indiana/Winamac'	=> 'America/Indiana/Winamac',
@@ -1053,10 +1053,10 @@ $lang = array_merge($lang, array(
 		'America/Kentucky/Louisville'	=> 'America/Kentucky/Louisville',
 		'America/Kentucky/Monticello'	=> 'America/Kentucky/Monticello',
 		'America/Kralendijk'	=> 'America/Kralendijk',
-		'America/La_Paz'		=> 'America/La_Paz',
+		'America/La_Paz'		=> 'America/La Paz',
 		'America/Lima'			=> 'America/Lima',
-		'America/Los_Angeles'	=> 'America/Los_Angeles',
-		'America/Lower_Princes'	=> 'America/Lower_Princes',
+		'America/Los_Angeles'	=> 'America/Los Angeles',
+		'America/Lower_Princes'	=> 'America/Lower Princes',
 		'America/Maceio'		=> 'America/Maceio',
 		'America/Managua'		=> 'America/Managua',
 		'America/Manaus'		=> 'America/Manaus',
@@ -1067,7 +1067,7 @@ $lang = array_merge($lang, array(
 		'America/Menominee'		=> 'America/Menominee',
 		'America/Merida'		=> 'America/Merida',
 		'America/Metlakatla'	=> 'America/Metlakatla',
-		'America/Mexico_City'	=> 'America/Mexico_City',
+		'America/Mexico_City'	=> 'America/Mexico City',
 		'America/Miquelon'		=> 'America/Miquelon',
 		'America/Moncton'		=> 'America/Moncton',
 		'America/Monterrey'		=> 'America/Monterrey',
@@ -1075,46 +1075,46 @@ $lang = array_merge($lang, array(
 		'America/Montreal'		=> 'America/Montreal',
 		'America/Montserrat'	=> 'America/Montserrat',
 		'America/Nassau'		=> 'America/Nassau',
-		'America/New_York'		=> 'America/New_York',
+		'America/New_York'		=> 'America/New York',
 		'America/Nipigon'		=> 'America/Nipigon',
 		'America/Nome'			=> 'America/Nome',
 		'America/Noronha'		=> 'America/Noronha',
-		'America/North_Dakota/Beulah'		=> 'America/North_Dakota/Beulah',
-		'America/North_Dakota/Center'		=> 'America/North_Dakota/Center',
-		'America/North_Dakota/New_Salem'	=> 'America/North_Dakota/New_Salem',
+		'America/North_Dakota/Beulah'		=> 'America/North Dakota/Beulah',
+		'America/North_Dakota/Center'		=> 'America/North Dakota/Center',
+		'America/North_Dakota/New_Salem'	=> 'America/North Dakota/New Salem',
 		'America/Ojinaga'		=> 'America/Ojinaga',
 		'America/Panama'		=> 'America/Panama',
 		'America/Pangnirtung'	=> 'America/Pangnirtung',
 		'America/Paramaribo'	=> 'America/Paramaribo',
 		'America/Phoenix'		=> 'America/Phoenix',
 		'America/Port-au-Prince'	=> 'America/Port-au-Prince',
-		'America/Port_of_Spain'	=> 'America/Port_of_Spain',
-		'America/Porto_Velho'	=> 'America/Porto_Velho',
-		'America/Puerto_Rico'	=> 'America/Puerto_Rico',
-		'America/Rainy_River'	=> 'America/Rainy_River',
-		'America/Rankin_Inlet'	=> 'America/Rankin_Inlet',
+		'America/Port_of_Spain'	=> 'America/Port of Spain',
+		'America/Porto_Velho'	=> 'America/Porto Velho',
+		'America/Puerto_Rico'	=> 'America/Puerto Rico',
+		'America/Rainy_River'	=> 'America/Rainy River',
+		'America/Rankin_Inlet'	=> 'America/Rankin Inlet',
 		'America/Recife'		=> 'America/Recife',
 		'America/Regina'		=> 'America/Regina',
 		'America/Resolute'		=> 'America/Resolute',
-		'America/Rio_Branco'	=> 'America/Rio_Branco',
-		'America/Santa_Isabel'	=> 'America/Santa_Isabel',
+		'America/Rio_Branco'	=> 'America/Rio Branco',
+		'America/Santa_Isabel'	=> 'America/Santa Isabel',
 		'America/Santarem'		=> 'America/Santarem',
 		'America/Santiago'		=> 'America/Santiago',
-		'America/Santo_Domingo'	=> 'America/Santo_Domingo',
-		'America/Sao_Paulo'		=> 'America/Sao_Paulo',
+		'America/Santo_Domingo'	=> 'America/Santo Domingo',
+		'America/Sao_Paulo'		=> 'America/Sao Paulo',
 		'America/Scoresbysund'	=> 'America/Scoresbysund',
 		'America/Shiprock'		=> 'America/Shiprock',
 		'America/Sitka'			=> 'America/Sitka',
-		'America/St_Barthelemy'	=> 'America/St_Barthelemy',
-		'America/St_Johns'		=> 'America/St_Johns',
-		'America/St_Kitts'		=> 'America/St_Kitts',
-		'America/St_Lucia'		=> 'America/St_Lucia',
-		'America/St_Thomas'		=> 'America/St_Thomas',
-		'America/St_Vincent'	=> 'America/St_Vincent',
-		'America/Swift_Current'	=> 'America/Swift_Current',
+		'America/St_Barthelemy'	=> 'America/St. Barthelemy',
+		'America/St_Johns'		=> 'America/St. Johns',
+		'America/St_Kitts'		=> 'America/St. Kitts',
+		'America/St_Lucia'		=> 'America/St. Lucia',
+		'America/St_Thomas'		=> 'America/St. Thomas',
+		'America/St_Vincent'	=> 'America/St. Vincent',
+		'America/Swift_Current'	=> 'America/Swift Current',
 		'America/Tegucigalpa'	=> 'America/Tegucigalpa',
 		'America/Thule'			=> 'America/Thule',
-		'America/Thunder_Bay'	=> 'America/Thunder_Bay',
+		'America/Thunder_Bay'	=> 'America/Thunder Bay',
 		'America/Tijuana'		=> 'America/Tijuana',
 		'America/Toronto'		=> 'America/Toronto',
 		'America/Tortola'		=> 'America/Tortola',
@@ -1132,7 +1132,7 @@ $lang = array_merge($lang, array(
 		'Antarctica/McMurdo'	=> 'Antarctica/McMurdo',
 		'Antarctica/Palmer'		=> 'Antarctica/Palmer',
 		'Antarctica/Rothera'	=> 'Antarctica/Rothera',
-		'Antarctica/South_Pole'	=> 'Antarctica/South_Pole',
+		'Antarctica/South_Pole'	=> 'Antarctica/South Pole',
 		'Antarctica/Syowa'		=> 'Antarctica/Syowa',
 		'Antarctica/Vostok'		=> 'Antarctica/Vostok',
 
@@ -1163,8 +1163,8 @@ $lang = array_merge($lang, array(
 		'Asia/Gaza'			=> 'Asia/Gaza',
 		'Asia/Harbin'		=> 'Asia/Harbin',
 		'Asia/Hebron'		=> 'Asia/Hebron',
-		'Asia/Ho_Chi_Minh'	=> 'Asia/Ho_Chi_Minh',
-		'Asia/Hong_Kong'	=> 'Asia/Hong_Kong',
+		'Asia/Ho_Chi_Minh'	=> 'Asia/Ho Chi Minh',
+		'Asia/Hong_Kong'	=> 'Asia/Hong Kong',
 		'Asia/Hovd'			=> 'Asia/Hovd',
 		'Asia/Irkutsk'		=> 'Asia/Irkutsk',
 		'Asia/Jakarta'		=> 'Asia/Jakarta',
@@ -1178,7 +1178,7 @@ $lang = array_merge($lang, array(
 		'Asia/Khandyga'		=> 'Asia/Khandyga',
 		'Asia/Kolkata'		=> 'Asia/Kolkata',
 		'Asia/Krasnoyarsk'	=> 'Asia/Krasnoyarsk',
-		'Asia/Kuala_Lumpur'	=> 'Asia/Kuala_Lumpur',
+		'Asia/Kuala_Lumpur'	=> 'Asia/Kuala Lumpur',
 		'Asia/Kuching'		=> 'Asia/Kuching',
 		'Asia/Kuwait'		=> 'Asia/Kuwait',
 		'Asia/Macau'		=> 'Asia/Macau',
@@ -1191,7 +1191,7 @@ $lang = array_merge($lang, array(
 		'Asia/Novosibirsk'	=> 'Asia/Novosibirsk',
 		'Asia/Omsk'			=> 'Asia/Omsk',
 		'Asia/Oral'			=> 'Asia/Oral',
-		'Asia/Phnom_Penh'	=> 'Asia/Phnom_Penh',
+		'Asia/Phnom_Penh'	=> 'Asia/Phnom Penh',
 		'Asia/Pontianak'	=> 'Asia/Pontianak',
 		'Asia/Pyongyang'	=> 'Asia/Pyongyang',
 		'Asia/Qatar'		=> 'Asia/Qatar',
@@ -1221,23 +1221,23 @@ $lang = array_merge($lang, array(
 		'Atlantic/Azores'		=> 'Atlantic/Azores',
 		'Atlantic/Bermuda'		=> 'Atlantic/Bermuda',
 		'Atlantic/Canary'		=> 'Atlantic/Canary',
-		'Atlantic/Cape_Verde'	=> 'Atlantic/Cape_Verde',
+		'Atlantic/Cape_Verde'	=> 'Atlantic/Cape Verde',
 		'Atlantic/Faroe'		=> 'Atlantic/Faroe',
 		'Atlantic/Madeira'		=> 'Atlantic/Madeira',
 		'Atlantic/Reykjavik'	=> 'Atlantic/Reykjavik',
-		'Atlantic/South_Georgia'	=> 'Atlantic/South_Georgia',
-		'Atlantic/St_Helena'	=> 'Atlantic/St_Helena',
+		'Atlantic/South_Georgia'	=> 'Atlantic/South Georgia',
+		'Atlantic/St_Helena'	=> 'Atlantic/St. Helena',
 		'Atlantic/Stanley'		=> 'Atlantic/Stanley',
 
 		'Australia/Adelaide'	=> 'Australia/Adelaide',
 		'Australia/Brisbane'	=> 'Australia/Brisbane',
-		'Australia/Broken_Hill'	=> 'Australia/Broken_Hill',
+		'Australia/Broken_Hill'	=> 'Australia/Broken Hill',
 		'Australia/Currie'		=> 'Australia/Currie',
 		'Australia/Darwin'		=> 'Australia/Darwin',
 		'Australia/Eucla'		=> 'Australia/Eucla',
 		'Australia/Hobart'		=> 'Australia/Hobart',
 		'Australia/Lindeman'	=> 'Australia/Lindeman',
-		'Australia/Lord_Howe'	=> 'Australia/Lord_Howe',
+		'Australia/Lord_Howe'	=> 'Australia/Lord Howe',
 		'Australia/Melbourne'	=> 'Australia/Melbourne',
 		'Australia/Perth'		=> 'Australia/Perth',
 		'Australia/Sydney'		=> 'Australia/Sydney',
@@ -1258,7 +1258,7 @@ $lang = array_merge($lang, array(
 		'Europe/Gibraltar'	=> 'Europe/Gibraltar',
 		'Europe/Guernsey'	=> 'Europe/Guernsey',
 		'Europe/Helsinki'	=> 'Europe/Helsinki',
-		'Europe/Isle_of_Man'	=> 'Europe/Isle_of_Man',
+		'Europe/Isle_of_Man'	=> 'Europe/Isle of Man',
 		'Europe/Istanbul'	=> 'Europe/Istanbul',
 		'Europe/Jersey'		=> 'Europe/Jersey',
 		'Europe/Kaliningrad'	=> 'Europe/Kaliningrad',
@@ -1280,7 +1280,7 @@ $lang = array_merge($lang, array(
 		'Europe/Riga'		=> 'Europe/Riga',
 		'Europe/Rome'		=> 'Europe/Rome',
 		'Europe/Samara'		=> 'Europe/Samara',
-		'Europe/San_Marino'	=> 'Europe/San_Marino',
+		'Europe/San_Marino'	=> 'Europe/San Marino',
 		'Europe/Sarajevo'	=> 'Europe/Sarajevo',
 		'Europe/Simferopol'	=> 'Europe/Simferopol',
 		'Europe/Skopje'		=> 'Europe/Skopje',
@@ -1337,11 +1337,11 @@ $lang = array_merge($lang, array(
 		'Pacific/Niue'		=> 'Pacific/Niue',
 		'Pacific/Norfolk'	=> 'Pacific/Norfolk',
 		'Pacific/Noumea'	=> 'Pacific/Noumea',
-		'Pacific/Pago_Pago'	=> 'Pacific/Pago_Pago',
+		'Pacific/Pago_Pago'	=> 'Pacific/Pago Pago',
 		'Pacific/Palau'		=> 'Pacific/Palau',
 		'Pacific/Pitcairn'	=> 'Pacific/Pitcairn',
 		'Pacific/Pohnpei'	=> 'Pacific/Pohnpei',
-		'Pacific/Port_Moresby'	=> 'Pacific/Port_Moresby',
+		'Pacific/Port_Moresby'	=> 'Pacific/Port Moresby',
 		'Pacific/Rarotonga'	=> 'Pacific/Rarotonga',
 		'Pacific/Saipan'	=> 'Pacific/Saipan',
 		'Pacific/Tahiti'	=> 'Pacific/Tahiti',
-- 
cgit v1.2.1


From 54e82392f0788d442e856a663a931e5811816c55 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 26 Oct 2013 10:17:24 -0700
Subject: [ticket/11975] Make link text shorter on smaller resolutions

PHPBB3-11975
---
 phpBB/language/en/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 08d28e24b9..796b6eedda 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -62,6 +62,7 @@ $lang = array_merge($lang, array(
 	'ACCOUNT_DEACTIVATED'			=> 'Your account has been manually deactivated and is only able to be reactivated by an administrator.',
 	'ACCOUNT_NOT_ACTIVATED'			=> 'Your account has not been activated yet.',
 	'ACP'							=> 'Administration Control Panel',
+	'ACP_SHORT'						=> 'ACP',
 	'ACTIVE'						=> 'active',
 	'ACTIVE_ERROR'					=> 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.',
 	'ADMINISTRATOR'					=> 'Administrator',
@@ -381,6 +382,7 @@ $lang = array_merge($lang, array(
 	'MB'					=> 'MB',
 	'MIB'					=> 'MiB',
 	'MCP'					=> 'Moderator Control Panel',
+	'MCP_SHORT'				=> 'MCP',
 	'MEMBERLIST'			=> 'Members',
 	'MEMBERLIST_EXPLAIN'	=> 'View complete list of members',
 	'MERGE'					=> 'Merge',
-- 
cgit v1.2.1


From 47f7992bf167e1ea3e09999cba52c9a6e6d8d529 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 30 Oct 2013 21:15:38 -0700
Subject: [ticket/11975] Change shortened ACP/MCP label to Administer/Moderate

Also utilizing the new data-responsive-text attribute

PHPBB3-11975
---
 phpBB/language/en/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 796b6eedda..a939689f9c 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -62,7 +62,7 @@ $lang = array_merge($lang, array(
 	'ACCOUNT_DEACTIVATED'			=> 'Your account has been manually deactivated and is only able to be reactivated by an administrator.',
 	'ACCOUNT_NOT_ACTIVATED'			=> 'Your account has not been activated yet.',
 	'ACP'							=> 'Administration Control Panel',
-	'ACP_SHORT'						=> 'ACP',
+	'ACP_SHORT'						=> 'Administer',
 	'ACTIVE'						=> 'active',
 	'ACTIVE_ERROR'					=> 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.',
 	'ADMINISTRATOR'					=> 'Administrator',
@@ -382,7 +382,7 @@ $lang = array_merge($lang, array(
 	'MB'					=> 'MB',
 	'MIB'					=> 'MiB',
 	'MCP'					=> 'Moderator Control Panel',
-	'MCP_SHORT'				=> 'MCP',
+	'MCP_SHORT'				=> 'Moderate',
 	'MEMBERLIST'			=> 'Members',
 	'MEMBERLIST_EXPLAIN'	=> 'View complete list of members',
 	'MERGE'					=> 'Merge',
-- 
cgit v1.2.1


From 8d5fcc8d4ca85c2752771ba7c808ed4e19c3c773 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 1 Nov 2013 15:33:31 +0100
Subject: [ticket/11994] Make extension manager UI less misleading

Enable and Install were split into two different expressions.
Purge was renamed to uninstall to make clearer what is going to happen.

PHPBB3-11994
---
 phpBB/language/en/acp/extensions.php | 51 +++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 369397ead2..d97100da70 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -39,47 +39,44 @@ $lang = array_merge($lang, array(
 	'EXTENSIONS'				=> 'Extensions',
 	'EXTENSIONS_ADMIN'			=> 'Extensions Manager',
 	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.',
-	'EXTENSION_INVALID_LIST'	=> 'The "%s" extension is not valid.<br />%s<br /><br />',
+	'EXTENSION_INVALID_LIST'	=> 'The “%s” extension is not valid.<br />%s<br /><br />',
 	'EXTENSION_NOT_AVAILABLE'	=> 'The selected extension is not available for this board, please verify your phpBB and PHP versions are allowed (see the details page).',
 
 	'DETAILS'				=> 'Details',
 
-	'AVAILABLE'				=> 'Available',
-	'ENABLED'				=> 'Enabled',
-	'DISABLED'				=> 'Disabled',
-	'PURGED'				=> 'Purged',
-	'UPLOADED'				=> 'Uploaded',
+	'EXTENSIONS_ENABLED'	=> 'Enabled Extensions',
+	'EXTENSIONS_DISABLED'	=> 'Disabled Extensions',
 
-	'ENABLE'				=> 'Enable',
-	'DISABLE'				=> 'Disable',
-	'PURGE'					=> 'Purge',
+	'EXTENSION_DISABLE'		=> 'Disable',
+	'EXTENSION_ENABLE'		=> 'Enable',
+	'EXTENSION_INSTALL'		=> 'Install',
+	'EXTENSION_UNINSTALL'	=> 'Uninstall',
 
-	'ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
-	'DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files and settings but removes any functionality added by the extension.',
-	'PURGE_EXPLAIN'			=> 'Purging an extension clears an extensions data while retaining its files.',
-	'DELETE_EXPLAIN'		=> 'Deleting an extension removes all of its files and settings. Log entries will remain, although any language variables added by the extension will not be available.',
+	'EXTENSION_DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.',
+	'EXTENSION_ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
+	'EXTENSION_INSTALL_EXPLAIN'		=> 'Installing an extension will perform database changes that are required to use the extension on your board.',
+	'EXTENSION_UNINSTALL_EXPLAIN'	=> 'Uninstalling an extension removes all data and settings of the extensions. Only the extension files are retained, so you can install it again.',
 
-	'DISABLE_IN_PROGRESS'	=> 'The extension is currently being disabled, please do not leave this page or refresh until it is completed.',
-	'ENABLE_IN_PROGRESS'	=> 'The extension is currently being installed, please do not leave this page or refresh until it is completed.',
-	'PURGE_IN_PROGRESS'		=> 'The extension is currently being purged, please do not leave this page or refresh until it is completed.',
-	'ENABLE_SUCCESS'		=> 'The extension was enabled successfully',
-	'DISABLE_SUCCESS'		=> 'The extension was disabled successfully',
-	'PURGE_SUCCESS'			=> 'The extension was purged successfully',
+	'EXTENSION_DISABLE_IN_PROGRESS'	=> 'The extension is currently being disabled, please do not leave this page or refresh until it is completed.',
+	'EXTENSION_ENABLE_IN_PROGRESS'	=> 'The extension is currently being enabled, please do not leave this page or refresh until it is completed.',
+	'EXTENSION_INSTALL_IN_PROGRESS'	=> 'The extension is currently being installed, please do not leave this page or refresh until it is completed.',
+	'EXTENSION_UNINSTALL_IN_PROGRESS'	=> 'The extension is currently being purged, please do not leave this page or refresh until it is completed.',
 
-	'ENABLE_FAIL'			=> 'The extension could not be enabled',
-	'DISABLE_FAIL'			=> 'The extension could not be disabled',
-	'PURGE_FAIL'			=> 'The extension could not be purged',
+	'EXTENSION_DISABLE_SUCCESS'		=> 'The extension was disabled successfully',
+	'EXTENSION_ENABLE_SUCCESS'		=> 'The extension was enabled successfully',
+	'EXTENSION_INSTALL_SUCCESS'		=> 'The extension was installed successfully',
+	'EXTENSION_UNINSTALL_SUCCESS'	=> 'The extension was uninstalled successfully',
 
 	'EXTENSION_NAME'		=> 'Extension Name',
 	'EXTENSION_ACTIONS'		=> 'Actions',
 	'EXTENSION_OPTIONS'		=> 'Options',
 
-	'ENABLE_CONFIRM'		=> 'Are you sure that you wish to enable this extension?',
-	'DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable this extension?',
-	'PURGE_CONFIRM'			=> 'Are you sure that you wish to purge this extension&#39;s data? This will remove all settings stored for this extension and cannot be undone!',
+	'EXTENSION_DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable the “%s” extension?',
+	'EXTENSION_ENABLE_CONFIRM'		=> 'Are you sure that you wish to enable the “%s” extension?',
+	'EXTENSION_INSTALL_CONFIRM'		=> 'Are you sure that you wish to install the “%s” extension?',
+	'EXTENSION_UNINSTALL_CONFIRM'	=> 'Are you sure that you wish to uninstall the “%s” extension? This will remove all data and settings stored for this extension and cannot be undone!',
 
-	'WARNING'				=> 'Warning',
-	'RETURN'				=> 'Return',
+	'RETURN_TO_EXTENSION_LIST'	=> 'Return to the extension list',
 
 	'EXT_DETAILS'			=> 'Extension Details',
 	'DISPLAY_NAME'			=> 'Display Name',
-- 
cgit v1.2.1


From 7bc6f3210005d8623ba363b9a19903c5bd3a402a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 1 Nov 2013 15:56:59 +0100
Subject: [ticket/11994] More language fixes

PHPBB3-11994
---
 phpBB/language/en/acp/extensions.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index d97100da70..75bb0e3cfa 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -55,12 +55,12 @@ $lang = array_merge($lang, array(
 	'EXTENSION_DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.',
 	'EXTENSION_ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
 	'EXTENSION_INSTALL_EXPLAIN'		=> 'Installing an extension will perform database changes that are required to use the extension on your board.',
-	'EXTENSION_UNINSTALL_EXPLAIN'	=> 'Uninstalling an extension removes all data and settings of the extensions. Only the extension files are retained, so you can install it again.',
+	'EXTENSION_UNINSTALL_EXPLAIN'	=> 'Uninstalling an extension removes all data and settings of the extensions. The extension files are retained so it can be installed again.',
 
-	'EXTENSION_DISABLE_IN_PROGRESS'	=> 'The extension is currently being disabled, please do not leave this page or refresh until it is completed.',
-	'EXTENSION_ENABLE_IN_PROGRESS'	=> 'The extension is currently being enabled, please do not leave this page or refresh until it is completed.',
-	'EXTENSION_INSTALL_IN_PROGRESS'	=> 'The extension is currently being installed, please do not leave this page or refresh until it is completed.',
-	'EXTENSION_UNINSTALL_IN_PROGRESS'	=> 'The extension is currently being purged, please do not leave this page or refresh until it is completed.',
+	'EXTENSION_DISABLE_IN_PROGRESS'	=> 'The extension is currently being disabled, please do not leave or refresh this page until it is completed.',
+	'EXTENSION_ENABLE_IN_PROGRESS'	=> 'The extension is currently being enabled, please do not leave or refresh this page until it is completed.',
+	'EXTENSION_INSTALL_IN_PROGRESS'	=> 'The extension is currently being installed, please do not leave or refresh this page until it is completed.',
+	'EXTENSION_UNINSTALL_IN_PROGRESS'	=> 'The extension is currently being purged, please do not leave or refresh this page until it is completed.',
 
 	'EXTENSION_DISABLE_SUCCESS'		=> 'The extension was disabled successfully',
 	'EXTENSION_ENABLE_SUCCESS'		=> 'The extension was enabled successfully',
-- 
cgit v1.2.1


From 3ac3688a7fb77250a75e8d7a3223f46a52cdfcf8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 2 Nov 2013 14:28:35 +0100
Subject: [ticket/11994] Fix some language

PHPBB3-11994
---
 phpBB/language/en/acp/extensions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 75bb0e3cfa..96eed14c0e 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -55,12 +55,12 @@ $lang = array_merge($lang, array(
 	'EXTENSION_DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.',
 	'EXTENSION_ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
 	'EXTENSION_INSTALL_EXPLAIN'		=> 'Installing an extension will perform database changes that are required to use the extension on your board.',
-	'EXTENSION_UNINSTALL_EXPLAIN'	=> 'Uninstalling an extension removes all data and settings of the extensions. The extension files are retained so it can be installed again.',
+	'EXTENSION_UNINSTALL_EXPLAIN'	=> 'Uninstalling an extension removes all of its data and settings. The extension files are retained so it can be installed again.',
 
 	'EXTENSION_DISABLE_IN_PROGRESS'	=> 'The extension is currently being disabled, please do not leave or refresh this page until it is completed.',
 	'EXTENSION_ENABLE_IN_PROGRESS'	=> 'The extension is currently being enabled, please do not leave or refresh this page until it is completed.',
 	'EXTENSION_INSTALL_IN_PROGRESS'	=> 'The extension is currently being installed, please do not leave or refresh this page until it is completed.',
-	'EXTENSION_UNINSTALL_IN_PROGRESS'	=> 'The extension is currently being purged, please do not leave or refresh this page until it is completed.',
+	'EXTENSION_UNINSTALL_IN_PROGRESS'	=> 'The extension is currently being uninstalled, please do not leave or refresh this page until it is completed.',
 
 	'EXTENSION_DISABLE_SUCCESS'		=> 'The extension was disabled successfully',
 	'EXTENSION_ENABLE_SUCCESS'		=> 'The extension was enabled successfully',
-- 
cgit v1.2.1


From 7e1a02b3a192771043009078630e8e2b9b8026a1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 2 Nov 2013 23:23:48 +0100
Subject: [ticket/11994] Make install/enable just one UI thing

PHPBB3-11994
---
 phpBB/language/en/acp/extensions.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 96eed14c0e..5421789e68 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -49,22 +49,18 @@ $lang = array_merge($lang, array(
 
 	'EXTENSION_DISABLE'		=> 'Disable',
 	'EXTENSION_ENABLE'		=> 'Enable',
-	'EXTENSION_INSTALL'		=> 'Install',
 	'EXTENSION_UNINSTALL'	=> 'Uninstall',
 
 	'EXTENSION_DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.',
 	'EXTENSION_ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
-	'EXTENSION_INSTALL_EXPLAIN'		=> 'Installing an extension will perform database changes that are required to use the extension on your board.',
 	'EXTENSION_UNINSTALL_EXPLAIN'	=> 'Uninstalling an extension removes all of its data and settings. The extension files are retained so it can be installed again.',
 
 	'EXTENSION_DISABLE_IN_PROGRESS'	=> 'The extension is currently being disabled, please do not leave or refresh this page until it is completed.',
 	'EXTENSION_ENABLE_IN_PROGRESS'	=> 'The extension is currently being enabled, please do not leave or refresh this page until it is completed.',
-	'EXTENSION_INSTALL_IN_PROGRESS'	=> 'The extension is currently being installed, please do not leave or refresh this page until it is completed.',
 	'EXTENSION_UNINSTALL_IN_PROGRESS'	=> 'The extension is currently being uninstalled, please do not leave or refresh this page until it is completed.',
 
 	'EXTENSION_DISABLE_SUCCESS'		=> 'The extension was disabled successfully',
 	'EXTENSION_ENABLE_SUCCESS'		=> 'The extension was enabled successfully',
-	'EXTENSION_INSTALL_SUCCESS'		=> 'The extension was installed successfully',
 	'EXTENSION_UNINSTALL_SUCCESS'	=> 'The extension was uninstalled successfully',
 
 	'EXTENSION_NAME'		=> 'Extension Name',
@@ -73,7 +69,6 @@ $lang = array_merge($lang, array(
 
 	'EXTENSION_DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable the “%s” extension?',
 	'EXTENSION_ENABLE_CONFIRM'		=> 'Are you sure that you wish to enable the “%s” extension?',
-	'EXTENSION_INSTALL_CONFIRM'		=> 'Are you sure that you wish to install the “%s” extension?',
 	'EXTENSION_UNINSTALL_CONFIRM'	=> 'Are you sure that you wish to uninstall the “%s” extension? This will remove all data and settings stored for this extension and cannot be undone!',
 
 	'RETURN_TO_EXTENSION_LIST'	=> 'Return to the extension list',
-- 
cgit v1.2.1


From f8e92efc3f213f966a4faa1966ff8e64270328f4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 2 Nov 2013 23:40:56 +0100
Subject: [ticket/11994] Rename "uninstall" to "delete data"

PHPBB3-11994
---
 phpBB/language/en/acp/extensions.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 5421789e68..7477324637 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -44,32 +44,32 @@ $lang = array_merge($lang, array(
 
 	'DETAILS'				=> 'Details',
 
-	'EXTENSIONS_ENABLED'	=> 'Enabled Extensions',
 	'EXTENSIONS_DISABLED'	=> 'Disabled Extensions',
+	'EXTENSIONS_ENABLED'	=> 'Enabled Extensions',
 
+	'EXTENSION_DELETE_DATA'	=> 'Delete data',
 	'EXTENSION_DISABLE'		=> 'Disable',
 	'EXTENSION_ENABLE'		=> 'Enable',
-	'EXTENSION_UNINSTALL'	=> 'Uninstall',
 
+	'EXTENSION_DELETE_DATA_EXPLAIN'	=> 'Deleting data of an extension removes all of its data and settings. The extension files are retained so it can be enabled again.',
 	'EXTENSION_DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.',
 	'EXTENSION_ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
-	'EXTENSION_UNINSTALL_EXPLAIN'	=> 'Uninstalling an extension removes all of its data and settings. The extension files are retained so it can be installed again.',
 
+	'EXTENSION_DELETE_DATA_IN_PROGRESS'	=> 'The data of the extension is currently being deleted, please do not leave or refresh this page until it is completed.',
 	'EXTENSION_DISABLE_IN_PROGRESS'	=> 'The extension is currently being disabled, please do not leave or refresh this page until it is completed.',
 	'EXTENSION_ENABLE_IN_PROGRESS'	=> 'The extension is currently being enabled, please do not leave or refresh this page until it is completed.',
-	'EXTENSION_UNINSTALL_IN_PROGRESS'	=> 'The extension is currently being uninstalled, please do not leave or refresh this page until it is completed.',
 
+	'EXTENSION_DELETE_DATA_SUCCESS'	=> 'The data of the extension was deleted successfully',
 	'EXTENSION_DISABLE_SUCCESS'		=> 'The extension was disabled successfully',
 	'EXTENSION_ENABLE_SUCCESS'		=> 'The extension was enabled successfully',
-	'EXTENSION_UNINSTALL_SUCCESS'	=> 'The extension was uninstalled successfully',
 
 	'EXTENSION_NAME'		=> 'Extension Name',
 	'EXTENSION_ACTIONS'		=> 'Actions',
 	'EXTENSION_OPTIONS'		=> 'Options',
 
+	'EXTENSION_DELETE_DATA_CONFIRM'	=> 'Are you sure that you wish to delete all data of the “%s” extension? This cannot be undone!',
 	'EXTENSION_DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable the “%s” extension?',
 	'EXTENSION_ENABLE_CONFIRM'		=> 'Are you sure that you wish to enable the “%s” extension?',
-	'EXTENSION_UNINSTALL_CONFIRM'	=> 'Are you sure that you wish to uninstall the “%s” extension? This will remove all data and settings stored for this extension and cannot be undone!',
 
 	'RETURN_TO_EXTENSION_LIST'	=> 'Return to the extension list',
 
-- 
cgit v1.2.1


From 05c97fd03c68edd65d1a73806a569d9011574804 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 3 Nov 2013 00:29:35 +0100
Subject: [ticket/11994] Fix more language

PHPBB3-11994
---
 phpBB/language/en/acp/extensions.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 7477324637..8279a68022 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -51,15 +51,15 @@ $lang = array_merge($lang, array(
 	'EXTENSION_DISABLE'		=> 'Disable',
 	'EXTENSION_ENABLE'		=> 'Enable',
 
-	'EXTENSION_DELETE_DATA_EXPLAIN'	=> 'Deleting data of an extension removes all of its data and settings. The extension files are retained so it can be enabled again.',
+	'EXTENSION_DELETE_DATA_EXPLAIN'	=> 'Deleting an extension’s data removes all of its data and settings. The extension files are retained so it can be enabled again.',
 	'EXTENSION_DISABLE_EXPLAIN'		=> 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.',
 	'EXTENSION_ENABLE_EXPLAIN'		=> 'Enabling an extension allows you to use it on your board.',
 
-	'EXTENSION_DELETE_DATA_IN_PROGRESS'	=> 'The data of the extension is currently being deleted, please do not leave or refresh this page until it is completed.',
-	'EXTENSION_DISABLE_IN_PROGRESS'	=> 'The extension is currently being disabled, please do not leave or refresh this page until it is completed.',
-	'EXTENSION_ENABLE_IN_PROGRESS'	=> 'The extension is currently being enabled, please do not leave or refresh this page until it is completed.',
+	'EXTENSION_DELETE_DATA_IN_PROGRESS'	=> 'The extension’s data is currently being deleted. Please do not leave or refresh this page until it is completed.',
+	'EXTENSION_DISABLE_IN_PROGRESS'	=> 'The extension is currently being disabled. Please do not leave or refresh this page until it is completed.',
+	'EXTENSION_ENABLE_IN_PROGRESS'	=> 'The extension is currently being enabled. Please do not leave or refresh this page until it is completed.',
 
-	'EXTENSION_DELETE_DATA_SUCCESS'	=> 'The data of the extension was deleted successfully',
+	'EXTENSION_DELETE_DATA_SUCCESS'	=> 'The extension’s data was deleted successfully',
 	'EXTENSION_DISABLE_SUCCESS'		=> 'The extension was disabled successfully',
 	'EXTENSION_ENABLE_SUCCESS'		=> 'The extension was enabled successfully',
 
@@ -67,7 +67,7 @@ $lang = array_merge($lang, array(
 	'EXTENSION_ACTIONS'		=> 'Actions',
 	'EXTENSION_OPTIONS'		=> 'Options',
 
-	'EXTENSION_DELETE_DATA_CONFIRM'	=> 'Are you sure that you wish to delete all data of the “%s” extension? This cannot be undone!',
+	'EXTENSION_DELETE_DATA_CONFIRM'	=> 'Are you sure that you wish to delete the data associated with “%s”?<br /><br />This removes all of its data and settings and cannot be undone!',
 	'EXTENSION_DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable the “%s” extension?',
 	'EXTENSION_ENABLE_CONFIRM'		=> 'Are you sure that you wish to enable the “%s” extension?',
 
-- 
cgit v1.2.1


From d5ffb3002582da68d9d56fc941995652b58aa6f7 Mon Sep 17 00:00:00 2001
From: Lukasz <luki_9@wp.pl>
Date: Thu, 7 Nov 2013 19:54:20 +0100
Subject: [ticket/12005] Remove language vars used by PM popup PHPBB3-12005

---
 phpBB/language/en/common.php | 4 ----
 phpBB/language/en/ucp.php    | 3 ---
 2 files changed, 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 08d28e24b9..2f217d2112 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -152,7 +152,6 @@ $lang = array_merge($lang, array(
 		1	=> '%d character',
 		2	=> '%d characters',
 	),
-	'CLICK_VIEW_PRIVMSG'	=> '%sGo to your inbox%s',
 	'COLLAPSE_VIEW'			=> 'Collapse view',
 	'CLOSE_WINDOW'			=> 'Close window',
 	'COLOUR_SWATCH'			=> 'Colour swatch',
@@ -834,9 +833,6 @@ $lang = array_merge($lang, array(
 	'YES'				=> 'Yes',
 	'YIM'				=> 'YIM',
 	'YOU_LAST_VISIT'	=> 'Last visit was: %s',
-	'YOU_NEW_PM'		=> 'A new private message is waiting for you in your Inbox.',
-	'YOU_NEW_PMS'		=> 'New private messages are waiting for you in your Inbox.',
-	'YOU_NO_NEW_PM'		=> 'No new private messages are waiting for you.',
 
 	'datetime'			=> array(
 		'TODAY'		=> 'Today',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 9a5713e1cd..6f392d6efe 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -409,7 +409,6 @@ $lang = array_merge($lang, array(
 	'PM_SUBJECT'				=> 'Message subject',
 	'PM_TO'						=> 'Send to',
 	'PM_USERS_REMOVED_NO_PM'	=> 'Some users couldn’t be added as they have disabled private message receipt.',
-	'POPUP_ON_PM'				=> 'Pop up window on new private message',
 	'POST_EDIT_PM'				=> 'Edit message',
 	'POST_FORWARD_PM'			=> 'Forward message',
 	'POST_NEW_PM'				=> 'Compose message',
@@ -521,8 +520,6 @@ $lang = array_merge($lang, array(
 	'UCP_PM_COMPOSE'			=> 'Compose message',
 	'UCP_PM_DRAFTS'				=> 'Manage PM drafts',
 	'UCP_PM_OPTIONS'			=> 'Rules, folders &amp; settings',
-	'UCP_PM_POPUP'				=> 'Private messages',
-	'UCP_PM_POPUP_TITLE'		=> 'Private message popup',
 	'UCP_PM_UNREAD'				=> 'Unread messages',
 	'UCP_PM_VIEW'				=> 'View messages',
 
-- 
cgit v1.2.1


From bcf347420e4fe400d02a6ee58e63839f18a86362 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 21 Nov 2013 13:02:26 -0800
Subject: [ticket/11959] Trim the list of users from post notifications.

PHPBB3-11959
---
 phpBB/language/en/common.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a939689f9c..2b1935dfca 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -416,14 +416,17 @@ $lang = array_merge($lang, array(
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
 	'NOTIFICATIONS'				=> 'Notifications',
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
+	'NOTIFICATION_BOOKMARK_TRIMMED'		=> '%1$s and %3$d others replied to the topic “%2$s” you have bookmarked.',
 	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group %2$s.',
 	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> 'Your request to join the group %1$s has been approved.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
+	'NOTIFICATION_POST_TRIMMED'			=> '%1$s and %3$d others replied to the topic “%2$s”',
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved for reason: "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by %1$s and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
+	'NOTIFICATION_QUOTE_TRIMMED'		=> '%1$s and %3$d others replied to the topic “%2$s”',
 	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
 	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" for reason: "%3$s".',
 	'NOTIFICATION_REPORT_CLOSED'   		=> '%1$s closed the report you made for "%2$s".',
-- 
cgit v1.2.1


From 6a2d0c345c9990a60a89e02542fc46e53f474cfa Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 27 Nov 2013 18:09:38 +0100
Subject: [ticket/12042] Add all language strings from PLUpload 2.0 to the
 language file

PHPBB3-12042
---
 phpBB/language/en/common.php   |  1 +
 phpBB/language/en/plupload.php | 12 ++++++++++++
 2 files changed, 13 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 29e61e68c2..c1b20ae945 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -112,6 +112,7 @@ $lang = array_merge($lang, array(
 	'AVATAR_WRONG_FILESIZE'			=> 'The avatar’s filesize must be between 0 and %1d %2s.',
 	'AVATAR_WRONG_SIZE'				=> 'The submitted avatar is %5$s wide and %6$s high. Avatars must be at least %1$s wide and %2$s high, but no larger than %3$s wide and %4$s high.',
 
+	'B'						=> 'B', // Short for Bytes
 	'BACK_TO_TOP'			=> 'Top',
 	'BACK_TO_PREV'			=> 'Back to previous page',
 	'BAN_TRIGGERED_BY_EMAIL'=> 'A ban has been issued on your email address.',
diff --git a/phpBB/language/en/plupload.php b/phpBB/language/en/plupload.php
index cfdce9810e..74ae8b7c78 100644
--- a/phpBB/language/en/plupload.php
+++ b/phpBB/language/en/plupload.php
@@ -38,15 +38,27 @@ if (empty($lang) || !is_array($lang))
 $lang = array_merge($lang, array(
 	'PLUPLOAD_ADD_FILES'		=> 'Add files',
 	'PLUPLOAD_ADD_FILES_TO_QUEUE'	=> 'Add files to the upload queue and click the start button.',
+	'PLUPLOAD_ALREADY_QUEUED'	=> '%s already present in the queue.',
+	'PLUPLOAD_CLOSE'			=> 'Close',
 	'PLUPLOAD_DRAG'				=> 'Drag files here.',
+	'PLUPLOAD_DUPLICATE_ERROR'	=> 'Duplicate file error.',
 	'PLUPLOAD_ERR_INPUT'		=> 'Failed to open input stream.',
 	'PLUPLOAD_ERR_MOVE_UPLOADED'	=> 'Failed to move uploaded file.',
 	'PLUPLOAD_ERR_OUTPUT'		=> 'Failed to open output stream.',
+	'PLUPLOAD_ERR_FILE_TOO_LARGE'	=> 'Error: File too large:',
+	'PLUPLOAD_ERR_FILE_COUNT'	=> 'File count error.',
+	'PLUPLOAD_ERR_FILE_INVALID_EXT'	=> 'Error: Invalid file extension:',
+	'PLUPLOAD_ERR_RUNTIME_MEMORY'	=> 'Runtime ran out of available memory.',
+	'PLUPLOAD_ERR_UPLOAD_LIMIT'	=> 'Upload element accepts only %d file(s) at a time. Extra files were stripped.',
+	'PLUPLOAD_ERR_UPLOAD_URL'	=> 'Upload URL might be wrong or does not exist.',
 	'PLUPLOAD_EXTENSION_ERROR'	=> 'File extension error.',
+	'PLUPLOAD_FILE'				=> 'File: %s',
+	'PLUPLOAD_FILE_DETAILS'		=> 'File: %s, size: %d, max file size: %d',
 	'PLUPLOAD_FILENAME'			=> 'Filename',
 	'PLUPLOAD_FILES_QUEUED'		=> '%d files queued',
 	'PLUPLOAD_GENERIC_ERROR'	=> 'Generic error.',
 	'PLUPLOAD_HTTP_ERROR'		=> 'HTTP error.',
+	'PLUPLOAD_IMAGE_FORMAT'		=> 'Image format either wrong or not supported.',
 	'PLUPLOAD_INIT_ERROR'		=> 'Init error.',
 	'PLUPLOAD_IO_ERROR'			=> 'IO error.',
 	'PLUPLOAD_NOT_APPLICABLE'	=> 'N/A',
-- 
cgit v1.2.1


From f3d7823050880ea6e597defefd265b32058c975b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 27 Nov 2013 18:54:51 +0100
Subject: [ticket/12042] Replace B with a more meaningful key name

PHPBB3-12042
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index c1b20ae945..632171b213 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -112,7 +112,6 @@ $lang = array_merge($lang, array(
 	'AVATAR_WRONG_FILESIZE'			=> 'The avatar’s filesize must be between 0 and %1d %2s.',
 	'AVATAR_WRONG_SIZE'				=> 'The submitted avatar is %5$s wide and %6$s high. Avatars must be at least %1$s wide and %2$s high, but no larger than %3$s wide and %4$s high.',
 
-	'B'						=> 'B', // Short for Bytes
 	'BACK_TO_TOP'			=> 'Top',
 	'BACK_TO_PREV'			=> 'Back to previous page',
 	'BAN_TRIGGERED_BY_EMAIL'=> 'A ban has been issued on your email address.',
@@ -144,6 +143,7 @@ $lang = array_merge($lang, array(
 	'BUTTON_QUOTE'			=> 'Quote',
 	'BUTTON_TOPIC_LOCKED'	=> 'Locked',
 	'BYTES'					=> 'Bytes',
+	'BYTES_SHORT'			=> 'B',
 
 	'CANCEL'				=> 'Cancel',
 	'CHANGE'				=> 'Change',
-- 
cgit v1.2.1


From 5d69eddcf5780db9056c7ae21a110bc815679dca Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 28 Nov 2013 13:22:25 +0100
Subject: [ticket/12045] Only display group selection if there are groups

Also fixed the empty option which is not allowed.

PHPBB3-12045
---
 phpBB/language/en/acp/prune.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index 3e890182c0..7134efd765 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -52,6 +52,7 @@ $lang = array_merge($lang, array(
 
 	'POSTS_ON_QUEUE'			=> 'Posts Awaiting Approval',
 	'PRUNE_USERS_GROUP_EXPLAIN'	=> 'Limit to users within the selected group.',
+	'PRUNE_USERS_GROUP_NONE'	=> 'All groups',
 	'PRUNE_USERS_LIST'				=> 'Users to be pruned',
 	'PRUNE_USERS_LIST_DELETE'		=> 'With the selected critera for pruning users the following accounts will be removed. You can remove individual users from the deletion list by unchecking the box next to their username.',
 	'PRUNE_USERS_LIST_DEACTIVATE'	=> 'With the selected critera for pruning users the following accounts will be deactivated. You can remove individual users from the deactivation list by unchecking the box next to their username.',
-- 
cgit v1.2.1


From e110d591a93b518edca00f01823d62c4d1a0ca91 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 11 Oct 2013 18:48:09 -0700
Subject: [ticket/11241] Consolidate topic actions into "Topic tools" dropdown.

PHPBB3-11241
---
 phpBB/language/en/viewtopic.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 6f318c39f1..424cb9da3e 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -104,6 +104,7 @@ $lang = array_merge($lang, array(
 
 	'SUBMIT_VOTE'			=> 'Submit vote',
 
+	'TOPIC_TOOLS'			=> 'Topic tools',
 	'TOTAL_VOTES'			=> 'Total votes',
 
 	'UNLOCK_TOPIC'			=> 'Unlock topic',
-- 
cgit v1.2.1


From c42bd28d172a9ae7439cc3868ebfda87e93f3490 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 12 Dec 2013 14:40:03 -0800
Subject: [ticket/12009] Prevent user from enabling invalid extension through
 direct URL

PHPBB3-12009
---
 phpBB/language/en/acp/extensions.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 8279a68022..67b34ff0c7 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -41,6 +41,7 @@ $lang = array_merge($lang, array(
 	'EXTENSIONS_EXPLAIN'		=> 'The Extensions Manager is a tool in your phpBB Board which allows you to manage all of your extensions statuses and view information about them.',
 	'EXTENSION_INVALID_LIST'	=> 'The “%s” extension is not valid.<br />%s<br /><br />',
 	'EXTENSION_NOT_AVAILABLE'	=> 'The selected extension is not available for this board, please verify your phpBB and PHP versions are allowed (see the details page).',
+	'EXTENSION_DIR_INVALID'		=> 'The selected extension has an invalid directory structure and cannot be enabled.',
 
 	'DETAILS'				=> 'Details',
 
-- 
cgit v1.2.1


From bef7bc7900e0c4c364245ee3039ee2aece62a223 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 27 Dec 2013 13:15:43 +0100
Subject: [ticket/11911] Warn admins when there is no search index for the
 selected engine

PHPBB3-11911
---
 phpBB/language/en/acp/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 77a7618ce0..0117d85433 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -361,6 +361,7 @@ $lang = array_merge($lang, array(
 
 	'GZIP_COMPRESSION'	=> 'GZip compression',
 
+	'NO_SEARCH_INDEX'	=> 'The selected search backend does not have a search index.<br >Please create the index for “%1$s” in the %2$ssearch index%3$s section.',
 	'NOT_AVAILABLE'		=> 'Not available',
 	'NUMBER_FILES'		=> 'Number of attachments',
 	'NUMBER_POSTS'		=> 'Number of posts',
-- 
cgit v1.2.1


From 95d4e6aa97606f427f56644c03e1253aa3235382 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 27 Dec 2013 15:25:03 +0100
Subject: [ticket/11996] Add explanation how to correctly remove and update an
 extension

See http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=44001 for more
information about the decision.

PHPBB3-11996
---
 phpBB/language/en/acp/extensions.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 67b34ff0c7..cbdc97b547 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -64,9 +64,24 @@ $lang = array_merge($lang, array(
 	'EXTENSION_DISABLE_SUCCESS'		=> 'The extension was disabled successfully',
 	'EXTENSION_ENABLE_SUCCESS'		=> 'The extension was enabled successfully',
 
-	'EXTENSION_NAME'		=> 'Extension Name',
-	'EXTENSION_ACTIONS'		=> 'Actions',
-	'EXTENSION_OPTIONS'		=> 'Options',
+	'EXTENSION_NAME'			=> 'Extension Name',
+	'EXTENSION_ACTIONS'			=> 'Actions',
+	'EXTENSION_ACTIONS_EXPLAIN'	=> 'In order to completly remove an extension from your board, you need to perform the following 3 steps:</p>
+		<ol>
+			<li>Disable the extension</li>
+			<li>Delete the extension’s data</li>
+			<li>Delete the extension’s files from the filesystem</li>
+		</ol><br />
+		<p>In order to update an extension from your board, you need to perform the following 6 steps:</p>
+		<ol>
+			<li>Disable the extension</li>
+			<li>Delete the extension’s files from the filesystem</li>
+			<li>Upload the new files</li>
+			<li>Disable the board (optional but recommended)</li>
+			<li>Enable the extension</li>
+			<li>Enable the board</li>
+		</ol><p>',
+	'EXTENSION_OPTIONS'			=> 'Options',
 
 	'EXTENSION_DELETE_DATA_CONFIRM'	=> 'Are you sure that you wish to delete the data associated with “%s”?<br /><br />This removes all of its data and settings and cannot be undone!',
 	'EXTENSION_DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable the “%s” extension?',
-- 
cgit v1.2.1


From f4b832a27d128ec84142dfe6133dc6ba96b8d3a9 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 23 Nov 2013 20:11:49 -0800
Subject: [ticket/12034] AJAXify notifications popup.

PHPBB3-12034
---
 phpBB/language/en/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 851ffe8ec4..abe930c387 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -371,6 +371,7 @@ $lang = array_merge($lang, array(
 	'LOGIN_VIEWFORUM'					=> 'The board requires you to be registered and logged in to view this forum.',
 	'LOGIN_EXPLAIN_EDIT'				=> 'In order to edit posts in this forum you have to be registered and logged in.',
 	'LOGIN_EXPLAIN_VIEWONLINE'			=> 'In order to view the online list you have to be registered and logged in.',
+	'LOGIN_REQUIRED'					=> 'You need to login to perform this action.',
 	'LOGOUT'							=> 'Logout',
 	'LOGOUT_USER'						=> 'Logout [ %s ]',
 	'LOG_ME_IN'							=> 'Remember me',
@@ -378,6 +379,7 @@ $lang = array_merge($lang, array(
 	'MAIN'					=> 'Main',
 	'MARK'					=> 'Mark',
 	'MARK_ALL'				=> 'Mark all',
+	'MARK_ALL_READ'			=> 'Mark all read',
 	'MARK_FORUMS_READ'		=> 'Mark forums read',
 	'MARK_READ'				=> 'Mark read',
 	'MARK_SUBFORUMS_READ'	=> 'Mark subforums read',
-- 
cgit v1.2.1


From b155056cb9f72295eaae877a2335094e4cf747d8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 13 Jan 2014 10:31:54 +0100
Subject: [ticket/11996] Use a table for better styling

PHPBB3-11996
---
 phpBB/language/en/acp/extensions.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index cbdc97b547..c024c92e61 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -66,22 +66,20 @@ $lang = array_merge($lang, array(
 
 	'EXTENSION_NAME'			=> 'Extension Name',
 	'EXTENSION_ACTIONS'			=> 'Actions',
-	'EXTENSION_ACTIONS_EXPLAIN'	=> 'In order to completly remove an extension from your board, you need to perform the following 3 steps:</p>
-		<ol>
+	'EXTENSION_OPTIONS'			=> 'Options',
+	'EXTENSION_UPDATE_HEADLINE'	=> 'Updating an extension',
+	'EXTENSION_UPDATE_EXPLAIN'	=> '<ol>
 			<li>Disable the extension</li>
-			<li>Delete the extension’s data</li>
 			<li>Delete the extension’s files from the filesystem</li>
-		</ol><br />
-		<p>In order to update an extension from your board, you need to perform the following 6 steps:</p>
-		<ol>
+			<li>Upload the new files</li>
+			<li>Enable the extension, note that the board will be automatically disabled for this step</li>
+		</ol>',
+	'EXTENSION_REMOVE_HEADLINE'	=> 'Completly removing an extension from your board',
+	'EXTENSION_REMOVE_EXPLAIN'	=> '<ol>
 			<li>Disable the extension</li>
+			<li>Delete the extension’s data</li>
 			<li>Delete the extension’s files from the filesystem</li>
-			<li>Upload the new files</li>
-			<li>Disable the board (optional but recommended)</li>
-			<li>Enable the extension</li>
-			<li>Enable the board</li>
-		</ol><p>',
-	'EXTENSION_OPTIONS'			=> 'Options',
+		</ol>',
 
 	'EXTENSION_DELETE_DATA_CONFIRM'	=> 'Are you sure that you wish to delete the data associated with “%s”?<br /><br />This removes all of its data and settings and cannot be undone!',
 	'EXTENSION_DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable the “%s” extension?',
-- 
cgit v1.2.1


From b3a25c52e57b31259e71984f320611fc5d6513bb Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 16 Jan 2014 11:48:40 -0800
Subject: [ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE.

PHPBB3-12096
---
 phpBB/language/en/search.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 71cbec4b41..f65022fbcb 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -60,7 +60,10 @@ $lang = array_merge($lang, array(
 	'LOGIN_EXPLAIN_UNREADSEARCH'=> 'The board requires you to be registered and logged in to view your unread posts.',
 	'LOGIN_EXPLAIN_NEWPOSTS'	=> 'The board requires you to be registered and logged in to view new posts since your last visit.',
 
-	'MAX_NUM_SEARCH_KEYWORDS_REFINE'	=> 'You specified too many words to search for. Please do not enter more than %1$d words.',
+	'MAX_NUM_SEARCH_KEYWORDS_REFINE'	=> array(
+		1	=> 'You specified too many words to search for. Please do not enter more than %1$d word.',
+		2	=> 'You specified too many words to search for. Please do not enter more than %1$d words.',
+	),
 
 	'NO_KEYWORDS'			=> 'You must specify at least one word to search for. Each word must consist of at least %s and must not contain more than %s excluding wildcards.',
 	'NO_RECENT_SEARCHES'	=> 'No searches have been carried out recently.',
-- 
cgit v1.2.1


From 020b7a31bf2c92af274d701e7dbbc875ff88c7c4 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 27 Nov 2013 18:01:18 -0800
Subject: [ticket/11915] Make the user aware of the drag-and-drop zone.

PHPBB3-11915
---
 phpBB/language/en/plupload.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/plupload.php b/phpBB/language/en/plupload.php
index 74ae8b7c78..0615a673d1 100644
--- a/phpBB/language/en/plupload.php
+++ b/phpBB/language/en/plupload.php
@@ -42,6 +42,7 @@ $lang = array_merge($lang, array(
 	'PLUPLOAD_CLOSE'			=> 'Close',
 	'PLUPLOAD_DRAG'				=> 'Drag files here.',
 	'PLUPLOAD_DUPLICATE_ERROR'	=> 'Duplicate file error.',
+	'PLUPLOAD_DRAG_TEXTAREA'	=> 'You may also attach files by dragging and dropping them in the message box.',
 	'PLUPLOAD_ERR_INPUT'		=> 'Failed to open input stream.',
 	'PLUPLOAD_ERR_MOVE_UPLOADED'	=> 'Failed to move uploaded file.',
 	'PLUPLOAD_ERR_OUTPUT'		=> 'Failed to open output stream.',
-- 
cgit v1.2.1


From 628323a80af58642565ff55f381e7b289f45b8da Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 11 Dec 2013 19:15:39 -0800
Subject: [ticket/11915] Remove unused language string.

PHPBB3-11915
---
 phpBB/language/en/plupload.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/plupload.php b/phpBB/language/en/plupload.php
index 0615a673d1..6039de7dbf 100644
--- a/phpBB/language/en/plupload.php
+++ b/phpBB/language/en/plupload.php
@@ -50,7 +50,6 @@ $lang = array_merge($lang, array(
 	'PLUPLOAD_ERR_FILE_COUNT'	=> 'File count error.',
 	'PLUPLOAD_ERR_FILE_INVALID_EXT'	=> 'Error: Invalid file extension:',
 	'PLUPLOAD_ERR_RUNTIME_MEMORY'	=> 'Runtime ran out of available memory.',
-	'PLUPLOAD_ERR_UPLOAD_LIMIT'	=> 'Upload element accepts only %d file(s) at a time. Extra files were stripped.',
 	'PLUPLOAD_ERR_UPLOAD_URL'	=> 'Upload URL might be wrong or does not exist.',
 	'PLUPLOAD_EXTENSION_ERROR'	=> 'File extension error.',
 	'PLUPLOAD_FILE'				=> 'File: %s',
-- 
cgit v1.2.1


From c7f6cccdf13d6e461f212aa1fe3134a2613a4de2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 3 Feb 2014 20:48:01 +0100
Subject: [ticket/11996] Remove note until we really do disable the board

PHPBB3-11996
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index c024c92e61..409b800ba6 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -72,7 +72,7 @@ $lang = array_merge($lang, array(
 			<li>Disable the extension</li>
 			<li>Delete the extension’s files from the filesystem</li>
 			<li>Upload the new files</li>
-			<li>Enable the extension, note that the board will be automatically disabled for this step</li>
+			<li>Enable the extension</li>
 		</ol>',
 	'EXTENSION_REMOVE_HEADLINE'	=> 'Completly removing an extension from your board',
 	'EXTENSION_REMOVE_EXPLAIN'	=> '<ol>
-- 
cgit v1.2.1


From 0ad726768c569cf4987aa93e2d6f2e5d185c7dc5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 2 Feb 2014 21:21:24 +0100
Subject: [ticket/12115] Remove old language strings

PHPBB3-12115
---
 phpBB/language/en/common.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index abe930c387..2f985a23ac 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -689,7 +689,6 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_LOCATION'				=> 'The location you entered is too long.',
 	'TOO_LONG_MSN'					=> 'The WLM name you entered is too long.',
 	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
-	'TOO_LONG_OCCUPATION'			=> 'The occupation you entered is too long.',
 	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
 	'TOO_LONG_USER_PASSWORD'		=> 'The password you entered is too long.',
 	'TOO_LONG_USERNAME'				=> 'The username you entered is too long.',
@@ -710,7 +709,6 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_LOCATION'			=> 'The location you entered is too short.',
 	'TOO_SHORT_MSN'					=> 'The WLM name you entered is too short.',
 	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
-	'TOO_SHORT_OCCUPATION'			=> 'The occupation you entered is too short.',
 	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
 	'TOO_SHORT_USER_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_USERNAME'			=> 'The username you entered is too short.',
-- 
cgit v1.2.1


From bbada27ee9e797c7f6ce997152bc1efb8c8f125d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 2 Feb 2014 21:45:59 +0100
Subject: [ticket/12115] Also port user interests to profile fields

PHPBB3-12115
---
 phpBB/language/en/common.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 2f985a23ac..bf03393b52 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -684,7 +684,6 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_CONFIRM_CODE'			=> 'The confirm code you entered is too long.',
 	'TOO_LONG_DATEFORMAT'			=> 'The date format you entered is too long.',
 	'TOO_LONG_ICQ'					=> 'The ICQ number you entered is too long.',
-	'TOO_LONG_INTERESTS'			=> 'The interests you entered is too long.',
 	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
 	'TOO_LONG_LOCATION'				=> 'The location you entered is too long.',
 	'TOO_LONG_MSN'					=> 'The WLM name you entered is too long.',
@@ -704,7 +703,6 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_CONFIRM_CODE'		=> 'The confirm code you entered is too short.',
 	'TOO_SHORT_DATEFORMAT'			=> 'The date format you entered is too short.',
 	'TOO_SHORT_ICQ'					=> 'The ICQ number you entered is too short.',
-	'TOO_SHORT_INTERESTS'			=> 'The interests you entered is too short.',
 	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
 	'TOO_SHORT_LOCATION'			=> 'The location you entered is too short.',
 	'TOO_SHORT_MSN'					=> 'The WLM name you entered is too short.',
-- 
cgit v1.2.1


From 6bee91c42915dd613e9714016006b25fa51cb24a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Feb 2014 15:00:49 +0100
Subject: [ticket/12169] Convert user_from to profile field location

Missing changes on memberlist view due to missing functionality

PHPBB3-12169
---
 phpBB/language/en/common.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index bf03393b52..896d2ef811 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -685,7 +685,6 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_DATEFORMAT'			=> 'The date format you entered is too long.',
 	'TOO_LONG_ICQ'					=> 'The ICQ number you entered is too long.',
 	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
-	'TOO_LONG_LOCATION'				=> 'The location you entered is too long.',
 	'TOO_LONG_MSN'					=> 'The WLM name you entered is too long.',
 	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
 	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
@@ -704,7 +703,6 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_DATEFORMAT'			=> 'The date format you entered is too short.',
 	'TOO_SHORT_ICQ'					=> 'The ICQ number you entered is too short.',
 	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
-	'TOO_SHORT_LOCATION'			=> 'The location you entered is too short.',
 	'TOO_SHORT_MSN'					=> 'The WLM name you entered is too short.',
 	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
-- 
cgit v1.2.1


From 995019a992ba5b0dca4cee6082af697552770c18 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 10 Feb 2014 16:28:21 +0100
Subject: [ticket/12169] Add new option to display profile fields on memberlist

PHPBB3-12169
---
 phpBB/language/en/acp/profile.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 8509845860..726a9bac82 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -65,6 +65,8 @@ $lang = array_merge($lang, array(
 	'DISPLAY_AT_PROFILE_EXPLAIN'	=> 'The user is able to change this profile field within the user control panel.',
 	'DISPLAY_AT_REGISTER'			=> 'Display on registration screen',
 	'DISPLAY_AT_REGISTER_EXPLAIN'	=> 'If this option is enabled, the field will be displayed on registration.',
+	'DISPLAY_ON_MEMBERLIST'			=> 'Display on memberlist screen',
+	'DISPLAY_ON_MEMBERLIST_EXPLAIN'	=> 'If this option is enabled, the field will be displayed in the user rows on the memberlist screen.',
 	'DISPLAY_ON_PM'					=> 'Display on view pm screen',
 	'DISPLAY_ON_PM_EXPLAIN'			=> 'If this option is enabled, the field will be displayed in the mini-profile on the pm screen.',
 	'DISPLAY_ON_VT'					=> 'Display on viewtopic screen',
-- 
cgit v1.2.1


From a589c88d252a9b792ff2f15c4daf2b6fa0018127 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Mon, 17 Feb 2014 11:25:27 -0800
Subject: [ticket/12206] Fix mismatched Plupload language vars preventing
 localization.

PHPBB3-12206
---
 phpBB/language/en/plupload.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/plupload.php b/phpBB/language/en/plupload.php
index 6039de7dbf..f174920f6b 100644
--- a/phpBB/language/en/plupload.php
+++ b/phpBB/language/en/plupload.php
@@ -46,9 +46,9 @@ $lang = array_merge($lang, array(
 	'PLUPLOAD_ERR_INPUT'		=> 'Failed to open input stream.',
 	'PLUPLOAD_ERR_MOVE_UPLOADED'	=> 'Failed to move uploaded file.',
 	'PLUPLOAD_ERR_OUTPUT'		=> 'Failed to open output stream.',
-	'PLUPLOAD_ERR_FILE_TOO_LARGE'	=> 'Error: File too large:',
+	'PLUPLOAD_ERR_FILE_TOO_LARGE'	=> 'File too large:',
 	'PLUPLOAD_ERR_FILE_COUNT'	=> 'File count error.',
-	'PLUPLOAD_ERR_FILE_INVALID_EXT'	=> 'Error: Invalid file extension:',
+	'PLUPLOAD_ERR_FILE_INVALID_EXT'	=> 'Invalid file extension:',
 	'PLUPLOAD_ERR_RUNTIME_MEMORY'	=> 'Runtime ran out of available memory.',
 	'PLUPLOAD_ERR_UPLOAD_URL'	=> 'Upload URL might be wrong or does not exist.',
 	'PLUPLOAD_EXTENSION_ERROR'	=> 'File extension error.',
-- 
cgit v1.2.1


From 6c8589775b8df2b6fbeffbe594d9279ae90e85ba Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 19 Feb 2014 16:11:40 -0600
Subject: [ticket/9871] Update version check file to use json format

PHPBB3-9871
---
 phpBB/language/en/install.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 03c9562983..081361f661 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -490,6 +490,7 @@ $lang = array_merge($lang, array(
 	'PREVIOUS_VERSION'					=> 'Previous version',
 	'PROGRESS'							=> 'Progress',
 
+	'RELEASE_ANNOUNCEMENT'		=> 'Announcement',
 	'RESULT'					=> 'Result',
 	'RUN_DATABASE_SCRIPT'		=> 'Update my database now',
 
@@ -532,7 +533,7 @@ $lang = array_merge($lang, array(
 
 		<h1>Release announcement</h1>
 
-		<p>Please read <a href="%1$s" title="%1$s"><strong>the release announcement for the latest version</strong></a> before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.</p>
+		<p>Please read the release announcement for the latest version before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.</p>
 
 		<br />
 
@@ -547,17 +548,11 @@ $lang = array_merge($lang, array(
 		</ul>
 
 		<p>Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.<br /><br />
-		<strong><a href="%2$s" title="%2$s">Now start the update process by pointing your browser to the install folder</a>.</strong><br />
+		<strong><a href="%1$s" title="%1$s">Now start the update process by pointing your browser to the install folder</a>.</strong><br />
 		<br />
 		You will then be guided through the update process. You will be notified once the update is complete.
 		</p>
 	',
-	'UPDATE_INSTRUCTIONS_INCOMPLETE'	=> '
-
-		<h1>Incomplete update detected</h1>
-
-		<p>phpBB detected an incomplete automatic update. Please make sure you followed every step within the automatic update tool. Below you will find the link again, or go directly to your install directory.</p>
-	',
 	'UPDATE_METHOD'					=> 'Update method',
 	'UPDATE_METHOD_EXPLAIN'			=> 'You are now able to choose your preferred update method. Using the FTP upload will present you with a form you need to enter your FTP account details into. With this method the files will be automatically moved to the new location and backups of the old files being created by appending .bak to the filename. If you choose to download the modified files you are able to unpack and upload them to their correct location manually later.',
 	'UPDATE_REQUIRES_FILE'			=> 'The updater requires that the following file is present: %s',
@@ -567,7 +562,6 @@ $lang = array_merge($lang, array(
 	'UPDATING_DATA'					=> 'Updating data',
 	'UPDATING_TO_LATEST_STABLE'		=> 'Updating database to latest stable release',
 	'UPDATED_VERSION'				=> 'Updated version',
-	'UPGRADE_INSTRUCTIONS'			=> 'A new feature release <strong>%1$s</strong> is available. Please read <a href="%2$s" title="%2$s"><strong>the release announcement</strong></a> to learn about what it has to offer, and how to upgrade.',
 	'UPLOAD_METHOD'					=> 'Upload method',
 
 	'UPDATE_DB_SUCCESS'				=> 'Database update was successful.',
-- 
cgit v1.2.1


From 87dfd76100572092bf2de18b0a5e5601bae75d91 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 24 Feb 2014 09:46:31 +0100
Subject: [ticket/12226] Split language strings to correctly allow multiple
 plural rules

PHPBB3-12226
---
 phpBB/language/en/common.php |  4 ++++
 phpBB/language/en/ucp.php    | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 896d2ef811..6ae5593bed 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -394,6 +394,10 @@ $lang = array_merge($lang, array(
 	'MERGE_TOPIC'			=> 'Merge topic',
 	'MESSAGE'				=> 'Message',
 	'MESSAGES'				=> 'Messages',
+	'MESSAGES_COUNT'		=> array(
+		1	=> '%d message',
+		2	=> '%d messages',
+	),
 	'MESSAGE_BODY'			=> 'Message body',
 	'MINUTES'				=> 'Minutes',
 	'MODERATE'				=> 'Moderate',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 6f392d6efe..fcfedfd2ca 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -216,8 +216,8 @@ $lang = array_merge($lang, array(
 	'FOES_UPDATED'				=> 'Your foes list has been updated successfully.',
 	'FOLDER_ADDED'				=> 'Folder successfully added.',
 	'FOLDER_MESSAGE_STATUS'		=> array(
-		1	=> '%2$d from %1$d message stored',
-		2	=> '%2$d from %1$d messages stored',
+		1	=> '%2$d from %1$s stored',
+		2	=> '%2$d from %1$s stored',
 	),
 	'FOLDER_NAME_EMPTY'			=> 'You must enter a name for this folder.',
 	'FOLDER_NAME_EXIST'			=> 'Folder <strong>%s</strong> already exists.',
@@ -225,8 +225,8 @@ $lang = array_merge($lang, array(
 	'FOLDER_RENAMED'			=> 'Folder successfully renamed.',
 	'FOLDER_REMOVED'			=> 'Folder successfully removed.',
 	'FOLDER_STATUS_MSG'			=> array(
-		1	=> 'Folder is %3$d%% full (%2$d from %1$d message stored)',
-		2	=> 'Folder is %3$d%% full (%2$d from %1$d messages stored)',
+		1	=> 'Folder is %3$d%% full (%2$d from %1$s stored)',
+		2	=> 'Folder is %3$d%% full (%2$d from %1$s stored)',
 	),
 	'FORWARD_PM'				=> 'Forward PM',
 	'FORCE_PASSWORD_EXPLAIN'	=> 'Before you may continue browsing the board you are required to change your password.',
@@ -297,7 +297,8 @@ $lang = array_merge($lang, array(
 	'MOVE_DOWN'						=> 'Move down',
 	'MOVE_MARKED_TO_FOLDER'			=> 'Move marked to %s',
 	'MOVE_PM_ERROR'					=> array(
-		2	=> 'An error occurred while moving the messages to the new folder, only %2d from %1d messages were moved.',
+		1	=> 'An error occurred while moving the messages to the new folder, only %2$d from %1$s was moved.',
+		2	=> 'An error occurred while moving the messages to the new folder, only %2$d from %1$s were moved.',
 	),
 	'MOVE_TO_FOLDER'				=> 'Move to folder',
 	'MOVE_UP'						=> 'Move up',
-- 
cgit v1.2.1


From bd00b8e9bf989ad77024d45fa7ef95eb9b9acb93 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 24 Feb 2014 09:48:36 +0100
Subject: [ticket/12227] "X from Y messages" should be "X out of Y messages"

PHPBB3-12227
---
 phpBB/language/en/ucp.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index fcfedfd2ca..08de2a3d40 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -216,8 +216,8 @@ $lang = array_merge($lang, array(
 	'FOES_UPDATED'				=> 'Your foes list has been updated successfully.',
 	'FOLDER_ADDED'				=> 'Folder successfully added.',
 	'FOLDER_MESSAGE_STATUS'		=> array(
-		1	=> '%2$d from %1$s stored',
-		2	=> '%2$d from %1$s stored',
+		1	=> '%2$d out of %1$s stored',
+		2	=> '%2$d out of %1$s stored',
 	),
 	'FOLDER_NAME_EMPTY'			=> 'You must enter a name for this folder.',
 	'FOLDER_NAME_EXIST'			=> 'Folder <strong>%s</strong> already exists.',
@@ -225,8 +225,8 @@ $lang = array_merge($lang, array(
 	'FOLDER_RENAMED'			=> 'Folder successfully renamed.',
 	'FOLDER_REMOVED'			=> 'Folder successfully removed.',
 	'FOLDER_STATUS_MSG'			=> array(
-		1	=> 'Folder is %3$d%% full (%2$d from %1$s stored)',
-		2	=> 'Folder is %3$d%% full (%2$d from %1$s stored)',
+		1	=> 'Folder is %3$d%% full (%2$d out of %1$s stored)',
+		2	=> 'Folder is %3$d%% full (%2$d out of %1$s stored)',
 	),
 	'FORWARD_PM'				=> 'Forward PM',
 	'FORCE_PASSWORD_EXPLAIN'	=> 'Before you may continue browsing the board you are required to change your password.',
@@ -297,8 +297,8 @@ $lang = array_merge($lang, array(
 	'MOVE_DOWN'						=> 'Move down',
 	'MOVE_MARKED_TO_FOLDER'			=> 'Move marked to %s',
 	'MOVE_PM_ERROR'					=> array(
-		1	=> 'An error occurred while moving the messages to the new folder, only %2$d from %1$s was moved.',
-		2	=> 'An error occurred while moving the messages to the new folder, only %2$d from %1$s were moved.',
+		1	=> 'An error occurred while moving the messages to the new folder, only %2$d out of %1$s was moved.',
+		2	=> 'An error occurred while moving the messages to the new folder, only %2$d out of %1$s were moved.',
 	),
 	'MOVE_TO_FOLDER'				=> 'Move to folder',
 	'MOVE_UP'						=> 'Move up',
-- 
cgit v1.2.1


From a823205403f2dbbd907c03e59fd232552351d566 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Feb 2014 11:05:48 +0100
Subject: [ticket/12233] Allow profile fields to be contact fields

Contact fields are displayed with in the contact section of the user profile
and are displayed differently in the mini profile next to posts and private
messages

PHPBB3-12233
---
 phpBB/language/en/acp/profile.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 726a9bac82..0ea95c35ba 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -82,6 +82,8 @@ $lang = array_merge($lang, array(
 	'EVERYTHING_OK'					=> 'Everything OK',
 
 	'FIELD_BOOL'				=> 'Boolean (Yes/No)',
+	'FIELD_CONTACT_DESC'		=> 'Contact description',
+	'FIELD_CONTACT_URL'			=> 'Contact link',
 	'FIELD_DATE'				=> 'Date',
 	'FIELD_DESCRIPTION'			=> 'Field description',
 	'FIELD_DESCRIPTION_EXPLAIN'	=> 'The explanation for this field presented to the user.',
@@ -90,6 +92,8 @@ $lang = array_merge($lang, array(
 	'FIELD_IDENT_ALREADY_EXIST'	=> 'The chosen field identification already exist. Please choose another name.',
 	'FIELD_IDENT_EXPLAIN'		=> 'The field identification is a name to identify the profile field within the database and the templates.',
 	'FIELD_INT'					=> 'Numbers',
+	'FIELD_IS_CONTACT'			=> 'Display field as a contact field',
+	'FIELD_IS_CONTACT_EXPLAIN'	=> 'Contact fields are displayed with in the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages.',
 	'FIELD_LENGTH'				=> 'Length of input box',
 	'FIELD_NOT_FOUND'			=> 'Profile field not found.',
 	'FIELD_STRING'				=> 'Single text field',
-- 
cgit v1.2.1


From 76409388afcd6389b5a29bc54b49faaf6bc4b4a5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Feb 2014 15:11:17 +0100
Subject: [ticket/12234] Replace ICQ with custom profile field

PHPBB3-12234
---
 phpBB/language/en/acp/styles.php | 1 -
 phpBB/language/en/common.php     | 4 ----
 phpBB/language/en/memberlist.php | 1 -
 phpBB/language/en/ucp.php        | 1 -
 4 files changed, 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index e7954ff148..0fac0a020b 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -184,7 +184,6 @@ $lang = array_merge($lang, array(
 
 	'IMG_ICON_CONTACT_AIM'		=> 'AIM',
 	'IMG_ICON_CONTACT_EMAIL'	=> 'Send email',
-	'IMG_ICON_CONTACT_ICQ'		=> 'ICQ',
 	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
 	'IMG_ICON_CONTACT_MSNM'		=> 'WLM',
 	'IMG_ICON_CONTACT_PM'		=> 'Send message',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 896d2ef811..9586d25ed3 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -319,7 +319,6 @@ $lang = array_merge($lang, array(
 	'HOME'							=> 'Home',
 
 	'ICQ'						=> 'ICQ',
-	'ICQ_STATUS'				=> 'ICQ status',
 	'IF'						=> 'If',
 	'IMAGE'						=> 'Image',
 	'IMAGE_FILETYPE_INVALID'	=> 'Image file type %d for mimetype %s not supported.',
@@ -683,7 +682,6 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_AIM'					=> 'The screenname you entered is too long.',
 	'TOO_LONG_CONFIRM_CODE'			=> 'The confirm code you entered is too long.',
 	'TOO_LONG_DATEFORMAT'			=> 'The date format you entered is too long.',
-	'TOO_LONG_ICQ'					=> 'The ICQ number you entered is too long.',
 	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
 	'TOO_LONG_MSN'					=> 'The WLM name you entered is too long.',
 	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
@@ -701,7 +699,6 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_AIM'					=> 'The screenname you entered is too short.',
 	'TOO_SHORT_CONFIRM_CODE'		=> 'The confirm code you entered is too short.',
 	'TOO_SHORT_DATEFORMAT'			=> 'The date format you entered is too short.',
-	'TOO_SHORT_ICQ'					=> 'The ICQ number you entered is too short.',
 	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
 	'TOO_SHORT_MSN'					=> 'The WLM name you entered is too short.',
 	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
@@ -826,7 +823,6 @@ $lang = array_merge($lang, array(
 	'WRONG_PASSWORD'	=> 'You entered an incorrect password.',
 
 	'WRONG_DATA_COLOUR'			=> 'The colour value you entered is invalid.',
-	'WRONG_DATA_ICQ'			=> 'The number you entered is not a valid ICQ number.',
 	'WRONG_DATA_JABBER'			=> 'The name you entered is not a valid Jabber account name.',
 	'WRONG_DATA_LANG'			=> 'The language you specified is not valid.',
 	'WRONG_DATA_WEBSITE'		=> 'The website address has to be a valid URL, including the protocol. For example http://www.example.com/.',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 8162f195eb..cfd1dacc45 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -74,7 +74,6 @@ $lang = array_merge($lang, array(
 	'IM_AIM'				=> 'Please note that you need AOL Instant Messenger installed to use this.',
 	'IM_AIM_EXPRESS'		=> 'AIM Express',
 	'IM_DOWNLOAD_APP'		=> 'Download application',
-	'IM_ICQ'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
 	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
 	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
 	'IM_MESSAGE'			=> 'Your message',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 6f392d6efe..1520af9ef8 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -492,7 +492,6 @@ $lang = array_merge($lang, array(
 	'UCP_COPPA_BEFORE'			=> 'Before %s',
 	'UCP_COPPA_ON_AFTER'		=> 'On or after %s',
 	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. You will receive an email at the address you provide that contains an account activation link.',
-	'UCP_ICQ'					=> 'ICQ number',
 	'UCP_JABBER'				=> 'Jabber address',
 	'UCP_LOGIN_LINK'			=> 'Set up an external account association',
 
-- 
cgit v1.2.1


From 87fa7b98cc59cfdd46559f225d3bae83fcdc3dc1 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 2 Mar 2014 11:58:26 -0800
Subject: [ticket/11645] Rename .MODs tab in ACP to Extensions

http://tracker.phpbb.com/browse/PHPBB3-11645

PHPBB3-11645
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 0117d85433..0e867c64a9 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -61,7 +61,7 @@ $lang = array_merge($lang, array(
 
 	'ACP_CAT_CUSTOMISE'			=> 'Customise',
 	'ACP_CAT_DATABASE'			=> 'Database',
-	'ACP_CAT_DOT_MODS'			=> '.MODs',
+	'ACP_CAT_DOT_MODS'			=> 'Extensions',
 	'ACP_CAT_FORUMS'			=> 'Forums',
 	'ACP_CAT_GENERAL'			=> 'General',
 	'ACP_CAT_MAINTENANCE'		=> 'Maintenance',
-- 
cgit v1.2.1


From a2f2629e2a5038aca372cc3e55c408a99b6ca6fc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 11 Feb 2014 23:02:54 +0100
Subject: [ticket/12187] Add URL type for profile fields

PHPBB3-12187
---
 phpBB/language/en/acp/profile.php | 1 +
 phpBB/language/en/ucp.php         | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 0ea95c35ba..93162daa45 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -100,6 +100,7 @@ $lang = array_merge($lang, array(
 	'FIELD_TEXT'				=> 'Textarea',
 	'FIELD_TYPE'				=> 'Field type',
 	'FIELD_TYPE_EXPLAIN'		=> 'You are not able to change the field type later.',
+	'FIELD_URL'					=> 'URL (Link)',
 	'FIELD_VALIDATION'			=> 'Field validation',
 	'FIRST_OPTION'				=> 'First option',
 
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 1520af9ef8..6970319397 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -209,6 +209,7 @@ $lang = array_merge($lang, array(
 	'FIELD_INVALID_CHARS_ALPHA_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric characters are allowed.',
 	'FIELD_INVALID_CHARS_SPACERS_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
 	'FIELD_INVALID_DATE'				=> 'The field “%s” has an invalid date.',
+	'FIELD_INVALID_URL'					=> 'The field “%s” has an invalid url.',
 	'FIELD_INVALID_VALUE'				=> 'The field “%s” has an invalid value.',
 
 	'FOE_MESSAGE'				=> 'Message from foe',
-- 
cgit v1.2.1


From 321d430dbafb38468ce2e48a32c614be4756d554 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 3 Mar 2014 08:21:01 -0800
Subject: [ticket/12244] Rename link to Extensions Manager in the ACP

PHPBB3-12244
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 0e867c64a9..5a610afe93 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -83,7 +83,7 @@ $lang = array_merge($lang, array(
 	'ACP_EMAIL_SETTINGS'		=> 'Email settings',
 	'ACP_EXTENSION_GROUPS'		=> 'Manage attachment extension groups',
 	'ACP_EXTENSION_MANAGEMENT'	=> 'Extension management',
-	'ACP_EXTENSIONS'			=> 'Extensions',
+	'ACP_EXTENSIONS'			=> 'Extensions Manager',
 
 
 	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
-- 
cgit v1.2.1


From 5b1fbfb2f2c901b89bb1163503b0468e11bbc307 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 3 Mar 2014 20:01:19 +0100
Subject: [ticket/12187] Remove user_website functionality

PHPBB3-12187
---
 phpBB/language/en/acp/styles.php | 1 -
 phpBB/language/en/common.php     | 3 ---
 phpBB/language/en/memberlist.php | 2 --
 phpBB/language/en/viewtopic.php  | 1 -
 4 files changed, 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 0fac0a020b..093abbd3fa 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -188,7 +188,6 @@ $lang = array_merge($lang, array(
 	'IMG_ICON_CONTACT_MSNM'		=> 'WLM',
 	'IMG_ICON_CONTACT_PM'		=> 'Send message',
 	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',
-	'IMG_ICON_CONTACT_WWW'		=> 'Website',
 
 	'IMG_ICON_POST_DELETE'			=> 'Delete post',
 	'IMG_ICON_POST_EDIT'			=> 'Edit post',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 9586d25ed3..529d556dbe 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -689,7 +689,6 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_USER_PASSWORD'		=> 'The password you entered is too long.',
 	'TOO_LONG_USERNAME'				=> 'The username you entered is too long.',
 	'TOO_LONG_EMAIL'				=> 'The email address you entered is too long.',
-	'TOO_LONG_WEBSITE'				=> 'The website address you entered is too long.',
 	'TOO_LONG_YIM'					=> 'The Yahoo! Messenger name you entered is too long.',
 
 	'TOO_MANY_VOTE_OPTIONS'			=> 'You have tried to vote for too many options.',
@@ -706,7 +705,6 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_USER_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_USERNAME'			=> 'The username you entered is too short.',
 	'TOO_SHORT_EMAIL'				=> 'The email address you entered is too short.',
-	'TOO_SHORT_WEBSITE'				=> 'The website address you entered is too short.',
 	'TOO_SHORT_YIM'					=> 'The Yahoo! Messenger name you entered is too short.',
 
 	'TOO_SMALL'						=> 'The value you entered is too small.',
@@ -825,7 +823,6 @@ $lang = array_merge($lang, array(
 	'WRONG_DATA_COLOUR'			=> 'The colour value you entered is invalid.',
 	'WRONG_DATA_JABBER'			=> 'The name you entered is not a valid Jabber account name.',
 	'WRONG_DATA_LANG'			=> 'The language you specified is not valid.',
-	'WRONG_DATA_WEBSITE'		=> 'The website address has to be a valid URL, including the protocol. For example http://www.example.com/.',
 	'WROTE'						=> 'wrote',
 
 	'YEAR'				=> 'Year',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index cfd1dacc45..a7ded62648 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -143,6 +143,4 @@ $lang = array_merge($lang, array(
 
 	'VIEWING_PROFILE'		=> 'Viewing profile - %s',
 	'VISITED'				=> 'Last visited',
-
-	'WWW'					=> 'Website',
 ));
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 424cb9da3e..b566f4b5c0 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -118,7 +118,6 @@ $lang = array_merge($lang, array(
 		2	=> '%d posts',
 	),
 	'VIEW_UNREAD_POST'		=> 'First unread post',
-	'VISIT_WEBSITE'			=> 'WWW',
 	'VOTE_SUBMITTED'		=> 'Your vote has been cast.',
 	'VOTE_CONVERTED'		=> 'Changing votes is not supported for converted polls.',
 
-- 
cgit v1.2.1


From d40fb32dcdc447cd284d8c5dbffa845b142f1eeb Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Mon, 3 Mar 2014 21:11:06 +0100
Subject: [ticket/8785] Rebuilding posting_editor pm head + new language vars

PHPBB3-8785
---
 phpBB/language/en/ucp.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 6f392d6efe..3a6f2faf02 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -472,7 +472,11 @@ $lang = array_merge($lang, array(
 	'TIMEZONE'					=> 'Timezone',
 	'TIMEZONE_DATE_SUGGESTION'	=> 'Suggestion: %s',
 	'TIMEZONE_INVALID'			=> 'The timezone you selected is invalid.',
-	'TO'						=> 'To',
+	'TO'						=> 'Recipient',
+	'TO_MASS'					=> 'Recipients',
+	'TO_ADD'					=> 'Add recipient',
+	'TO_ADD_MASS'				=> 'Add recipients',
+	'TO_ADD_GROUPS'				=> 'Add groups',
 	'TOO_MANY_RECIPIENTS'		=> 'You tried to send a private message to too many recipients.',
 	'TOO_MANY_REGISTERS'		=> 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',
 
-- 
cgit v1.2.1


From 83a7e632b9b21fed88a3dbea679580d0740664f7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 4 Mar 2014 10:19:08 +0100
Subject: [ticket/12235] Convert WLM to custom profile field

PHPBB3-12235
---
 phpBB/language/en/acp/styles.php | 1 -
 phpBB/language/en/common.php     | 4 +---
 phpBB/language/en/memberlist.php | 4 ----
 phpBB/language/en/ucp.php        | 1 -
 4 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 093abbd3fa..eef669220a 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -185,7 +185,6 @@ $lang = array_merge($lang, array(
 	'IMG_ICON_CONTACT_AIM'		=> 'AIM',
 	'IMG_ICON_CONTACT_EMAIL'	=> 'Send email',
 	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
-	'IMG_ICON_CONTACT_MSNM'		=> 'WLM',
 	'IMG_ICON_CONTACT_PM'		=> 'Send message',
 	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',
 
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 529d556dbe..23a274bf01 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -400,7 +400,6 @@ $lang = array_merge($lang, array(
 	'MODERATORS'			=> 'Moderators',
 	'MONTH'					=> 'Month',
 	'MOVE'					=> 'Move',
-	'MSNM'					=> 'WLM',
 
 	'NA'						=> 'N/A',
 	'NEWEST_USER'				=> 'Our newest member <strong>%s</strong>',
@@ -683,7 +682,6 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_CONFIRM_CODE'			=> 'The confirm code you entered is too long.',
 	'TOO_LONG_DATEFORMAT'			=> 'The date format you entered is too long.',
 	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
-	'TOO_LONG_MSN'					=> 'The WLM name you entered is too long.',
 	'TOO_LONG_NEW_PASSWORD'			=> 'The password you entered is too long.',
 	'TOO_LONG_PASSWORD_CONFIRM'		=> 'The password confirmation you entered is too long.',
 	'TOO_LONG_USER_PASSWORD'		=> 'The password you entered is too long.',
@@ -699,7 +697,6 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_CONFIRM_CODE'		=> 'The confirm code you entered is too short.',
 	'TOO_SHORT_DATEFORMAT'			=> 'The date format you entered is too short.',
 	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
-	'TOO_SHORT_MSN'					=> 'The WLM name you entered is too short.',
 	'TOO_SHORT_NEW_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_PASSWORD_CONFIRM'	=> 'The password confirmation you entered is too short.',
 	'TOO_SHORT_USER_PASSWORD'		=> 'The password you entered is too short.',
@@ -818,6 +815,7 @@ $lang = array_merge($lang, array(
 	'WEBSITE'			=> 'Website',
 	'WHOIS'				=> 'Whois',
 	'WHO_IS_ONLINE'		=> 'Who is online',
+	'WLM'				=> 'WLM',
 	'WRONG_PASSWORD'	=> 'You entered an incorrect password.',
 
 	'WRONG_DATA_COLOUR'			=> 'The colour value you entered is invalid.',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index a7ded62648..e641236420 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -77,9 +77,6 @@ $lang = array_merge($lang, array(
 	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
 	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
 	'IM_MESSAGE'			=> 'Your message',
-	'IM_MSNM'				=> 'Please note that you need Windows Live Messenger installed to use this.',
-	'IM_MSNM_BROWSER'		=> 'Your browser does not support this.',
-	'IM_MSNM_CONNECT'		=> 'WLM is not connected.\nYou have to connect to WLM to continue.',
 	'IM_NAME'				=> 'Your Name',
 	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
 	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
@@ -122,7 +119,6 @@ $lang = array_merge($lang, array(
 	'SEND_IM'				=> 'Instant messaging',
 	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
 	'SEND_MESSAGE'			=> 'Message',
-	'SEND_MSNM_MESSAGE'		=> 'Send WLM message',
 	'SEND_YIM_MESSAGE'		=> 'Send YIM message',
 	'SORT_EMAIL'			=> 'Email',
 	'SORT_LAST_ACTIVE'		=> 'Last active',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 6970319397..3797162375 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -503,7 +503,6 @@ $lang = array_merge($lang, array(
 	'UCP_MAIN_FRONT'			=> 'Front page',
 	'UCP_MAIN_SUBSCRIBED'		=> 'Manage subscriptions',
 
-	'UCP_MSNM'					=> 'Windows Live Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files.',
 
 	'UCP_NOTIFICATION_LIST'				=> 'Manage notifications',
-- 
cgit v1.2.1


From 2e5106aae1bfe83ad8b2336a6d519da5aabc59d2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 4 Mar 2014 11:22:55 +0100
Subject: [ticket/12237] Convert yahoo messanger to custom profile field

PHPBB3-12237
---
 phpBB/language/en/acp/styles.php | 1 -
 phpBB/language/en/common.php     | 4 +---
 phpBB/language/en/ucp.php        | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index eef669220a..6954702f1f 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -186,7 +186,6 @@ $lang = array_merge($lang, array(
 	'IMG_ICON_CONTACT_EMAIL'	=> 'Send email',
 	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
 	'IMG_ICON_CONTACT_PM'		=> 'Send message',
-	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',
 
 	'IMG_ICON_POST_DELETE'			=> 'Delete post',
 	'IMG_ICON_POST_EDIT'			=> 'Edit post',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index eba423deff..144ffd33d5 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -691,7 +691,6 @@ $lang = array_merge($lang, array(
 	'TOO_LONG_USER_PASSWORD'		=> 'The password you entered is too long.',
 	'TOO_LONG_USERNAME'				=> 'The username you entered is too long.',
 	'TOO_LONG_EMAIL'				=> 'The email address you entered is too long.',
-	'TOO_LONG_YIM'					=> 'The Yahoo! Messenger name you entered is too long.',
 
 	'TOO_MANY_VOTE_OPTIONS'			=> 'You have tried to vote for too many options.',
 
@@ -706,7 +705,6 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_USER_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_USERNAME'			=> 'The username you entered is too short.',
 	'TOO_SHORT_EMAIL'				=> 'The email address you entered is too short.',
-	'TOO_SHORT_YIM'					=> 'The Yahoo! Messenger name you entered is too short.',
 
 	'TOO_SMALL'						=> 'The value you entered is too small.',
 	'TOO_SMALL_MAX_RECIPIENTS'		=> 'The value of <strong>Maximum number of allowed recipients per private message</strong> setting you entered is too small.',
@@ -830,7 +828,7 @@ $lang = array_merge($lang, array(
 	'YEAR'				=> 'Year',
 	'YEAR_MONTH_DAY'	=> '(YYYY-MM-DD)',
 	'YES'				=> 'Yes',
-	'YIM'				=> 'YIM',
+	'YIM'				=> 'Yahoo Messenger',
 	'YOU_LAST_VISIT'	=> 'Last visit was: %s',
 
 	'datetime'			=> array(
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 42fd0fd506..4fa73667cb 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -539,7 +539,6 @@ $lang = array_merge($lang, array(
 	'UCP_REMIND'					=> 'Send password',
 	'UCP_RESEND'					=> 'Send activation email',
 	'UCP_WELCOME'					=> 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',
-	'UCP_YIM'						=> 'Yahoo Messenger',
 	'UCP_ZEBRA'						=> 'Friends &amp; Foes',
 	'UCP_ZEBRA_FOES'				=> 'Manage foes',
 	'UCP_ZEBRA_FRIENDS'				=> 'Manage friends',
-- 
cgit v1.2.1


From f2059f52f3f8f430888366b70aa07c534abb35a1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 5 Mar 2014 22:13:22 +0100
Subject: [ticket/12236] Move AOL Instant Messanger field to custom profile
 field

PHPBB3-12236
---
 phpBB/language/en/acp/styles.php | 1 -
 phpBB/language/en/common.php     | 2 --
 phpBB/language/en/memberlist.php | 3 ---
 phpBB/language/en/ucp.php        | 1 -
 4 files changed, 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 6954702f1f..e7c149600d 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -182,7 +182,6 @@ $lang = array_merge($lang, array(
 
 	'IMG_ICON_BACK_TOP'		=> 'Top',
 
-	'IMG_ICON_CONTACT_AIM'		=> 'AIM',
 	'IMG_ICON_CONTACT_EMAIL'	=> 'Send email',
 	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
 	'IMG_ICON_CONTACT_PM'		=> 'Send message',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 144ffd33d5..2ccff566d4 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -682,7 +682,6 @@ $lang = array_merge($lang, array(
 
 	'TOO_LONG'						=> 'The value you entered is too long.',
 
-	'TOO_LONG_AIM'					=> 'The screenname you entered is too long.',
 	'TOO_LONG_CONFIRM_CODE'			=> 'The confirm code you entered is too long.',
 	'TOO_LONG_DATEFORMAT'			=> 'The date format you entered is too long.',
 	'TOO_LONG_JABBER'				=> 'The Jabber account name you entered is too long.',
@@ -696,7 +695,6 @@ $lang = array_merge($lang, array(
 
 	'TOO_SHORT'						=> 'The value you entered is too short.',
 
-	'TOO_SHORT_AIM'					=> 'The screenname you entered is too short.',
 	'TOO_SHORT_CONFIRM_CODE'		=> 'The confirm code you entered is too short.',
 	'TOO_SHORT_DATEFORMAT'			=> 'The date format you entered is too short.',
 	'TOO_SHORT_JABBER'				=> 'The Jabber account name you entered is too short.',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index e641236420..83f5e4107e 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -71,8 +71,6 @@ $lang = array_merge($lang, array(
 	'HIDE_MEMBER_SEARCH'	=> 'Hide member search',
 
 	'IM_ADD_CONTACT'		=> 'Add Contact',
-	'IM_AIM'				=> 'Please note that you need AOL Instant Messenger installed to use this.',
-	'IM_AIM_EXPRESS'		=> 'AIM Express',
 	'IM_DOWNLOAD_APP'		=> 'Download application',
 	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
 	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s.',
@@ -114,7 +112,6 @@ $lang = array_merge($lang, array(
 
 	'SELECT_MARKED'			=> 'Select marked',
 	'SELECT_SORT_METHOD'	=> 'Select sort method',
-	'SEND_AIM_MESSAGE'		=> 'Send AIM message',
 	'SEND_ICQ_MESSAGE'		=> 'Send ICQ message',
 	'SEND_IM'				=> 'Instant messaging',
 	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 4fa73667cb..a0f7a32116 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -481,7 +481,6 @@ $lang = array_merge($lang, array(
 	'UCP'						=> 'User Control Panel',
 	'UCP_ACTIVATE'				=> 'Activate account',
 	'UCP_ADMIN_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will receive an email at the address you specified.',
-	'UCP_AIM'					=> 'AOL Instant Messenger',
 	'UCP_ATTACHMENTS'			=> 'Attachments',
 	'UCP_AUTH_LINK'				=> 'External accounts',
 	'UCP_AUTH_LINK_ASK'			=> 'You currently have no account associated with this external service. Click the button below to link your board account to an account with this external service.',
-- 
cgit v1.2.1


From d380cdec02f2d5a6d6b4756570031af87590905a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Mar 2014 01:41:38 +0100
Subject: [ticket/12236] Fix language key name for Yahoo Messanger

PHPBB3-12236
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 2ccff566d4..5ab420cf76 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -823,10 +823,10 @@ $lang = array_merge($lang, array(
 	'WRONG_DATA_LANG'			=> 'The language you specified is not valid.',
 	'WROTE'						=> 'wrote',
 
+	'YAHOO'				=> 'Yahoo Messenger',
 	'YEAR'				=> 'Year',
 	'YEAR_MONTH_DAY'	=> '(YYYY-MM-DD)',
 	'YES'				=> 'Yes',
-	'YIM'				=> 'Yahoo Messenger',
 	'YOU_LAST_VISIT'	=> 'Last visit was: %s',
 
 	'datetime'			=> array(
-- 
cgit v1.2.1


From 600e5f6c1194c7156837f1b9f627896b8c13f691 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Mar 2014 12:28:36 +0100
Subject: [ticket/12251] Add string validation for a-zA-Z0-9 and underscore

PHPBB3-12251
---
 phpBB/language/en/acp/profile.php | 1 +
 phpBB/language/en/ucp.php         | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 93162daa45..dc42693ca7 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -39,6 +39,7 @@ $lang = array_merge($lang, array(
 	'ADDED_PROFILE_FIELD'	=> 'Successfully added custom profile field.',
 	'ALPHA_ONLY'			=> 'Alphanumeric only',
 	'ALPHA_SPACERS'			=> 'Alphanumeric and spacers',
+	'ALPHA_UNDERSCORE'		=> 'Alphanumeric and underscores',
 	'ALWAYS_TODAY'			=> 'Always the current date',
 
 	'BOOL_ENTRIES_EXPLAIN'	=> 'Enter your options now',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index a0f7a32116..58bb1d4b3a 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -205,9 +205,11 @@ $lang = array_merge($lang, array(
 	),
 	'FIELD_TOO_SMALL'					=> 'The value of “%2$s” is too small, a minimum value of %1$d is required.',
 	'FIELD_TOO_LARGE'					=> 'The value of “%2$s” is too large, a maximum value of %1$d is allowed.',
+	'FIELD_INVALID_CHARS_INVALID'		=> 'The field “%s” has invalid characters.',
 	'FIELD_INVALID_CHARS_NUMBERS_ONLY'	=> 'The field “%s” has invalid characters, only numbers are allowed.',
 	'FIELD_INVALID_CHARS_ALPHA_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric characters are allowed.',
-	'FIELD_INVALID_CHARS_SPACERS_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
+	'FIELD_INVALID_CHARS_ALPHA_SPACERS'	=> 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
+	'FIELD_INVALID_CHARS_ALPHA_UNDERSCORE'	=> 'The field “%s” has invalid characters, only alphanumeric or _ characters are allowed.',
 	'FIELD_INVALID_DATE'				=> 'The field “%s” has an invalid date.',
 	'FIELD_INVALID_URL'					=> 'The field “%s” has an invalid url.',
 	'FIELD_INVALID_VALUE'				=> 'The field “%s” has an invalid value.',
-- 
cgit v1.2.1


From 92fe7e61c2c94c937f18d24da6421aeefdfac1e4 Mon Sep 17 00:00:00 2001
From: Suhaib Khan <suhebjerk@gmail.com>
Date: Mon, 10 Mar 2014 23:42:56 +0530
Subject: [ticket/11666] Removing MESSAGE_DELETED..

..in /en/posting.php as it is not used.

PHPBB3-11666
---
 phpBB/language/en/posting.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index ab851638ae..69f669b7b8 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -156,7 +156,6 @@ $lang = array_merge($lang, array(
 		1	=> 'Enter your message here, it may contain no more than <strong>%d</strong> character.',
 		2	=> 'Enter your message here, it may contain no more than <strong>%d</strong> characters.',
 	),
-	'MESSAGE_DELETED'			=> 'This message has been deleted successfully.',
 	'MORE_SMILIES'				=> 'View more smilies',
 
 	'NOTIFY_REPLY'				=> 'Notify me when a reply is posted',
-- 
cgit v1.2.1


From 9b1620911d9aff51bcb31607e9e0870c8c5fef89 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 11 Mar 2014 08:36:51 -0700
Subject: [ticket/12244] Rename extensions manager tab

PHPBB3-12244
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 5a610afe93..5f004287ff 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -83,7 +83,7 @@ $lang = array_merge($lang, array(
 	'ACP_EMAIL_SETTINGS'		=> 'Email settings',
 	'ACP_EXTENSION_GROUPS'		=> 'Manage attachment extension groups',
 	'ACP_EXTENSION_MANAGEMENT'	=> 'Extension management',
-	'ACP_EXTENSIONS'			=> 'Extensions Manager',
+	'ACP_EXTENSIONS'			=> 'Manage extensions',
 
 
 	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
-- 
cgit v1.2.1


From 9419edd6862aabf59a989ab7cb88d938cf3b0247 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 12 Mar 2014 00:56:07 +0100
Subject: [ticket/8041] Merge item name into "Return to" string for better
 translations

PHPBB3-8041
---
 phpBB/language/en/acp/common.php | 1 -
 phpBB/language/en/common.php     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 0e867c64a9..a44002559a 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -288,7 +288,6 @@ $lang = array_merge($lang, array(
 	'RESYNC'							=> 'Resynchronise',
 	'RESYNC_FILES_STATS'				=> 'Resynchronise files statistics',
 	'RESYNC_FILES_STATS_EXPLAIN'		=> 'Recalculates the total number and size of files attached to posts and private messages.',
-	'RETURN_TO'							=> 'Return to…',
 
 	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
 	'SELECT_OPTION'			=> 'Select option',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 1550271a3e..0385edcc41 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -600,7 +600,7 @@ $lang = array_merge($lang, array(
 	'RETURN_FORUM'				=> '%sReturn to the forum last visited%s',
 	'RETURN_PAGE'				=> '%sReturn to the previous page%s',
 	'RETURN_TOPIC'				=> '%sReturn to the topic last visited%s',
-	'RETURN_TO'					=> 'Return to',
+	'RETURN_TO'					=> 'Return to %s',
 	'FEED'						=> 'Feed',
 	'FEED_NEWS'					=> 'News',
 	'FEED_TOPICS_ACTIVE'		=> 'Active Topics',
-- 
cgit v1.2.1


From dfa077710f02d08c375a08b39d53c83148d9abf5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 12 Mar 2014 18:47:02 +0100
Subject: [ticket/8041] Wrap forum name, topic title and pm folder name with
 quotes

PHPBB3-8041
---
 phpBB/language/en/common.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 0385edcc41..430768475a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -600,7 +600,8 @@ $lang = array_merge($lang, array(
 	'RETURN_FORUM'				=> '%sReturn to the forum last visited%s',
 	'RETURN_PAGE'				=> '%sReturn to the previous page%s',
 	'RETURN_TOPIC'				=> '%sReturn to the topic last visited%s',
-	'RETURN_TO'					=> 'Return to %s',
+	'RETURN_TO'					=> 'Return to “%s”',
+	'RETURN_TO_INDEX'			=> 'Return to Board Index',
 	'FEED'						=> 'Feed',
 	'FEED_NEWS'					=> 'News',
 	'FEED_TOPICS_ACTIVE'		=> 'Active Topics',
-- 
cgit v1.2.1


From 0c02eae1ad2e5a3b57ec74ed79b7abe74060124b Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Thu, 13 Mar 2014 20:58:05 +0100
Subject: [ticket/11787] Changes <samp> to <strong> in en/acp/permissions.php

PHPBB3-11787
---
 phpBB/language/en/acp/permissions.php | 86 +++++++++++++++++------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 709836e828..6e3ba6876a 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -57,7 +57,7 @@ $lang = array_merge($lang, array(
 
 	'ACL_NEVER'				=> 'Never',
 	'ACL_SET'				=> 'Setting permissions',
-	'ACL_SET_EXPLAIN'		=> 'Permissions are based on a simple <samp>YES</samp>/<samp>NO</samp> system. Setting an option to <samp>NEVER</samp> for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select <samp>NO</samp>. If values are assigned for this option elsewhere they will be used in preference, else <samp>NEVER</samp> is assumed. All objects marked (with the checkbox in front of them) will copy the permission set you defined.',
+	'ACL_SET_EXPLAIN'		=> 'Permissions are based on a simple <strong>YES</strong>/<strong>NO</strong> system. Setting an option to <strong>NEVER</strong> for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select <strong>NO</strong>. If values are assigned for this option elsewhere they will be used in preference, else <strong>NEVER</strong> is assumed. All objects marked (with the checkbox in front of them) will copy the permission set you defined.',
 	'ACL_SETTING'			=> 'Setting',
 
 	'ACL_TYPE_A_'			=> 'Administrative permissions',
@@ -100,10 +100,10 @@ $lang = array_merge($lang, array(
 	'ADD_USERS'					=> 'Add users',
 	'ADVANCED_PERMISSIONS'		=> 'Advanced Permissions',
 	'ALL_GROUPS'				=> 'Select all groups',
-	'ALL_NEVER'					=> 'All <samp>NEVER</samp>',
-	'ALL_NO'					=> 'All <samp>NO</samp>',
+	'ALL_NEVER'					=> 'All <strong>NEVER</strong>',
+	'ALL_NO'					=> 'All <strong>NO</strong>',
 	'ALL_USERS'					=> 'Select all users',
-	'ALL_YES'					=> 'All <samp>YES</samp>',
+	'ALL_YES'					=> 'All <strong>YES</strong>',
 	'APPLY_ALL_PERMISSIONS'		=> 'Apply all permissions',
 	'APPLY_PERMISSIONS'			=> 'Apply permissions',
 	'APPLY_PERMISSIONS_EXPLAIN'	=> 'The permissions and role defined for this item will only be applied to this item and all checked items.',
@@ -137,7 +137,7 @@ $lang = array_merge($lang, array(
 
 	'NO_AUTH_SETTING_FOUND'		=> 'Permission settings not defined.',
 	'NO_ROLE_ASSIGNED'			=> 'No role assigned…',
-	'NO_ROLE_ASSIGNED_EXPLAIN'	=> 'Setting to this role does not change permissions on the right. If you want to unset/remove all permissions you should use the “All <samp>NO</samp>” link.',
+	'NO_ROLE_ASSIGNED_EXPLAIN'	=> 'Setting to this role does not change permissions on the right. If you want to unset/remove all permissions you should use the “All <strong>NO</strong>” link.',
 	'NO_ROLE_AVAILABLE'			=> 'No role available',
 	'NO_ROLE_NAME_SPECIFIED'	=> 'Please give the role a name.',
 	'NO_ROLE_SELECTED'			=> 'Role could not be found.',
@@ -196,7 +196,7 @@ $lang = array_merge($lang, array(
 	'ROLE_DESCRIPTION_FORUM_POLLS'			=> 'Like Standard Access but can also create polls.',
 	'ROLE_DESCRIPTION_FORUM_READONLY'		=> 'Can read the forum, but cannot create new topics or reply to posts.',
 	'ROLE_DESCRIPTION_FORUM_STANDARD'		=> 'Can use most forum features including attachments and deleting own topics, but cannot lock own topics, and cannot create polls.',
-	'ROLE_DESCRIPTION_FORUM_NEW_MEMBER'		=> 'A role for members of the special newly registered users group; contains <samp>NEVER</samp> permissions to lock features for new users.',
+	'ROLE_DESCRIPTION_FORUM_NEW_MEMBER'		=> 'A role for members of the special newly registered users group; contains <strong>NEVER</strong> permissions to lock features for new users.',
 	'ROLE_DESCRIPTION_MOD_FULL'				=> 'Can use all moderating features, including banning.',
 	'ROLE_DESCRIPTION_MOD_QUEUE'			=> 'Can use the Moderation Queue to validate and edit posts, but nothing else.',
 	'ROLE_DESCRIPTION_MOD_SIMPLE'			=> 'Can only use basic topic actions. Cannot send warnings or use moderation queue.',
@@ -206,7 +206,7 @@ $lang = array_merge($lang, array(
 	'ROLE_DESCRIPTION_USER_NOAVATAR'		=> 'Has a limited feature set and is not allowed to use the Avatar feature.',
 	'ROLE_DESCRIPTION_USER_NOPM'			=> 'Has a limited feature set, and is not allowed to use Private Messages.',
 	'ROLE_DESCRIPTION_USER_STANDARD'		=> 'Can access most but not all user features. Cannot change user name or ignore the flood limit, for instance.',
-	'ROLE_DESCRIPTION_USER_NEW_MEMBER'		=> 'A role for members of the special newly registered users group; contains <samp>NEVER</samp> permissions to lock features for new users.',
+	'ROLE_DESCRIPTION_USER_NEW_MEMBER'		=> 'A role for members of the special newly registered users group; contains <strong>NEVER</strong> permissions to lock features for new users.',
 
 	'ROLE_DESCRIPTION_EXPLAIN'		=> 'You are able to enter a short explanation of what the role is doing or for what it is meant for. The text you enter here will be displayed within the permissions screens too.',
 	'ROLE_DESCRIPTION_LONG'			=> 'The role description is too long, please limit it to 4000 characters.',
@@ -227,48 +227,48 @@ $lang = array_merge($lang, array(
 	'SET_USERS_PERMISSIONS'			=> 'Set user permissions',
 	'SET_USERS_FORUM_PERMISSIONS'	=> 'Set user forum permissions',
 
-	'TRACE_DEFAULT'					=> 'By default every permission is <samp>NO</samp> (unset). So the permission can be overwritten by other settings.',
+	'TRACE_DEFAULT'					=> 'By default every permission is <strong>NO</strong> (unset). So the permission can be overwritten by other settings.',
 	'TRACE_FOR'						=> 'Trace for',
 	'TRACE_GLOBAL_SETTING'			=> '%s (global)',
-	'TRACE_GROUP_NEVER_TOTAL_NEVER'	=> 'This group’s permission is set to <samp>NEVER</samp> like the total result so the old result is kept.',
-	'TRACE_GROUP_NEVER_TOTAL_NEVER_LOCAL'	=> 'This group’s permission for this forum is set to <samp>NEVER</samp> like the total result so the old result is kept.',
-	'TRACE_GROUP_NEVER_TOTAL_NO'	=> 'This group’s permission is set to <samp>NEVER</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
-	'TRACE_GROUP_NEVER_TOTAL_NO_LOCAL'	=> 'This group’s permission for this forum is set to <samp>NEVER</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
-	'TRACE_GROUP_NEVER_TOTAL_YES'	=> 'This group’s permission is set to <samp>NEVER</samp> which overwrites the total <samp>YES</samp> to a <samp>NEVER</samp> for this user.',
-	'TRACE_GROUP_NEVER_TOTAL_YES_LOCAL'	=> 'This group’s permission for this forum is set to <samp>NEVER</samp> which overwrites the total <samp>YES</samp> to a <samp>NEVER</samp> for this user.',
-	'TRACE_GROUP_NO'				=> 'The permission is <samp>NO</samp> for this group so the old total value is kept.',
-	'TRACE_GROUP_NO_LOCAL'			=> 'The permission is <samp>NO</samp> for this group within this forum so the old total value is kept.',
-	'TRACE_GROUP_YES_TOTAL_NEVER'	=> 'This group’s permission is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
-	'TRACE_GROUP_YES_TOTAL_NEVER_LOCAL'	=> 'This group’s permission for this forum is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
-	'TRACE_GROUP_YES_TOTAL_NO'		=> 'This group’s permission is set to <samp>YES</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
-	'TRACE_GROUP_YES_TOTAL_NO_LOCAL'	=> 'This group’s permission for this forum is set to <samp>YES</samp> which becomes the new total value because it wasn’t set yet (set to <samp>NO</samp>).',
-	'TRACE_GROUP_YES_TOTAL_YES'		=> 'This group’s permission is set to <samp>YES</samp> and the total permission is already set to <samp>YES</samp>, so the total result is kept.',
-	'TRACE_GROUP_YES_TOTAL_YES_LOCAL'	=> 'This group’s permission for this forum is set to <samp>YES</samp> and the total permission is already set to <samp>YES</samp>, so the total result is kept.',
+	'TRACE_GROUP_NEVER_TOTAL_NEVER'	=> 'This group’s permission is set to <strong>NEVER</strong> like the total result so the old result is kept.',
+	'TRACE_GROUP_NEVER_TOTAL_NEVER_LOCAL'	=> 'This group’s permission for this forum is set to <strong>NEVER</strong> like the total result so the old result is kept.',
+	'TRACE_GROUP_NEVER_TOTAL_NO'	=> 'This group’s permission is set to <strong>NEVER</strong> which becomes the new total value because it wasn’t set yet (set to <strong>NO</strong>).',
+	'TRACE_GROUP_NEVER_TOTAL_NO_LOCAL'	=> 'This group’s permission for this forum is set to <strong>NEVER</strong> which becomes the new total value because it wasn’t set yet (set to <strong>NO</strong>).',
+	'TRACE_GROUP_NEVER_TOTAL_YES'	=> 'This group’s permission is set to <strong>NEVER</strong> which overwrites the total <strong>YES</strong> to a <strong>NEVER</strong> for this user.',
+	'TRACE_GROUP_NEVER_TOTAL_YES_LOCAL'	=> 'This group’s permission for this forum is set to <strong>NEVER</strong> which overwrites the total <strong>YES</strong> to a <strong>NEVER</strong> for this user.',
+	'TRACE_GROUP_NO'				=> 'The permission is <strong>NO</strong> for this group so the old total value is kept.',
+	'TRACE_GROUP_NO_LOCAL'			=> 'The permission is <strong>NO</strong> for this group within this forum so the old total value is kept.',
+	'TRACE_GROUP_YES_TOTAL_NEVER'	=> 'This group’s permission is set to <strong>YES</strong> but the total <strong>NEVER</strong> cannot be overwritten.',
+	'TRACE_GROUP_YES_TOTAL_NEVER_LOCAL'	=> 'This group’s permission for this forum is set to <strong>YES</strong> but the total <strong>NEVER</strong> cannot be overwritten.',
+	'TRACE_GROUP_YES_TOTAL_NO'		=> 'This group’s permission is set to <strong>YES</strong> which becomes the new total value because it wasn’t set yet (set to <strong>NO</strong>).',
+	'TRACE_GROUP_YES_TOTAL_NO_LOCAL'	=> 'This group’s permission for this forum is set to <strong>YES</strong> which becomes the new total value because it wasn’t set yet (set to <strong>NO</strong>).',
+	'TRACE_GROUP_YES_TOTAL_YES'		=> 'This group’s permission is set to <strong>YES</strong> and the total permission is already set to <strong>YES</strong>, so the total result is kept.',
+	'TRACE_GROUP_YES_TOTAL_YES_LOCAL'	=> 'This group’s permission for this forum is set to <strong>YES</strong> and the total permission is already set to <strong>YES</strong>, so the total result is kept.',
 	'TRACE_PERMISSION'				=> 'Trace permission - %s',
 	'TRACE_RESULT'					=> 'Trace result',
 	'TRACE_SETTING'					=> 'Trace setting',
 
-	'TRACE_USER_GLOBAL_YES_TOTAL_YES'		=> 'The forum independent user permission evaluates to <samp>YES</samp> but the total permission is already set to <samp>YES</samp>, so the total result is kept. %sTrace global permission%s',
-	'TRACE_USER_GLOBAL_YES_TOTAL_NEVER'		=> 'The forum independent user permission evaluates to <samp>YES</samp> which overwrites the current local result <samp>NEVER</samp>. %sTrace global permission%s',
-	'TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT'	=> 'The forum independent user permission evaluates to <samp>NEVER</samp> which doesn’t influence the local permission. %sTrace global permission%s',
-
-	'TRACE_USER_FOUNDER'					=> 'The user is a founder, therefore admin permissions are always set to <samp>YES</samp>.',
-	'TRACE_USER_KEPT'						=> 'The user’s permission is <samp>NO</samp> so the old total value is kept.',
-	'TRACE_USER_KEPT_LOCAL'					=> 'The user’s permission for this forum is <samp>NO</samp> so the old total value is kept.',
-	'TRACE_USER_NEVER_TOTAL_NEVER'			=> 'The user’s permission is set to <samp>NEVER</samp> and the total value is set to <samp>NEVER</samp>, so nothing is changed.',
-	'TRACE_USER_NEVER_TOTAL_NEVER_LOCAL'	=> 'The user’s permission for this forum is set to <samp>NEVER</samp> and the total value is set to <samp>NEVER</samp>, so nothing is changed.',
-	'TRACE_USER_NEVER_TOTAL_NO'				=> 'The user’s permission is set to <samp>NEVER</samp> which becomes the total value because it was set to NO.',
-	'TRACE_USER_NEVER_TOTAL_NO_LOCAL'		=> 'The user’s permission for this forum is set to <samp>NEVER</samp> which becomes the total value because it was set to NO.',
-	'TRACE_USER_NEVER_TOTAL_YES'			=> 'The user’s permission is set to <samp>NEVER</samp> and overwrites the previous <samp>YES</samp>.',
-	'TRACE_USER_NEVER_TOTAL_YES_LOCAL'		=> 'The user’s permission for this forum is set to <samp>NEVER</samp> and overwrites the previous <samp>YES</samp>.',
-	'TRACE_USER_NO_TOTAL_NO'				=> 'The user’s permission is <samp>NO</samp> and the total value was set to NO so it defaults to <samp>NEVER</samp>.',
-	'TRACE_USER_NO_TOTAL_NO_LOCAL'			=> 'The user’s permission for this forum is <samp>NO</samp> and the total value was set to NO so it defaults to <samp>NEVER</samp>.',
-	'TRACE_USER_YES_TOTAL_NEVER'			=> 'The user’s permission is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
-	'TRACE_USER_YES_TOTAL_NEVER_LOCAL'		=> 'The user’s permission for this forum is set to <samp>YES</samp> but the total <samp>NEVER</samp> cannot be overwritten.',
-	'TRACE_USER_YES_TOTAL_NO'				=> 'The user’s permission is set to <samp>YES</samp> which becomes the total value because it was set to <samp>NO</samp>.',
-	'TRACE_USER_YES_TOTAL_NO_LOCAL'			=> 'The user’s permission for this forum is set to <samp>YES</samp> which becomes the total value because it was set to <samp>NO</samp>.',
-	'TRACE_USER_YES_TOTAL_YES'				=> 'The user’s permission is set to <samp>YES</samp> and the total value is set to <samp>YES</samp>, so nothing is changed.',
-	'TRACE_USER_YES_TOTAL_YES_LOCAL'		=> 'The user’s permission for this forum is set to <samp>YES</samp> and the total value is set to <samp>YES</samp>, so nothing is changed.',
+	'TRACE_USER_GLOBAL_YES_TOTAL_YES'		=> 'The forum independent user permission evaluates to <strong>YES</strong> but the total permission is already set to <strong>YES</strong>, so the total result is kept. %sTrace global permission%s',
+	'TRACE_USER_GLOBAL_YES_TOTAL_NEVER'		=> 'The forum independent user permission evaluates to <strong>YES</strong> which overwrites the current local result <strong>NEVER</strong>. %sTrace global permission%s',
+	'TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT'	=> 'The forum independent user permission evaluates to <strong>NEVER</strong> which doesn’t influence the local permission. %sTrace global permission%s',
+
+	'TRACE_USER_FOUNDER'					=> 'The user is a founder, therefore admin permissions are always set to <strong>YES</strong>.',
+	'TRACE_USER_KEPT'						=> 'The user’s permission is <strong>NO</strong> so the old total value is kept.',
+	'TRACE_USER_KEPT_LOCAL'					=> 'The user’s permission for this forum is <strong>NO</strong> so the old total value is kept.',
+	'TRACE_USER_NEVER_TOTAL_NEVER'			=> 'The user’s permission is set to <strong>NEVER</strong> and the total value is set to <strong>NEVER</strong>, so nothing is changed.',
+	'TRACE_USER_NEVER_TOTAL_NEVER_LOCAL'	=> 'The user’s permission for this forum is set to <strong>NEVER</strong> and the total value is set to <strong>NEVER</strong>, so nothing is changed.',
+	'TRACE_USER_NEVER_TOTAL_NO'				=> 'The user’s permission is set to <strong>NEVER</strong> which becomes the total value because it was set to NO.',
+	'TRACE_USER_NEVER_TOTAL_NO_LOCAL'		=> 'The user’s permission for this forum is set to <strong>NEVER</strong> which becomes the total value because it was set to NO.',
+	'TRACE_USER_NEVER_TOTAL_YES'			=> 'The user’s permission is set to <strong>NEVER</strong> and overwrites the previous <strong>YES</strong>.',
+	'TRACE_USER_NEVER_TOTAL_YES_LOCAL'		=> 'The user’s permission for this forum is set to <strong>NEVER</strong> and overwrites the previous <strong>YES</strong>.',
+	'TRACE_USER_NO_TOTAL_NO'				=> 'The user’s permission is <strong>NO</strong> and the total value was set to NO so it defaults to <strong>NEVER</strong>.',
+	'TRACE_USER_NO_TOTAL_NO_LOCAL'			=> 'The user’s permission for this forum is <strong>NO</strong> and the total value was set to NO so it defaults to <strong>NEVER</strong>.',
+	'TRACE_USER_YES_TOTAL_NEVER'			=> 'The user’s permission is set to <strong>YES</strong> but the total <strong>NEVER</strong> cannot be overwritten.',
+	'TRACE_USER_YES_TOTAL_NEVER_LOCAL'		=> 'The user’s permission for this forum is set to <strong>YES</strong> but the total <strong>NEVER</strong> cannot be overwritten.',
+	'TRACE_USER_YES_TOTAL_NO'				=> 'The user’s permission is set to <strong>YES</strong> which becomes the total value because it was set to <strong>NO</strong>.',
+	'TRACE_USER_YES_TOTAL_NO_LOCAL'			=> 'The user’s permission for this forum is set to <strong>YES</strong> which becomes the total value because it was set to <strong>NO</strong>.',
+	'TRACE_USER_YES_TOTAL_YES'				=> 'The user’s permission is set to <strong>YES</strong> and the total value is set to <strong>YES</strong>, so nothing is changed.',
+	'TRACE_USER_YES_TOTAL_YES_LOCAL'		=> 'The user’s permission for this forum is set to <strong>YES</strong> and the total value is set to <strong>YES</strong>, so nothing is changed.',
 	'TRACE_WHO'								=> 'Who',
 	'TRACE_TOTAL'							=> 'Total',
 
-- 
cgit v1.2.1


From 8c4604a78e89834afb8f352152480be9d954726d Mon Sep 17 00:00:00 2001
From: geetakshi <geetakshi.19@gmail.com>
Date: Sun, 16 Mar 2014 03:32:08 +0530
Subject: [ticket/8309] Renaming "Last visit" to "Last activity"

PHPBB3-8309
---
 phpBB/language/en/memberlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 83f5e4107e..0b3983ae1e 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -135,5 +135,5 @@ $lang = array_merge($lang, array(
 	'USERS_PER_PAGE'		=> 'Users per page',
 
 	'VIEWING_PROFILE'		=> 'Viewing profile - %s',
-	'VISITED'				=> 'Last visited',
+	'LAST_ACTIVITY'				=> 'Last activity',
 ));
-- 
cgit v1.2.1


From 6a1967514d09c14fa1cada7ff8ef0c925f3072a0 Mon Sep 17 00:00:00 2001
From: geetakshi <geetakshi.19@gmail.com>
Date: Sun, 16 Mar 2014 14:27:34 +0530
Subject: [ticket/8309] Moving key to get keys in alphabetical order

PHPBB3-8309
---
 phpBB/language/en/memberlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 0b3983ae1e..3228b4fffc 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -85,6 +85,7 @@ $lang = array_merge($lang, array(
 	'IM_USER'				=> 'Send an instant message',
 
 	'LAST_ACTIVE'				=> 'Last active',
+	'LAST_ACTIVITY'				=> 'Last activity',
 	'LESS_THAN'					=> 'Less than',
 	'LIST_USERS'				=> array(
 		1	=> '%d user',
@@ -135,5 +136,4 @@ $lang = array_merge($lang, array(
 	'USERS_PER_PAGE'		=> 'Users per page',
 
 	'VIEWING_PROFILE'		=> 'Viewing profile - %s',
-	'LAST_ACTIVITY'				=> 'Last activity',
 ));
-- 
cgit v1.2.1


From 3845a560b681881e0ca2fd9a0e80a18d9e924895 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 16 Mar 2014 15:55:58 -0700
Subject: [ticket/11904] Update explanation for what Allow CDN does

PHPBB3-11904
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 18968d6c97..1d2c979e0c 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -355,7 +355,7 @@ $lang = array_merge($lang, array(
 	'ACP_LOAD_SETTINGS_EXPLAIN'	=> 'Here you can enable and disable certain board functions to reduce the amount of processing required. On most servers there is no need to disable any functions. However on certain systems or in shared hosting environments it may be beneficial to disable capabilities you do not really need. You can also specify limits for system load and active sessions beyond which the board will go offline.',
 
 	'ALLOW_CDN'						=> 'Allow usage of third party content delivery networks',
-	'ALLOW_CDN_EXPLAIN'				=> 'If this setting is enabled, some files will be served from external third party servers instead of your server. This reduces the network bandwidth required by your server, but may present a privacy issue for some board administrators.',
+	'ALLOW_CDN_EXPLAIN'				=> 'If this setting is enabled, some files will be served from external third party servers instead of your server. This reduces the network bandwidth required by your server, but may present a privacy issue for some board administrators. In a default phpBB installation, this includes loading “jQuery” and the font “Open Sans” from Google’s content delivery network.',
 	'CUSTOM_PROFILE_FIELDS'			=> 'Custom profile fields',
 	'LIMIT_LOAD'					=> 'Limit system load',
 	'LIMIT_LOAD_EXPLAIN'			=> 'If the system’s 1-minute load average exceeds this value the board will automatically go offline. A value of 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers and where this information is accessible. The value here resets itself to 0 if phpBB was unable to get the load limit.',
-- 
cgit v1.2.1


From 85147eb98722a2e114452ab0ca412faed511f100 Mon Sep 17 00:00:00 2001
From: netdeamon <san_v500@yahoo.com>
Date: Mon, 17 Mar 2014 12:25:50 +0530
Subject: [ticket/12269] Delete folder mods in language

Deleted mods folder in phpbb/language/en/.

PHPBB3-12269
---
 phpBB/language/en/mods/index.htm | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 phpBB/language/en/mods/index.htm

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mods/index.htm b/phpBB/language/en/mods/index.htm
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit v1.2.1


From 66ed9881dfb143dc0d430132cf351f64ecc73bcb Mon Sep 17 00:00:00 2001
From: geetakshi <geetakshi.19@gmail.com>
Date: Mon, 17 Mar 2014 21:08:03 +0530
Subject: [ticket/8309] Removing key with similar function to avoid redundancy

PHPBB3-8309
---
 phpBB/language/en/memberlist.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 3228b4fffc..c7f301fb8c 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -85,7 +85,6 @@ $lang = array_merge($lang, array(
 	'IM_USER'				=> 'Send an instant message',
 
 	'LAST_ACTIVE'				=> 'Last active',
-	'LAST_ACTIVITY'				=> 'Last activity',
 	'LESS_THAN'					=> 'Less than',
 	'LIST_USERS'				=> array(
 		1	=> '%d user',
-- 
cgit v1.2.1


From a8274ae137a0530c7eea3dc82978e50ca4cf9db7 Mon Sep 17 00:00:00 2001
From: netdeamon <san_v500@yahoo.com>
Date: Tue, 18 Mar 2014 22:13:10 +0530
Subject: [ticket/12198] Language issue in en/common.php

Deleted lines as they are not needed anymore.

PHPBB3-12198
---
 phpBB/language/en/common.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 360d6be1e0..fba78d34aa 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -210,8 +210,6 @@ $lang = array_merge($lang, array(
 	'ERR_CONNECTING_SERVER'				=> 'Error connecting to the server.',
 	'ERR_JAB_AUTH'						=> 'Could not authorise on Jabber server.',
 	'ERR_JAB_CONNECT'					=> 'Could not connect to Jabber server.',
-	'ERR_TEMPLATE_EVENT_LOCATION'		=> 'The specified template event location <em>[%s]</em> is improperly formatted.',
-	'ERR_TEMPLATE_COMPILATION'		=> 'The file could not be compiled: %s',
 	'ERR_UNABLE_TO_LOGIN'				=> 'The specified username or password is incorrect.',
 	'ERR_UNWATCHING'					=> 'An error occurred while trying to unsubscribe.',
 	'ERR_WATCHING'						=> 'An error occurred while trying to subscribe.',
-- 
cgit v1.2.1


From 6a278248e59acf9f347431712276b1fb0c70f5d0 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 21 Nov 2013 15:34:40 -0800
Subject: [ticket/11959] Use plurals for the language strings.

PHPBB3-11959
---
 phpBB/language/en/common.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 360d6be1e0..c171ae5874 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -425,17 +425,23 @@ $lang = array_merge($lang, array(
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
 	'NOTIFICATIONS'				=> 'Notifications',
 	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
-	'NOTIFICATION_BOOKMARK_TRIMMED'		=> '%1$s and %3$d others replied to the topic “%2$s” you have bookmarked.',
+	'NOTIFICATION_BOOKMARK_TRIMMED'		=> array(
+		2	=> '%1$s and %3$d others replied to the topic “%2$s” you have bookmarked.',
+	),
 	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group %2$s.',
 	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> 'Your request to join the group %1$s has been approved.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
 	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
-	'NOTIFICATION_POST_TRIMMED'			=> '%1$s and %3$d others replied to the topic “%2$s”',
+	'NOTIFICATION_POST_TRIMMED'			=> array(
+		2	=> '%1$s and %3$d others replied to the topic “%2$s”',
+	),
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved for reason: "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by %1$s and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
-	'NOTIFICATION_QUOTE_TRIMMED'		=> '%1$s and %3$d others replied to the topic “%2$s”',
+	'NOTIFICATION_QUOTE_TRIMMED'		=> array(
+		2	=> '%1$s and %3$d others replied to the topic “%2$s”',
+	),
 	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
 	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" for reason: "%3$s".',
 	'NOTIFICATION_REPORT_CLOSED'   		=> '%1$s closed the report you made for "%2$s".',
-- 
cgit v1.2.1


From 7e4b7a154214f1663a28244282e551beb59d7d8b Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 21 Nov 2013 18:47:40 -0800
Subject: [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.

PHPBB3-11959
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index c171ae5874..eb8f7ce2a6 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -440,7 +440,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by %1$s and needs approval.',
 	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
 	'NOTIFICATION_QUOTE_TRIMMED'		=> array(
-		2	=> '%1$s and %3$d others replied to the topic “%2$s”',
+		2	=> '%1$s and %3$d quoted you in the post “%2$s”',
 	),
 	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
 	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" for reason: "%3$s".',
-- 
cgit v1.2.1


From 126ee37f6692a7c52fd8f6527af2dc06cda50a8b Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 1 Dec 2013 11:25:54 -0800
Subject: [ticket/11959] Use the plurals system for the untrimmed language
 strings.

PHPBB3-11959
---
 phpBB/language/en/common.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index eb8f7ce2a6..437f3a190f 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -424,21 +424,27 @@ $lang = array_merge($lang, array(
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
 	'NOTIFICATIONS'				=> 'Notifications',
-	'NOTIFICATION_BOOKMARK'				=> '%1$s replied to the topic "%2$s" you have bookmarked.',
+	'NOTIFICATION_BOOKMARK'				=> array(
+		1	=> '%1$s replied to the topic “%2$s” you have bookmarked.',
+	),
 	'NOTIFICATION_BOOKMARK_TRIMMED'		=> array(
 		2	=> '%1$s and %3$d others replied to the topic “%2$s” you have bookmarked.',
 	),
 	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group %2$s.',
 	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> 'Your request to join the group %1$s has been approved.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
-	'NOTIFICATION_POST'					=> '%1$s replied to the topic "%2$s".',
+	'NOTIFICATION_POST'					=> array(
+		1	=> '%1$s replied to the topic “%2$s”.',
+	),
 	'NOTIFICATION_POST_TRIMMED'			=> array(
 		2	=> '%1$s and %3$d others replied to the topic “%2$s”',
 	),
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved for reason: "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by %1$s and needs approval.',
-	'NOTIFICATION_QUOTE'				=> '%1$s quoted you in the post "%2$s".',
+	'NOTIFICATION_QUOTE'				=> array(
+		1	=> '%1$s quoted you in the post “%2$s”.',
+	),
 	'NOTIFICATION_QUOTE_TRIMMED'		=> array(
 		2	=> '%1$s and %3$d quoted you in the post “%2$s”',
 	),
-- 
cgit v1.2.1


From b32a66ca78b6170c0d90b7776dabdf8f343c557a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 1 Dec 2013 12:20:43 -0800
Subject: [ticket/11959] List the last user with "and" instead of a comma.

PHPBB3-11959
---
 phpBB/language/en/common.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 437f3a190f..42965c460f 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -424,29 +424,38 @@ $lang = array_merge($lang, array(
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
 	'NOTIFICATIONS'				=> 'Notifications',
+	// This is used for a list of up to 4 users. 5 users or more uses _TRIMMED.
 	'NOTIFICATION_BOOKMARK'				=> array(
-		1	=> '%1$s replied to the topic “%2$s” you have bookmarked.',
+		1	=> '%1$s replied to the topic “%3$s” you have bookmarked.',
+		2	=> '%1$s and %2$s replied to the topic “%3$s” you have bookmarked.',
 	),
+	// X, Y, Z and 2 others replied to the topic “Test” you have bookmarked.
 	'NOTIFICATION_BOOKMARK_TRIMMED'		=> array(
-		2	=> '%1$s and %3$d others replied to the topic “%2$s” you have bookmarked.',
+		2	=> '%1$s and %4$d others replied to the topic “%3$s” you have bookmarked.',
 	),
 	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group %2$s.',
 	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> 'Your request to join the group %1$s has been approved.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
+	// This is used for a list of up to 4 users. 5 users or more uses _TRIMMED.
 	'NOTIFICATION_POST'					=> array(
-		1	=> '%1$s replied to the topic “%2$s”.',
+		1	=> '%1$s replied to the topic “%3$s”.',
+		2	=> '%1$s and %2$s replied to the topic “%3$s”.',
 	),
+	// X, Y, Z and 2 others replied to the topic “Test”.
 	'NOTIFICATION_POST_TRIMMED'			=> array(
-		2	=> '%1$s and %3$d others replied to the topic “%2$s”',
+		2	=> '%1$s and %4$d others replied to the topic “%3$s”',
 	),
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved for reason: "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by %1$s and needs approval.',
+	// This is used for a list of up to 4 users. 5 users or more uses _TRIMMED.
 	'NOTIFICATION_QUOTE'				=> array(
-		1	=> '%1$s quoted you in the post “%2$s”.',
+		1	=> '%1$s quoted you in the post “%3$s”.',
+		2	=> '%1$s and %2$s quoted you in the post “%3$s”.',
 	),
+	// X, Y, Z and 2 others quoted you in the post “Re: Test”.
 	'NOTIFICATION_QUOTE_TRIMMED'		=> array(
-		2	=> '%1$s and %3$d quoted you in the post “%2$s”',
+		2	=> '%1$s and %4$d quoted you in the post “%3$s”',
 	),
 	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
 	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" for reason: "%3$s".',
-- 
cgit v1.2.1


From 7cc1a8d224b8c53530bba89fbb756a0518b04a91 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 1 Dec 2013 12:28:37 -0800
Subject: [ticket/11959] Add samples for the untrimmed strings.

PHPBB3-11959
---
 phpBB/language/en/common.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 42965c460f..e84033f1b7 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -427,6 +427,7 @@ $lang = array_merge($lang, array(
 	// This is used for a list of up to 4 users. 5 users or more uses _TRIMMED.
 	'NOTIFICATION_BOOKMARK'				=> array(
 		1	=> '%1$s replied to the topic “%3$s” you have bookmarked.',
+		// X, Y, and Z replied to the topic “Test” you have bookmarked.
 		2	=> '%1$s and %2$s replied to the topic “%3$s” you have bookmarked.',
 	),
 	// X, Y, Z and 2 others replied to the topic “Test” you have bookmarked.
@@ -439,6 +440,7 @@ $lang = array_merge($lang, array(
 	// This is used for a list of up to 4 users. 5 users or more uses _TRIMMED.
 	'NOTIFICATION_POST'					=> array(
 		1	=> '%1$s replied to the topic “%3$s”.',
+		// X, Y, and Z replied to the topic “Test”.
 		2	=> '%1$s and %2$s replied to the topic “%3$s”.',
 	),
 	// X, Y, Z and 2 others replied to the topic “Test”.
@@ -451,6 +453,7 @@ $lang = array_merge($lang, array(
 	// This is used for a list of up to 4 users. 5 users or more uses _TRIMMED.
 	'NOTIFICATION_QUOTE'				=> array(
 		1	=> '%1$s quoted you in the post “%3$s”.',
+		// X, Y, and Z quoted you in the post “Re: Test”.
 		2	=> '%1$s and %2$s quoted you in the post “%3$s”.',
 	),
 	// X, Y, Z and 2 others quoted you in the post “Re: Test”.
-- 
cgit v1.2.1


From 285ad0f6faac275c56576616ed6a880a7f88e94b Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 7 Feb 2014 14:56:14 -0800
Subject: [ticket/11959] Simplify how the users are trimmed.

PHPBB3-11959
---
 phpBB/language/en/common.php | 44 ++++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index e84033f1b7..757e421759 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -424,41 +424,28 @@ $lang = array_merge($lang, array(
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
 	'NOTIFICATIONS'				=> 'Notifications',
-	// This is used for a list of up to 4 users. 5 users or more uses _TRIMMED.
+	// This applies for NOTIFICATION_BOOKMARK, NOTIFICATION_POST, and NOTIFICATION_QUOTE.
+	// %1$s will return a list of users that's concatenated using "," and "and" - see STRING_LIST
+	// Once the user count reaches 5 users or more, the list is trimmed using NOTIFICATION_X_OTHERS
+	// Examples:
+	// A replied...
+	// A and B replied...
+	// A, B and C replied...
+	// A, B, C and 2 others replied...
 	'NOTIFICATION_BOOKMARK'				=> array(
-		1	=> '%1$s replied to the topic “%3$s” you have bookmarked.',
-		// X, Y, and Z replied to the topic “Test” you have bookmarked.
-		2	=> '%1$s and %2$s replied to the topic “%3$s” you have bookmarked.',
-	),
-	// X, Y, Z and 2 others replied to the topic “Test” you have bookmarked.
-	'NOTIFICATION_BOOKMARK_TRIMMED'		=> array(
-		2	=> '%1$s and %4$d others replied to the topic “%3$s” you have bookmarked.',
+		1	=> '%1$s replied to the topic “%2$s” you have bookmarked.',
 	),
 	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group %2$s.',
 	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> 'Your request to join the group %1$s has been approved.',
 	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
-	// This is used for a list of up to 4 users. 5 users or more uses _TRIMMED.
 	'NOTIFICATION_POST'					=> array(
-		1	=> '%1$s replied to the topic “%3$s”.',
-		// X, Y, and Z replied to the topic “Test”.
-		2	=> '%1$s and %2$s replied to the topic “%3$s”.',
-	),
-	// X, Y, Z and 2 others replied to the topic “Test”.
-	'NOTIFICATION_POST_TRIMMED'			=> array(
-		2	=> '%1$s and %4$d others replied to the topic “%3$s”',
+		1	=> '%1$s replied to the topic “%2$s”.',
 	),
 	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
 	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved for reason: "%2$s".',
 	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by %1$s and needs approval.',
-	// This is used for a list of up to 4 users. 5 users or more uses _TRIMMED.
 	'NOTIFICATION_QUOTE'				=> array(
-		1	=> '%1$s quoted you in the post “%3$s”.',
-		// X, Y, and Z quoted you in the post “Re: Test”.
-		2	=> '%1$s and %2$s quoted you in the post “%3$s”.',
-	),
-	// X, Y, Z and 2 others quoted you in the post “Re: Test”.
-	'NOTIFICATION_QUOTE_TRIMMED'		=> array(
-		2	=> '%1$s and %4$d quoted you in the post “%3$s”',
+		1	=> '%1$s quoted you in the post “%2$s”.',
 	),
 	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
 	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" for reason: "%3$s".',
@@ -469,6 +456,10 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by %1$s and needs approval.',
 	'NOTIFICATION_TYPE_NOT_EXIST'		=> 'The notification type "%s" is missing from the file system.',
 	'NOTIFICATION_ADMIN_ACTIVATE_USER'	=> 'The user “%1$s” is newly registered and requires activation.',
+	// Used in conjuction with NOTIFICATION_BOOKMARK, NOTIFICATION_POST, and NOTIFICATION_QUOTE.
+	'NOTIFICATION_X_OTHERS'				=> array(
+		2	=> '%d others',
+	),
 	'NOTIFY_ADMIN'				=> 'Please notify the board administrator or webmaster.',
 	'NOTIFY_ADMIN_EMAIL'		=> 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>',
 	'NO_ACCESS_ATTACHMENT'		=> 'You are not allowed to access this file.',
@@ -692,6 +683,11 @@ $lang = array_merge($lang, array(
 	'START_WATCHING_TOPIC'		=> 'Subscribe topic',
 	'STOP_WATCHING_FORUM'		=> 'Unsubscribe forum',
 	'STOP_WATCHING_TOPIC'		=> 'Unsubscribe topic',
+	'STRING_LIST'				=> array(
+		1 => '%1$s',
+		2 => '%1$s and %2$s',
+		// At 3 or more, %1$s returns comma separated items. So output would be: X, Y and Z
+	),
 	'SUBFORUM'					=> 'Subforum',
 	'SUBFORUMS'					=> 'Subforums',
 	'SUBJECT'					=> 'Subject',
-- 
cgit v1.2.1


From 7c1ab5f79d621f210fa1bdea0e9b217a10c20fa9 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 19 Mar 2014 03:03:20 -0700
Subject: [ticket/11959] Remove use of plurals and make it possible to use
 Oxford comma.

PHPBB3-11959
---
 phpBB/language/en/common.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 757e421759..f073954817 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -683,11 +683,8 @@ $lang = array_merge($lang, array(
 	'START_WATCHING_TOPIC'		=> 'Subscribe topic',
 	'STOP_WATCHING_FORUM'		=> 'Unsubscribe forum',
 	'STOP_WATCHING_TOPIC'		=> 'Unsubscribe topic',
-	'STRING_LIST'				=> array(
-		1 => '%1$s',
-		2 => '%1$s and %2$s',
-		// At 3 or more, %1$s returns comma separated items. So output would be: X, Y and Z
-	),
+	'STRING_LIST_MULTI'			=> '%1$s, and %2$s',
+	'STRING_LIST_SIMPLE'		=> '%1$s and %2$s',
 	'SUBFORUM'					=> 'Subforum',
 	'SUBFORUMS'					=> 'Subforums',
 	'SUBJECT'					=> 'Subject',
-- 
cgit v1.2.1


From ba9bc9c7dc24e8c21f0c22c9e872214094d94425 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 27 Mar 2014 23:27:30 -0700
Subject: [ticket/12311] Use valid composer schema - license - for extensions

http://tracker.phpbb.com/browse/PHPBB3-12311

PHPBB3-12311
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 409b800ba6..c0000b4d73 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -96,7 +96,7 @@ $lang = array_merge($lang, array(
 	'HOMEPAGE'				=> 'Homepage',
 	'PATH'					=> 'File Path',
 	'TIME'					=> 'Release Time',
-	'LICENCE'				=> 'Licence',
+	'LICENSE'				=> 'License',
 
 	'REQUIREMENTS'			=> 'Requirements',
 	'PHPBB_VERSION'			=> 'phpBB Version',
-- 
cgit v1.2.1


From 368dd23d4babf17e593ea9b16047319296881c46 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 28 Mar 2014 09:08:11 -0700
Subject: [ticket/12311] Use British-English spelling of licence in lang file

PHPBB3-12311
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index c0000b4d73..baa7d01763 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -96,7 +96,7 @@ $lang = array_merge($lang, array(
 	'HOMEPAGE'				=> 'Homepage',
 	'PATH'					=> 'File Path',
 	'TIME'					=> 'Release Time',
-	'LICENSE'				=> 'License',
+	'LICENSE'				=> 'Licence',
 
 	'REQUIREMENTS'			=> 'Requirements',
 	'PHPBB_VERSION'			=> 'phpBB Version',
-- 
cgit v1.2.1


From 96291d9e6e3f98915756bbd71a2dedf8c2ea94ac Mon Sep 17 00:00:00 2001
From: Suhaib Khan <suhebjerk@gmail.com>
Date: Thu, 13 Mar 2014 01:07:49 +0530
Subject: [ticket/11666] Rewording POST_DELETED and

reverting removal of MESSAGE_DELETED.

PHPBB3-11666
---
 phpBB/language/en/posting.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 69f669b7b8..c1d8cef7de 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -156,6 +156,7 @@ $lang = array_merge($lang, array(
 		1	=> 'Enter your message here, it may contain no more than <strong>%d</strong> character.',
 		2	=> 'Enter your message here, it may contain no more than <strong>%d</strong> characters.',
 	),
+	'MESSAGE_DELETED'			=> 'This message has been deleted successfully.',
 	'MORE_SMILIES'				=> 'View more smilies',
 
 	'NOTIFY_REPLY'				=> 'Notify me when a reply is posted',
@@ -193,9 +194,9 @@ $lang = array_merge($lang, array(
 	'POST_APPROVAL_NOTIFY'		=> 'You will be notified when your post has been approved.',
 	'POST_CONFIRMATION'			=> 'Confirmation of post',
 	'POST_CONFIRM_EXPLAIN'		=> 'To prevent automated posts the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
-	'POST_DELETED'				=> 'This message has been deleted successfully.',
-	'POST_EDITED'				=> 'This message has been edited successfully.',
-	'POST_EDITED_MOD'			=> 'This message has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.',
+	'POST_DELETED'				=> 'This post has been deleted successfully.',
+	'POST_EDITED'				=> 'This post has been edited successfully.',
+	'POST_EDITED_MOD'			=> 'This post has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.',
 	'POST_GLOBAL'				=> 'Global',
 	'POST_ICON'					=> 'Post icon',
 	'POST_NORMAL'				=> 'Normal',
-- 
cgit v1.2.1


From e2c2692e9ca033e382fa09f3f4c294910b9c27a9 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 28 Mar 2014 11:27:25 -0700
Subject: [ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in
 language/en/acp/common.php

PHPBB3-12315
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 6b48568bba..cf32c7c225 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -360,7 +360,7 @@ $lang = array_merge($lang, array(
 
 	'GZIP_COMPRESSION'	=> 'GZip compression',
 
-	'NO_SEARCH_INDEX'	=> 'The selected search backend does not have a search index.<br >Please create the index for “%1$s” in the %2$ssearch index%3$s section.',
+	'NO_SEARCH_INDEX'	=> 'The selected search backend does not have a search index.<br />Please create the index for “%1$s” in the %2$ssearch index%3$s section.',
 	'NOT_AVAILABLE'		=> 'Not available',
 	'NUMBER_FILES'		=> 'Number of attachments',
 	'NUMBER_POSTS'		=> 'Number of posts',
-- 
cgit v1.2.1


From c5eccedfb6c9ae26ec8bc6a3897454c1f5cb5b00 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sun, 23 Mar 2014 17:14:03 +0100
Subject: [ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to
 _TEAM

PHPBB3-11336
---
 phpBB/language/en/memberlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index c7f301fb8c..95efe35b7d 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -90,7 +90,7 @@ $lang = array_merge($lang, array(
 		1	=> '%d user',
 		2	=> '%d users',
 	),
-	'LOGIN_EXPLAIN_LEADERS'		=> 'The board requires you to be registered and logged in to view the team listing.',
+	'LOGIN_EXPLAIN_TEAM'		=> 'The board requires you to be registered and logged in to view the team listing.',
 	'LOGIN_EXPLAIN_MEMBERLIST'	=> 'The board requires you to be registered and logged in to access the memberlist.',
 	'LOGIN_EXPLAIN_SEARCHUSER'	=> 'The board requires you to be registered and logged in to search users.',
 	'LOGIN_EXPLAIN_VIEWPROFILE'	=> 'The board requires you to be registered and logged in to view profiles.',
-- 
cgit v1.2.1


From 3c7ff1c417bd57ab71057fa3d880d58f1ee65f2a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 30 Jan 2014 22:21:06 +0100
Subject: [ticket/12150] Add options to acp

PHPBB3-12150
---
 phpBB/language/en/acp/forums.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 756cb7ae0f..f452dad8a0 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -101,6 +101,8 @@ $lang = array_merge($lang, array(
 	'FORUM_PASSWORD_OLD'				=> 'The forum password is using an old hashing method and should be changed.',
 	'FORUM_PASSWORD_MISMATCH'			=> 'The passwords you entered did not match.',
 	'FORUM_PRUNE_SETTINGS'				=> 'Forum prune settings',
+	'FORUM_PRUNE_SHADOW_TOPICS'			=> 'Enable auto-pruning of shadow topics',
+	'FORUM_PRUNE_SHADOW_TOPICS_EXPLAIN'		=> 'Prunes the forum of shadow topics, set the frequency/age parameters below.',
 	'FORUM_RESYNCED'					=> 'Forum “%s” successfully resynced',
 	'FORUM_RULES_EXPLAIN'				=> 'Forum rules are displayed at any page within the given forum.',
 	'FORUM_RULES_LINK'					=> 'Link to forum rules',
-- 
cgit v1.2.1


From 02fdae4e8800ded878dcdc848563aef202069317 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 31 Jan 2014 23:06:03 +0100
Subject: [ticket/12150] Add file and caller for pruning shadow topics

PHPBB3-12150
---
 phpBB/language/en/acp/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index cf32c7c225..8c748fe463 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -676,6 +676,7 @@ $lang = array_merge($lang, array(
 
 	'LOG_PRUNE'					=> '<strong>Pruned forums</strong><br />» %s',
 	'LOG_AUTO_PRUNE'			=> '<strong>Auto-pruned forums</strong><br />» %s',
+	'LOG_PRUNE_SHADOW_TOPIC'	=> '<strong>Auto-pruned shadow topics</strong><br />» %s',
 	'LOG_PRUNE_USER_DEAC'		=> '<strong>Users deactivated</strong><br />» %s',
 	'LOG_PRUNE_USER_DEL_DEL'	=> '<strong>Users pruned and posts deleted</strong><br />» %s',
 	'LOG_PRUNE_USER_DEL_ANON'	=> '<strong>Users pruned and posts retained</strong><br />» %s',
-- 
cgit v1.2.1


From d83d819827634931e9317469090e933edfc99f2b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 14 Mar 2014 23:35:07 +0100
Subject: [ticket/12150] Use shorter column names for prune settings

All columns were renamed from having prune_shadow_topics as namebase to just
prune_shadow.
A missing column was also added to the migration file's remove_schema() method.

PHPBB3-12150
---
 phpBB/language/en/acp/common.php | 2 +-
 phpBB/language/en/acp/forums.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 8c748fe463..2dc58d8361 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -676,7 +676,7 @@ $lang = array_merge($lang, array(
 
 	'LOG_PRUNE'					=> '<strong>Pruned forums</strong><br />» %s',
 	'LOG_AUTO_PRUNE'			=> '<strong>Auto-pruned forums</strong><br />» %s',
-	'LOG_PRUNE_SHADOW_TOPIC'	=> '<strong>Auto-pruned shadow topics</strong><br />» %s',
+	'LOG_PRUNE_SHADOW'		=> '<strong>Auto-pruned shadow topics</strong><br />» %s',
 	'LOG_PRUNE_USER_DEAC'		=> '<strong>Users deactivated</strong><br />» %s',
 	'LOG_PRUNE_USER_DEL_DEL'	=> '<strong>Users pruned and posts deleted</strong><br />» %s',
 	'LOG_PRUNE_USER_DEL_ANON'	=> '<strong>Users pruned and posts retained</strong><br />» %s',
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index f452dad8a0..d64380b6b6 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -101,8 +101,8 @@ $lang = array_merge($lang, array(
 	'FORUM_PASSWORD_OLD'				=> 'The forum password is using an old hashing method and should be changed.',
 	'FORUM_PASSWORD_MISMATCH'			=> 'The passwords you entered did not match.',
 	'FORUM_PRUNE_SETTINGS'				=> 'Forum prune settings',
-	'FORUM_PRUNE_SHADOW_TOPICS'			=> 'Enable auto-pruning of shadow topics',
-	'FORUM_PRUNE_SHADOW_TOPICS_EXPLAIN'		=> 'Prunes the forum of shadow topics, set the frequency/age parameters below.',
+	'FORUM_PRUNE_SHADOW'				=> 'Enable auto-pruning of shadow topics',
+	'FORUM_PRUNE_SHADOW_EXPLAIN'			=> 'Prunes the forum of shadow topics, set the frequency/age parameters below.',
 	'FORUM_RESYNCED'					=> 'Forum “%s” successfully resynced',
 	'FORUM_RULES_EXPLAIN'				=> 'Forum rules are displayed at any page within the given forum.',
 	'FORUM_RULES_LINK'					=> 'Link to forum rules',
-- 
cgit v1.2.1


From f471831916fc14afcce81fef70db2037717dccd8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 1 Apr 2014 22:43:30 +0200
Subject: [ticket/12113] Correctly use plurals when deleting user warnings

PHPBB3-12113
---
 phpBB/language/en/acp/common.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index cf32c7c225..a99d0e7fed 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -775,7 +775,10 @@ $lang = array_merge($lang, array(
 	'LOG_USER_GROUP_RESIGN'			=> '<strong>User resigned membership from group</strong><br />» %s',
 
 	'LOG_WARNING_DELETED'		=> '<strong>Deleted user warning</strong><br />» %s',
-	'LOG_WARNINGS_DELETED'		=> '<strong>Deleted %2$s user warnings</strong><br />» %1$s', // Example: '<strong>Deleted 2 user warnings</strong><br />» username'
+	'LOG_WARNINGS_DELETED'		=> array(
+		1 => '<strong>Deleted user warning</strong><br />» %1$s',
+		2 => '<strong>Deleted %2$d user warnings</strong><br />» %1$s', // Example: '<strong>Deleted 2 user warnings</strong><br />» username'
+	),
 	'LOG_WARNINGS_DELETED_ALL'	=> '<strong>Deleted all user warnings</strong><br />» %s',
 
 	'LOG_WORD_ADD'			=> '<strong>Added word censor</strong><br />» %s',
-- 
cgit v1.2.1


From bdc08a3fcd9f89168b1d65895714354437b7c1ee Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 2 Apr 2014 00:17:39 +0200
Subject: [ticket/8700] Remove unused language strings

Most of the strings were obsoleted by the removal of:
* Imagesets
* Themes
* Templates
* Editor
* Exporter

PHPBB3-8700
---
 phpBB/language/en/acp/styles.php | 284 ---------------------------------------
 1 file changed, 284 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index e7c149600d..4fa657bc0c 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -36,332 +36,48 @@ if (empty($lang) || !is_array($lang))
 
 $lang = array_merge($lang, array(
 	'ACP_STYLES_EXPLAIN'	=> 'Here you can manage the available styles on your board. You may alter existing styles, delete, deactivate, reactivate, install new ones. You can also see what a style will look like using the preview function. Also listed is the total user count for each style, note that overriding user styles will not be reflected here.',
-	'ADD_TEMPLATE'			=> 'Create template',
-	'ADD_TEMPLATE_EXPLAIN'	=> 'Here you can add a new template. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this template set on an existing one. You may also be able to upload or import (from the store directory) a template archive. If you upload or import an archive the template name can be optionally taken from the archive name (to do this leave the template name blank).',
-	'ARCHIVE_FORMAT'		=> 'Archive file type',
-	'AUTOMATIC_EXPLAIN'		=> 'Leave blank to attempt automatic detection.',
 
-	'BACKGROUND'			=> 'Background',
-	'BACKGROUND_COLOUR'		=> 'Background colour',
-	'BACKGROUND_IMAGE'		=> 'Background image',
-	'BACKGROUND_REPEAT'		=> 'Background repeat',
-	'BOLD'					=> 'Bold',
-
-	'CACHE'							=> 'Cache',
-	'CACHE_CACHED'					=> 'Cached',
-	'CACHE_FILENAME'				=> 'Template file',
-	'CACHE_FILESIZE'				=> 'File size',
-	'CACHE_MODIFIED'				=> 'Modified',
 	'CANNOT_BE_INSTALLED'			=> 'Cannot be installed',
-	'CONFIRM_TEMPLATE_CLEAR_CACHE'	=> 'Are you sure you wish to clear all cached versions of your template files?',
-	'CONFIRM_DELETE_STYLES'			=> 'Are you sure you wish to delete selected styles?',
 	'CONFIRM_UNINSTALL_STYLES'		=> 'Are you sure you wish to uninstall selected styles?',
 	'COPYRIGHT'						=> 'Copyright',
-	'CREATE_STYLE'					=> 'Create new style',
-	'CREATE_TEMPLATE'				=> 'Create new template set',
-	'CREATE_THEME'					=> 'Create new theme',
-	'CURRENT_IMAGE'					=> 'Current image',
 
 	'DEACTIVATE_DEFAULT'		=> 'You cannot deactivate the default style.',
 	'DELETE_FROM_FS'			=> 'Delete from filesystem',
-	'DELETE_STYLE'				=> 'Delete style',
-	'DELETE_STYLE_EXPLAIN'		=> 'Here you can remove the selected style. Take care in deleting styles, there is no undo capability.',
 	'DELETE_STYLE_FILES_FAILED'	=> 'Error deleting files for style "%s".',
 	'DELETE_STYLE_FILES_SUCCESS'	=> 'Files for style "%s" have been deleted.',
-	'DELETE_TEMPLATE'			=> 'Delete template',
-	'DELETE_TEMPLATE_EXPLAIN'	=> 'Here you can remove the selected template set from the database. Please note that there is no undo capability. It is recommended that you first export your set for possible future use.',
 	'DETAILS'					=> 'Details',
-	'DIMENSIONS_EXPLAIN'		=> 'Selecting yes here will include width/height parameters.',
-
-
-	'EDIT_DETAILS_STYLE'				=> 'Edit style',
-	'EDIT_DETAILS_STYLE_EXPLAIN'		=> 'Using the form below you can modify this existing style. You may alter the combination of template and theme which define the style itself. You may also make the style the default one.',
-	'EDIT_DETAILS_TEMPLATE'				=> 'Edit template details',
-	'EDIT_DETAILS_TEMPLATE_EXPLAIN'		=> 'Here you can edit certain template details such as its name.',
-	'EDIT_DETAILS_THEME'				=> 'Edit theme details',
-	'EDIT_DETAILS_THEME_EXPLAIN'		=> 'Here you can edit certain theme details such as its name.',
-	'EDIT_TEMPLATE'						=> 'Edit template',
-	'EDIT_TEMPLATE_EXPLAIN'				=> 'Here you can edit your template set directly. Please remember that these edits are permanent and cannot be undone once submitted. Please take care when editing your template set, remember to close all replacement variable terms {XXXX} and conditional statements.',
-	'EDIT_THEME'						=> 'Edit theme',
-	'EDIT_THEME_EXPLAIN'				=> 'Here you can edit the selected theme, changing colours, images, etc.',
-	'EDITOR_DISABLED'					=> 'The template editor is disabled.',
-	'EXPORT'							=> 'Export',
-
-	'FOREGROUND'			=> 'Foreground',
-	'FONT_COLOUR'			=> 'Font colour',
-	'FONT_FACE'				=> 'Font face',
-	'FONT_FACE_EXPLAIN'		=> 'You can specify multiple fonts separated by commas. If a user doesn’t have the first font installed the first other working font will be chosen.',
-	'FONT_SIZE'				=> 'Font size',
-
-	'GLOBAL_IMAGES'			=> 'Global',
-
-	'HIDE_CSS'				=> 'Hide raw CSS',
-
-	'IMAGE_WIDTH'				=> 'Image width',
-	'IMAGE_HEIGHT'				=> 'Image height',
-	'IMAGE'						=> 'Image',
-	'IMAGE_NAME'				=> 'Image name',
-	'IMAGE_PARAMETER'			=> 'Parameter',
-	'IMAGE_VALUE'				=> 'Value',
-
-	'ITALIC'					=> 'Italic',
-
-	'IMG_CAT_BUTTONS'		=> 'Localised buttons',
-	'IMG_CAT_CUSTOM'		=> 'Custom images',
-	'IMG_CAT_FOLDERS'		=> 'Topic icons',
-	'IMG_CAT_FORUMS'		=> 'Forum icons',
-	'IMG_CAT_ICONS'			=> 'General icons',
-	'IMG_CAT_LOGOS'			=> 'Logos',
-	'IMG_CAT_POLLS'			=> 'Polling images',
-	'IMG_CAT_UI'			=> 'General user interface elements',
-	'IMG_CAT_USER'			=> 'Additional images',
-
-	'IMG_SITE_LOGO'			=> 'Main logo',
-	'IMG_UPLOAD_BAR'		=> 'Upload progress bar',
-	'IMG_POLL_LEFT'			=> 'Poll left end',
-	'IMG_POLL_CENTER'		=> 'Poll centre',
-	'IMG_POLL_RIGHT'		=> 'Poll right end',
-	'IMG_ICON_FRIEND'		=> 'Add as friend',
-	'IMG_ICON_FOE'			=> 'Add as foe',
-
-	'IMG_FORUM_LINK'			=> 'Forum link',
-	'IMG_FORUM_READ'			=> 'Forum',
-	'IMG_FORUM_READ_LOCKED'		=> 'Forum locked',
-	'IMG_FORUM_READ_SUBFORUM'	=> 'Subforum',
-	'IMG_FORUM_UNREAD'			=> 'Forum unread posts',
-	'IMG_FORUM_UNREAD_LOCKED'	=> 'Forum unread posts locked',
-	'IMG_FORUM_UNREAD_SUBFORUM'	=> 'Subforum unread posts',
-	'IMG_SUBFORUM_READ'			=> 'Legend subforum',
-	'IMG_SUBFORUM_UNREAD'		=> 'Legend subforum unread posts',
-
-	'IMG_TOPIC_MOVED'			=> 'Topic moved',
-
-	'IMG_TOPIC_READ'				=> 'Topic',
-	'IMG_TOPIC_READ_MINE'			=> 'Topic posted to',
-	'IMG_TOPIC_READ_HOT'			=> 'Topic popular',
-	'IMG_TOPIC_READ_HOT_MINE'		=> 'Topic popular posted to',
-	'IMG_TOPIC_READ_LOCKED'			=> 'Topic locked',
-	'IMG_TOPIC_READ_LOCKED_MINE'	=> 'Topic locked posted to',
-
-	'IMG_TOPIC_UNREAD'				=> 'Topic unread posts',
-	'IMG_TOPIC_UNREAD_MINE'			=> 'Topic posted to unread',
-	'IMG_TOPIC_UNREAD_HOT'			=> 'Topic popular unread posts',
-	'IMG_TOPIC_UNREAD_HOT_MINE'		=> 'Topic popular posted to unread',
-	'IMG_TOPIC_UNREAD_LOCKED'		=> 'Topic locked unread',
-	'IMG_TOPIC_UNREAD_LOCKED_MINE'	=> 'Topic locked posted to unread',
-
-	'IMG_STICKY_READ'				=> 'Sticky topic',
-	'IMG_STICKY_READ_MINE'			=> 'Sticky topic posted to',
-	'IMG_STICKY_READ_LOCKED'		=> 'Sticky topic locked',
-	'IMG_STICKY_READ_LOCKED_MINE'	=> 'Sticky topic locked posted to',
-	'IMG_STICKY_UNREAD'				=> 'Sticky topic unread posts',
-	'IMG_STICKY_UNREAD_MINE'		=> 'Sticky topic posted to unread',
-	'IMG_STICKY_UNREAD_LOCKED'		=> 'Sticky topic locked unread posts',
-	'IMG_STICKY_UNREAD_LOCKED_MINE'	=> 'Sticky topic locked posted to unread',
-
-	'IMG_ANNOUNCE_READ'					=> 'Announcement',
-	'IMG_ANNOUNCE_READ_MINE'			=> 'Announcement posted to',
-	'IMG_ANNOUNCE_READ_LOCKED'			=> 'Announcement locked',
-	'IMG_ANNOUNCE_READ_LOCKED_MINE'		=> 'Announcement locked posted to',
-	'IMG_ANNOUNCE_UNREAD'				=> 'Announcement unread posts',
-	'IMG_ANNOUNCE_UNREAD_MINE'			=> 'Announcement posted to unread',
-	'IMG_ANNOUNCE_UNREAD_LOCKED'		=> 'Announcement locked unread posts',
-	'IMG_ANNOUNCE_UNREAD_LOCKED_MINE'	=> 'Announcement locked posted to unread',
 
-	'IMG_GLOBAL_READ'					=> 'Global',
-	'IMG_GLOBAL_READ_MINE'				=> 'Global posted to',
-	'IMG_GLOBAL_READ_LOCKED'			=> 'Global locked',
-	'IMG_GLOBAL_READ_LOCKED_MINE'		=> 'Global locked posted to',
-	'IMG_GLOBAL_UNREAD'					=> 'Global unread posts',
-	'IMG_GLOBAL_UNREAD_MINE'			=> 'Global posted to unread',
-	'IMG_GLOBAL_UNREAD_LOCKED'			=> 'Global locked unread posts',
-	'IMG_GLOBAL_UNREAD_LOCKED_MINE'		=> 'Global locked posted to unread',
-
-	'IMG_PM_READ'		=> 'Read private message',
-	'IMG_PM_UNREAD'		=> 'Unread private message',
-
-	'IMG_ICON_BACK_TOP'		=> 'Top',
-
-	'IMG_ICON_CONTACT_EMAIL'	=> 'Send email',
-	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber',
-	'IMG_ICON_CONTACT_PM'		=> 'Send message',
-
-	'IMG_ICON_POST_DELETE'			=> 'Delete post',
-	'IMG_ICON_POST_EDIT'			=> 'Edit post',
-	'IMG_ICON_POST_INFO'			=> 'Show post details',
-	'IMG_ICON_POST_QUOTE'			=> 'Quote post',
-	'IMG_ICON_POST_REPORT'			=> 'Report post',
-	'IMG_ICON_POST_TARGET'			=> 'Minipost',
-	'IMG_ICON_POST_TARGET_UNREAD'	=> 'New minipost',
-
-
-	'IMG_ICON_TOPIC_ATTACH'			=> 'Attachment',
-	'IMG_ICON_TOPIC_LATEST'			=> 'Last post',
-	'IMG_ICON_TOPIC_NEWEST'			=> 'Last unread post',
-	'IMG_ICON_TOPIC_REPORTED'		=> 'Post reported',
-	'IMG_ICON_TOPIC_UNAPPROVED'		=> 'Post unapproved',
-
-	'IMG_ICON_USER_ONLINE'		=> 'User online',
-	'IMG_ICON_USER_OFFLINE'		=> 'User offline',
-	'IMG_ICON_USER_PROFILE'		=> 'Show profile',
-	'IMG_ICON_USER_SEARCH'		=> 'Search posts',
-	'IMG_ICON_USER_WARN'		=> 'Warn user',
-
-	'IMG_BUTTON_PM_FORWARD'		=> 'Forward private message',
-	'IMG_BUTTON_PM_NEW'			=> 'New private message',
-	'IMG_BUTTON_PM_REPLY'		=> 'Reply private message',
-	'IMG_BUTTON_TOPIC_LOCKED'	=> 'Topic locked',
-	'IMG_BUTTON_TOPIC_NEW'		=> 'New topic',
-	'IMG_BUTTON_TOPIC_REPLY'	=> 'Reply topic',
-
-	'IMG_USER_ICON1'		=> 'User defined image 1',
-	'IMG_USER_ICON2'		=> 'User defined image 2',
-	'IMG_USER_ICON3'		=> 'User defined image 3',
-	'IMG_USER_ICON4'		=> 'User defined image 4',
-	'IMG_USER_ICON5'		=> 'User defined image 5',
-	'IMG_USER_ICON6'		=> 'User defined image 6',
-	'IMG_USER_ICON7'		=> 'User defined image 7',
-	'IMG_USER_ICON8'		=> 'User defined image 8',
-	'IMG_USER_ICON9'		=> 'User defined image 9',
-	'IMG_USER_ICON10'		=> 'User defined image 10',
-
-	'INACTIVE_STYLES'			=> 'Inactive styles',
-	'INCLUDE_DIMENSIONS'		=> 'Include dimensions',
-	'INCLUDE_TEMPLATE'			=> 'Include template',
-	'INCLUDE_THEME'				=> 'Include theme',
 	'INHERITING_FROM'			=> 'Inherits from',
 	'INSTALL_STYLE'				=> 'Install style',
 	'INSTALL_STYLES'			=> 'Install styles',
 	'INSTALL_STYLES_EXPLAIN'	=> 'Here you can install new styles.<br />If you cannot find a specific style in list below, check to make sure style is already installed. If it is not installed, check if it was uploaded correctly.',
-	'INSTALLED_STYLE'			=> 'Installed styles',
 	'INVALID_STYLE_ID'			=> 'Invalid style ID.',
 
-	'LINE_SPACING'				=> 'Line spacing',
-	'LOCALISED_IMAGES'			=> 'Localised',
-
-	'NO_CLASS'					=> 'Cannot find class in stylesheet.',
-	'NO_IMAGE'					=> 'No image',
-	'NO_IMAGE_ERROR'			=> 'Cannot find image on filesystem.',
 	'NO_MATCHING_STYLES_FOUND'	=> 'No styles match your query.',
-	'NO_STYLE'					=> 'Cannot find style on filesystem.',
-	'NO_TEMPLATE'				=> 'Cannot find template on filesystem.',
-	'NO_THEME'					=> 'Cannot find theme on filesystem.',
 	'NO_UNINSTALLED_STYLE'		=> 'No uninstalled styles detected.',
-	'NO_UNIT'					=> 'None',
-
-	'ONLY_STYLE'			=> 'This is the only remaining style, you cannot delete it.',
 
-	'PARENT_STYLE_NOT_FOUND'	=> 'Parent style was not found. This style may not work correctly. Please uninstall it.',
 	'PURGED_CACHE'				=> 'Cache was purged.',
 
-	'REFRESH'					=> 'Refresh',
-	'REPEAT_NO'					=> 'None',
-	'REPEAT_X'					=> 'Only horizontally',
-	'REPEAT_Y'					=> 'Only vertically',
-	'REPEAT_ALL'				=> 'Both directions',
-	'REPLACE_STYLE'				=> 'Replace style with',
-	'REPLACE_STYLE_EXPLAIN'		=> 'This style will replace the one being deleted for members that use it.',
-	'REPLACE_TEMPLATE'			=> 'Replace template with',
-	'REPLACE_TEMPLATE_EXPLAIN'	=> 'This template set will replace the one you are deleting in any styles that use it.',
-	'REPLACE_THEME'				=> 'Replace theme with',
-	'REPLACE_THEME_EXPLAIN'		=> 'This theme will replace the one you are deleting in any styles that use it.',
-	'REPLACE_WITH_OPTION'		=> 'Replace with “%s”',
 	'REQUIRES_STYLE'			=> 'This style requires the style "%s" to be installed.',
 
-	'SELECT_IMAGE'				=> 'Select image',
-	'SELECT_TEMPLATE'			=> 'Select template file',
-	'SELECT_THEME'				=> 'Select theme file',
-	'SELECTED_IMAGE'			=> 'Selected image',
-	'SELECTED_TEMPLATE'			=> 'Selected template',
-	'SELECTED_TEMPLATE_FILE'	=> 'Selected template file',
-	'SELECTED_THEME'			=> 'Selected theme',
-	'SELECTED_THEME_FILE'		=> 'Selected theme file',
-	'STORE_FILESYSTEM'			=> 'Filesystem',
 	'STYLE_ACTIVATE'			=> 'Activate',
-	'STYLE_ACTIVATED'			=> 'Style activated successfully',
 	'STYLE_ACTIVE'				=> 'Active',
-	'STYLE_ADDED'				=> 'Style added successfully.',
 	'STYLE_DEACTIVATE'			=> 'Deactivate',
-	'STYLE_DEACTIVATED'			=> 'Style deactivated successfully',
 	'STYLE_DEFAULT'				=> 'Make default style',
-	'STYLE_DEFAULT_CHANGE'		=> 'Change default style',
 	'STYLE_DEFAULT_CHANGE_INACTIVE'	=> 'You must activate style before making it default style.',
-	'STYLE_DELETED'				=> 'Style "%s" deleted successfully.',
-	'STYLE_DETAILS_UPDATED'		=> 'Style edited successfully.',
-	'STYLE_ERR_ARCHIVE'			=> 'Please select an archive method.',
-	'STYLE_ERR_COPY_LONG'		=> 'The copyright can be no longer than 60 characters.',
 	'STYLE_ERR_INVALID_PARENT'	=> 'Invalid parent style.',
-	'STYLE_ERR_MORE_ELEMENTS'	=> 'You must select at least one style element.',
-	'STYLE_ERR_NAME_CHARS'		=> 'The style name can only contain alphanumeric characters, -, +, _ and space.',
 	'STYLE_ERR_NAME_EXIST'		=> 'A style with that name already exists.',
-	'STYLE_ERR_NAME_LONG'		=> 'The style name can be no longer than 30 characters.',
-	'STYLE_ERR_NOT_STYLE'		=> 'The imported or uploaded file did not contain a valid style archive.',
 	'STYLE_ERR_STYLE_NAME'		=> 'You must supply a name for this style.',
-	'STYLE_EXPORT'				=> 'Export style',
-	'STYLE_EXPORT_EXPLAIN'		=> 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme for a commonly used template you could simply export the theme and omit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
-	'STYLE_EXPORTED'			=> 'Style exported successfully and stored in %s.',
 	'STYLE_INSTALLED'			=> 'Style "%s" has been installed.',
-	'STYLE_INSTALLED_EDIT_DETAILS'	=> '<a href="%s">Click here</a> to edit style details or to change default style.',
 	'STYLE_INSTALLED_RETURN_STYLES'	=> '<a href="%s">Click here</a> to return to installed styles list.',
 	'STYLE_INSTALLED_RETURN_UNINSTALLED'	=> '<a href="%s">Click here</a> to install more styles.',
 	'STYLE_NAME'				=> 'Style name',
 	'STYLE_NOT_INSTALLED'		=> 'Style "%s" was not installed.',
 	'STYLE_PATH'				=> 'Style path:',
-	'STYLE_PARENT'				=> 'Parent style:',
-	'STYLE_TEMPLATE'			=> 'Template',
-	'STYLE_THEME'				=> 'Theme',
 	'STYLE_UNINSTALL'			=> 'Uninstall',
 	'STYLE_UNINSTALL_DEPENDENT'	=> 'Style "%s" cannot be uninstalled because it has one or more child styles.',
 	'STYLE_UNINSTALLED'			=> 'Style "%s" uninstalled successfully.',
 	'STYLE_USED_BY'				=> 'Used by (including robots)',
 
-	'TEMPLATE_ADDED'			=> 'Template set added.',
-	'TEMPLATE_CACHE'			=> 'Template cache',
-	'TEMPLATE_CACHE_EXPLAIN'	=> 'By default phpBB caches the compiled version of its templates. This decreases the load on the server each time a page is viewed and thus may reduce the page generation time. Here you can view the cache status of each file and delete individual files or the entire cache.',
-	'TEMPLATE_CACHE_CLEARED'	=> 'Template cache cleared successfully.',
-	'TEMPLATE_CACHE_EMPTY'		=> 'There are no cached templates.',
-	'TEMPLATE_DELETED_FS'		=> 'Template set removed from database but files remain on the filesystem.',
-	'TEMPLATE_DETAILS_UPDATED'	=> 'Template details successfully updated.',
-	'TEMPLATE_EDITOR'			=> 'Raw HTML template editor',
-	'TEMPLATE_EDITOR_HEIGHT'	=> 'Template editor height',
-	'TEMPLATE_ERR_ARCHIVE'		=> 'Please select an archive method.',
-	'TEMPLATE_ERR_CACHE_READ'	=> 'The cache directory used to store cached versions of template files could not be opened.',
-	'TEMPLATE_ERR_COPY_LONG'	=> 'The copyright can be no longer than 60 characters.',
-	'TEMPLATE_ERR_NAME_CHARS'	=> 'The template name can only contain alphanumeric characters, -, +, _ and space.',
-	'TEMPLATE_ERR_NAME_LONG'	=> 'The template name can be no longer than 30 characters.',
-	'TEMPLATE_ERR_STYLE_NAME'	=> 'You must supply a name for this template.',
-	'TEMPLATE_EXPORT_EXPLAIN'	=> 'Here you can export a template set in the form of an archive. This archive will contain all the files necessary to install the templates on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
-	'TEMPLATE_EXPORTED'			=> 'Templates exported successfully and stored in %s.',
-	'TEMPLATE_FILE'				=> 'Template file',
-	'TEMPLATE_FILE_UPDATED'		=> 'Template file updated successfully.',
-	'TEMPLATE_NAME'				=> 'Template name',
-	'TEMPLATE_FILE_NOT_WRITABLE'=> 'Unable to write to template file %s. Please check the permissions for the directory and the files.',
-
-	'THEME_ADDED'				=> 'New theme added.',
-	'THEME_CLASS_ADDED'			=> 'Custom class added successfully.',
-	'THEME_DELETED'				=> 'Theme deleted successfully.',
-	'THEME_DELETED_FS'			=> 'Theme removed from database but files remain on the filesystem.',
-	'THEME_DETAILS_UPDATED'		=> 'Theme details successfully updated.',
-	'THEME_EDITOR'				=> 'Theme editor',
-	'THEME_EDITOR_HEIGHT'		=> 'Theme editor height',
-	'THEME_ERR_ARCHIVE'			=> 'Please select an archive method.',
-	'THEME_ERR_CLASS_CHARS'		=> 'Only alphanumeric characters plus ., :, -, _ and # are valid in class names.',
-	'THEME_ERR_COPY_LONG'		=> 'The copyright can be no longer than 60 characters.',
-	'THEME_ERR_NAME_CHARS'		=> 'The theme name can only contain alphanumeric characters, -, +, _ and space.',
-	'THEME_ERR_NAME_EXIST'		=> 'A theme with that name already exists.',
-	'THEME_ERR_NAME_LONG'		=> 'The theme name can be no longer than 30 characters.',
-	'THEME_ERR_NOT_THEME'		=> 'The archive you specified does not contain a valid theme.',
-	'THEME_ERR_STYLE_NAME'		=> 'You must supply a name for this theme.',
-	'THEME_FILE'				=> 'Theme file',
-	'THEME_FILE_NOT_WRITABLE'	=> 'Unable to write to theme file %s. Please check the permissions for the directory and the files.',
-	'THEME_EXPORT'				=> 'Export Theme',
-	'THEME_EXPORT_EXPLAIN'		=> 'Here you can export a theme in the form of an archive. This archive will contain all the data necessary to install the theme on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
-	'THEME_EXPORTED'			=> 'Theme exported successfully and stored in %s.',
-	'THEME_NAME'				=> 'Theme name',
-	'THEME_UPDATED'				=> 'Theme updated successfully.',
-
-	'UNDERLINE'				=> 'Underline',
 	'UNINSTALL_DEFAULT'		=> 'You cannot uninstall the default style.',
-	'UNSET'					=> 'Undefined',
-
 ));
-- 
cgit v1.2.1


From b6128dee3f2628ef8cf197d0928febc2e3c8cd6b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 2 Apr 2014 00:23:26 +0200
Subject: [ticket/8700] Use L_COLON instead of adding ":" manually

PHPBB3-8700
---
 phpBB/language/en/acp/styles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 4fa657bc0c..76b1d5e7dd 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -73,7 +73,7 @@ $lang = array_merge($lang, array(
 	'STYLE_INSTALLED_RETURN_UNINSTALLED'	=> '<a href="%s">Click here</a> to install more styles.',
 	'STYLE_NAME'				=> 'Style name',
 	'STYLE_NOT_INSTALLED'		=> 'Style "%s" was not installed.',
-	'STYLE_PATH'				=> 'Style path:',
+	'STYLE_PATH'				=> 'Style path',
 	'STYLE_UNINSTALL'			=> 'Uninstall',
 	'STYLE_UNINSTALL_DEPENDENT'	=> 'Style "%s" cannot be uninstalled because it has one or more child styles.',
 	'STYLE_UNINSTALLED'			=> 'Style "%s" uninstalled successfully.',
-- 
cgit v1.2.1


From 02f739e0e7a73ba703f4403d9e20bfbc8cc8de66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= <maelsoucaze@gmail.com>
Date: Mon, 7 Apr 2014 19:49:49 +0200
Subject: [ticket/12361] Replace the Google logo.

Currently, a link to Google and its logo are displayed in the
language/en/help_bbcode.php file to explain how to correctly format tags
and to add an image to a post. However, the Google logo is outdated and
Google does not allow the use of its logo on third-party websites. Plus,
that overload their servers. I used the blue phpBB logo to replace it
because the grey one with transparent background is hardly visible.

Originally, I just refreshed the old Google logo with the new one
(https://www.google.com/images/srpr/logo5w.png) but Joas proposed to use
the phpBB logo, and I agree with him.

PHPBB3-12361
---
 phpBB/language/en/help_bbcode.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index e0cda9df04..d627ac3908 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -88,7 +88,7 @@ $help = array(
 	),
 	array(
 		0 => 'Linking to another site',
-		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=http://www.google.com/][img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
+		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
 	),
 	array(
 		0 => '--',
@@ -96,7 +96,7 @@ $help = array(
 	),
 	array(
 		0 => 'Adding an image to a post',
-		1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br /><br /><strong>[img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/img]</strong><br /><br />As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br /><br /><strong>[url=http://www.google.com/][img]</strong>http://www.google.com/intl/en_ALL/images/logo.gif<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="http://www.google.com/"><img src="http://www.google.com/intl/en_ALL/images/logo.gif" alt="" /></a>'
+		1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br /><br /><strong>[img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img]</strong><br /><br />As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br /><br /><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="http://www.phpbb.com/"><img src="http://www.phpbb.com/theme/images/logos/blue/160x52.png" alt="" /></a>'
 	),
 	array(
 		0 => 'Adding attachments into a post',
-- 
cgit v1.2.1


From 9c8ea7bdbae24ad6e0e7e3524b8d0503812ffa83 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Fri, 11 Apr 2014 19:48:18 +0200
Subject: [ticket/12389] Change language of email friend

PHPBB3-12389
---
 phpBB/language/en/viewtopic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index b566f4b5c0..afbad5a0d6 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -58,7 +58,7 @@ $lang = array_merge($lang, array(
 		1	=> 'Last edited by %2$s on %3$s, edited %1$d time in total.',
 		2	=> 'Last edited by %2$s on %3$s, edited %1$d times in total.',
 	),
-	'EMAIL_TOPIC'			=> 'Email friend',
+	'EMAIL_TOPIC'			=> 'Email topic',
 	'ERROR_NO_ATTACHMENT'	=> 'The selected attachment does not exist anymore.',
 
 	'FILE_NOT_FOUND_404'	=> 'The file <strong>%s</strong> does not exist.',
-- 
cgit v1.2.1


From eae37267a5dd88233af8c8d93b1f9c8d80dc4757 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 20 Mar 2014 02:33:19 -0700
Subject: [ticket/12265] Simplify contact icon design and move to dropdown.

PHPBB3-12265
---
 phpBB/language/en/common.php     | 1 +
 phpBB/language/en/memberlist.php | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 677b228cc6..0bbc731e13 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -167,6 +167,7 @@ $lang = array_merge($lang, array(
 	'CONGRATULATIONS'		=> 'Congratulations to',
 	'CONNECTION_FAILED'		=> 'Connection failed.',
 	'CONNECTION_SUCCESS'	=> 'Connection was successful!',
+	'CONTACT_USER'			=> 'Contact',
 	'COOKIES_DELETED'		=> 'All board cookies successfully deleted.',
 	'CURRENT_TIME'			=> 'It is currently %s',
 
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 95efe35b7d..f92286a092 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -47,7 +47,6 @@ $lang = array_merge($lang, array(
 	'BEFORE'				=> 'Before',
 
 	'CC_EMAIL'				=> 'Send a copy of this email to yourself.',
-	'CONTACT_USER'			=> 'Contact',
 
 	'DEST_LANG'				=> 'Language',
 	'DEST_LANG_EXPLAIN'		=> 'Select an appropriate language (if available) for the recipient of this message.',
-- 
cgit v1.2.1


From 38775fc06371fd0aebea2794f480dde6d7e643e7 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 16 Feb 2014 00:32:09 -0800
Subject: [ticket/12201] Display error and sorting options when there are no
 attachments

PHPBB3-12201
---
 phpBB/language/en/acp/attachments.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index c7d68d29c2..1eab22839b 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -130,6 +130,7 @@ $lang = array_merge($lang, array(
 	'NOT_ALLOWED_IN_PM'			=> 'Only allowed in posts',
 	'NOT_ALLOWED_IN_PM_POST'	=> 'Not allowed',
 	'NOT_ASSIGNED'				=> 'Not assigned',
+	'NO_ATTACHMENTS'			=> 'No attachments found for this period.',
 	'NO_EXT_GROUP'				=> 'None',
 	'NO_EXT_GROUP_NAME'			=> 'No group name entered',
 	'NO_EXT_GROUP_SPECIFIED'	=> 'No extension group specified.',
-- 
cgit v1.2.1


From 52251acefabb8f093dc3681e0830b3c474a24c53 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 16 Feb 2014 00:37:39 -0800
Subject: [ticket/12201] Fix typos in language pack.

PHPBB3-12201
---
 phpBB/language/en/acp/common.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 5794a7c833..f27a4ce199 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -242,7 +242,7 @@ $lang = array_merge($lang, array(
 	'EXPORT_STORE'			=> 'Store',
 
 	'FILES_GONE'			=> 'Some of the attachments you selected for deletion do not exist. They may have been already deleted. Attachments that did exist were deleted.',
-	'FILES_STATS_WRONG'		=> 'Your files statistics are probably inaccurate and need to be resynchronised. Actual values: number of attachments = %1$d, total size of attachments = %2$s.',
+	'FILES_STATS_WRONG'		=> 'Your file statistics are likely inaccurate and need to be resynchronised. Actual values: number of attachments = %1$d, total size of attachments = %2$s.',
 
 	'GENERAL_OPTIONS'		=> 'General options',
 	'GENERAL_SETTINGS'		=> 'General settings',
@@ -286,7 +286,7 @@ $lang = array_merge($lang, array(
 
 	'REMIND'							=> 'Remind',
 	'RESYNC'							=> 'Resynchronise',
-	'RESYNC_FILES_STATS'				=> 'Resynchronise files statistics',
+	'RESYNC_FILES_STATS'				=> 'Resynchronise file statistics',
 	'RESYNC_FILES_STATS_EXPLAIN'		=> 'Recalculates the total number and size of files attached to posts and private messages.',
 
 	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
@@ -388,7 +388,7 @@ $lang = array_merge($lang, array(
 	'RESET_ONLINE'					=> 'Reset most users ever online',
 	'RESET_ONLINE_CONFIRM'			=> 'Are you sure you wish to reset the most users ever online counter?',
 	'RESET_ONLINE_SUCCESS'				=> 'Most users ever online reset',
-	'RESYNC_FILES_STATS_CONFIRM'	=> 'Are you sure you wish to resynchronise files statistics?',
+	'RESYNC_FILES_STATS_CONFIRM'	=> 'Are you sure you wish to resynchronise file statistics?',
 	'RESYNC_POSTCOUNTS'				=> 'Resynchronise post counts',
 	'RESYNC_POSTCOUNTS_EXPLAIN'		=> 'Only existing posts will be taken into consideration. Pruned posts will not be counted.',
 	'RESYNC_POSTCOUNTS_CONFIRM'		=> 'Are you sure you wish to resynchronise post counts?',
@@ -696,7 +696,7 @@ $lang = array_merge($lang, array(
 	'LOG_REFERER_INVALID'		=> '<strong>Referer validation failed</strong><br />»Referer was “<em>%1$s</em>”. The request was rejected and the session killed.',
 	'LOG_RESET_DATE'			=> '<strong>Board start date reset</strong>',
 	'LOG_RESET_ONLINE'			=> '<strong>Most users online reset</strong>',
-	'LOG_RESYNC_FILES_STATS'	=> '<strong>Files statistics resynchronised</strong>',
+	'LOG_RESYNC_FILES_STATS'	=> '<strong>File statistics resynchronised</strong>',
 	'LOG_RESYNC_POSTCOUNTS'		=> '<strong>User post counts resynchronised</strong>',
 	'LOG_RESYNC_POST_MARKING'	=> '<strong>Dotted topics resynchronised</strong>',
 	'LOG_RESYNC_STATS'			=> '<strong>Post, topic and user statistics resynchronised</strong>',
-- 
cgit v1.2.1


From b73e22ae718981df2ac699c8c27d1dc12d8f1c0c Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 15 Apr 2014 14:19:47 -0700
Subject: [ticket/12201] Add link to resync file stats after error.

PHPBB3-12201
---
 phpBB/language/en/acp/attachments.php | 8 ++++++--
 phpBB/language/en/acp/common.php      | 6 ------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 1eab22839b..6ca2865383 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -107,6 +107,9 @@ $lang = array_merge($lang, array(
 	'EXT_GROUP_REAL_MEDIA'			=> 'Real Media',
 	'EXT_GROUP_WINDOWS_MEDIA'		=> 'Windows Media',
 
+	'FILES_GONE'			=> 'Some of the attachments you selected for deletion do not exist. They may have been already deleted. Attachments that did exist were deleted.',
+	'FILES_STATS_WRONG'		=> 'Your file statistics are likely inaccurate and need to be resynchronised. Actual values: number of attachments = %1$d, total size of attachments = %2$s.<br />Click %3$shere%4$s to resynchronise them.',
+
 	'GO_TO_EXTENSIONS'		=> 'Go to extension management screen',
 	'GROUP_NAME'			=> 'Group name',
 
@@ -144,8 +147,9 @@ $lang = array_merge($lang, array(
 	'ORDER_ALLOW_DENY'		=> 'Allow',
 	'ORDER_DENY_ALLOW'		=> 'Deny',
 
-	'REMOVE_ALLOWED_IPS'		=> 'Remove or un-exclude <em>allowed</em> IPs/hostnames',
-	'REMOVE_DISALLOWED_IPS'		=> 'Remove or un-exclude <em>disallowed</em> IPs/hostnames',
+	'REMOVE_ALLOWED_IPS'			=> 'Remove or un-exclude <em>allowed</em> IPs/hostnames',
+	'REMOVE_DISALLOWED_IPS'			=> 'Remove or un-exclude <em>disallowed</em> IPs/hostnames',
+	'RESYNC_FILES_STATS_CONFIRM'	=> 'Are you sure you wish to resynchronise file statistics?',
 
 	'SEARCH_IMAGICK'				=> 'Search for Imagemagick',
 	'SECURE_ALLOW_DENY'				=> 'Allow/Deny list',
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index f27a4ce199..6f16dfabd4 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -241,9 +241,6 @@ $lang = array_merge($lang, array(
 	'EXPORT_DOWNLOAD'		=> 'Download',
 	'EXPORT_STORE'			=> 'Store',
 
-	'FILES_GONE'			=> 'Some of the attachments you selected for deletion do not exist. They may have been already deleted. Attachments that did exist were deleted.',
-	'FILES_STATS_WRONG'		=> 'Your file statistics are likely inaccurate and need to be resynchronised. Actual values: number of attachments = %1$d, total size of attachments = %2$s.',
-
 	'GENERAL_OPTIONS'		=> 'General options',
 	'GENERAL_SETTINGS'		=> 'General settings',
 	'GLOBAL_MASK'			=> 'Global permission mask',
@@ -286,8 +283,6 @@ $lang = array_merge($lang, array(
 
 	'REMIND'							=> 'Remind',
 	'RESYNC'							=> 'Resynchronise',
-	'RESYNC_FILES_STATS'				=> 'Resynchronise file statistics',
-	'RESYNC_FILES_STATS_EXPLAIN'		=> 'Recalculates the total number and size of files attached to posts and private messages.',
 
 	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
 	'SELECT_OPTION'			=> 'Select option',
@@ -388,7 +383,6 @@ $lang = array_merge($lang, array(
 	'RESET_ONLINE'					=> 'Reset most users ever online',
 	'RESET_ONLINE_CONFIRM'			=> 'Are you sure you wish to reset the most users ever online counter?',
 	'RESET_ONLINE_SUCCESS'				=> 'Most users ever online reset',
-	'RESYNC_FILES_STATS_CONFIRM'	=> 'Are you sure you wish to resynchronise file statistics?',
 	'RESYNC_POSTCOUNTS'				=> 'Resynchronise post counts',
 	'RESYNC_POSTCOUNTS_EXPLAIN'		=> 'Only existing posts will be taken into consideration. Pruned posts will not be counted.',
 	'RESYNC_POSTCOUNTS_CONFIRM'		=> 'Are you sure you wish to resynchronise post counts?',
-- 
cgit v1.2.1


From 1f44b4da18622c526e89858f7f89df9857f3a00e Mon Sep 17 00:00:00 2001
From: n-aleha <nick_aleha@myway.com>
Date: Mon, 14 Apr 2014 01:14:44 +0300
Subject: [ticket/12345] Improve search flood interval message for ascraeus

Show to guests and users the remaining seconds until their next allowed
search, if a search flood limit is enabled for them.

PHPBB3-12345
---
 phpBB/language/en/search.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index f65022fbcb..13aa66514c 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -69,7 +69,10 @@ $lang = array_merge($lang, array(
 	'NO_RECENT_SEARCHES'	=> 'No searches have been carried out recently.',
 	'NO_SEARCH'				=> 'Sorry but you are not permitted to use the search system.',
 	'NO_SEARCH_RESULTS'		=> 'No suitable matches were found.',
-	'NO_SEARCH_TIME'		=> 'Sorry but you cannot use search at this time. Please try again in a few minutes.',
+	'NO_SEARCH_TIME'		=> array(
+		1	=> 'Sorry but you cannot use search at this time. Please try again in %d second.',
+		2	=> 'Sorry but you cannot use search at this time. Please try again in %d seconds.',
+	),
 	'NO_SEARCH_UNREADS'		=> 'Sorry but searching for unread posts has been disabled on this board.',
 	'WORD_IN_NO_POST'		=> 'No posts were found because the word <strong>%s</strong> is not contained in any post.',
 	'WORDS_IN_NO_POST'		=> 'No posts were found because the words <strong>%s</strong> are not contained in any post.',
-- 
cgit v1.2.1


From 40c685e6fcbe3e5e9d2626f2b5ce46b6665d8a33 Mon Sep 17 00:00:00 2001
From: Markus Stenudd <stenudden@gmail.com>
Date: Sat, 30 Nov 2013 16:01:26 +0100
Subject: [ticket/8558] Add display name in emails from board

PHPBB3-8558
---
 phpBB/language/en/acp/board.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 1d2c979e0c..5ca2c9ea45 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -524,6 +524,8 @@ $lang = array_merge($lang, array(
 	'BOARD_HIDE_EMAILS_EXPLAIN'		=> 'This function keeps email addresses completely private.',
 	'CONTACT_EMAIL'					=> 'Contact email address',
 	'CONTACT_EMAIL_EXPLAIN'			=> 'This address will be used whenever a specific contact point is needed, e.g. spam, error output, etc. It will always be used as the <samp>From</samp> and <samp>Reply-To</samp> address in emails.',
+	'CONTACT_EMAIL_NAME'			=> 'Contact name',
+	'CONTACT_EMAIL_NAME_EXPLAIN'	=> 'This is the contact name that e-mail recipients see. Leave blank to just send the e-mail address',
 	'EMAIL_FUNCTION_NAME'			=> 'Email function name',
 	'EMAIL_FUNCTION_NAME_EXPLAIN'	=> 'The email function used to send mails through PHP.',
 	'EMAIL_PACKAGE_SIZE'			=> 'Email package size',
-- 
cgit v1.2.1


From 59cdc26fb41d2bccb6da42af86125ea7fe2af8c8 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Thu, 17 Apr 2014 21:59:23 +0200
Subject: [ticket/8558] Use only one variable and improve explain string

PHPBB3-8558
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 5ca2c9ea45..696e82324c 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -525,7 +525,7 @@ $lang = array_merge($lang, array(
 	'CONTACT_EMAIL'					=> 'Contact email address',
 	'CONTACT_EMAIL_EXPLAIN'			=> 'This address will be used whenever a specific contact point is needed, e.g. spam, error output, etc. It will always be used as the <samp>From</samp> and <samp>Reply-To</samp> address in emails.',
 	'CONTACT_EMAIL_NAME'			=> 'Contact name',
-	'CONTACT_EMAIL_NAME_EXPLAIN'	=> 'This is the contact name that e-mail recipients see. Leave blank to just send the e-mail address',
+	'CONTACT_EMAIL_NAME_EXPLAIN'	=> 'This is the contact name that e-mail recipients will see. If you don’t want to have a contact name, leave this field empty.',
 	'EMAIL_FUNCTION_NAME'			=> 'Email function name',
 	'EMAIL_FUNCTION_NAME_EXPLAIN'	=> 'The email function used to send mails through PHP.',
 	'EMAIL_PACKAGE_SIZE'			=> 'Email package size',
-- 
cgit v1.2.1


From 4e1a86d848b90f9e36b012494c592feec153cc22 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Sun, 20 Apr 2014 20:32:45 +0200
Subject: [ticket/12389] Moved PM tools to UCP template

PHPBB3-12389
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 40c8bd9f8e..0af2ffe039 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -412,6 +412,7 @@ $lang = array_merge($lang, array(
 	'PM_SENTBOX'				=> 'Sent messages',
 	'PM_SUBJECT'				=> 'Message subject',
 	'PM_TO'						=> 'Send to',
+	'PM_TOOLS'					=> 'PM tools',
 	'PM_USERS_REMOVED_NO_PM'	=> 'Some users couldn’t be added as they have disabled private message receipt.',
 	'POST_EDIT_PM'				=> 'Edit message',
 	'POST_FORWARD_PM'			=> 'Forward message',
-- 
cgit v1.2.1


From 607698c8844b1f08aef1aca63cd8d981783ef92a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 11 Apr 2014 19:23:31 -0700
Subject: [ticket/10737] Add config setting to disable live searches.

PHPBB3-10737
---
 phpBB/language/en/acp/board.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 1d2c979e0c..5488bead17 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -356,6 +356,8 @@ $lang = array_merge($lang, array(
 
 	'ALLOW_CDN'						=> 'Allow usage of third party content delivery networks',
 	'ALLOW_CDN_EXPLAIN'				=> 'If this setting is enabled, some files will be served from external third party servers instead of your server. This reduces the network bandwidth required by your server, but may present a privacy issue for some board administrators. In a default phpBB installation, this includes loading “jQuery” and the font “Open Sans” from Google’s content delivery network.',
+	'ALLOW_LIVE_SEARCHES'			=> 'Allow live searches',
+	'ALLOW_LIVE_SEARCHES_EXPLAIN'	=> 'If this setting is enabled, users are provided with keyword suggestions as they type in certain fields throughout the board.',
 	'CUSTOM_PROFILE_FIELDS'			=> 'Custom profile fields',
 	'LIMIT_LOAD'					=> 'Limit system load',
 	'LIMIT_LOAD_EXPLAIN'			=> 'If the system’s 1-minute load average exceeds this value the board will automatically go offline. A value of 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers and where this information is accessible. The value here resets itself to 0 if phpBB was unable to get the load limit.',
-- 
cgit v1.2.1


From f2e74354a34561940c3203f24816af2496b95b0b Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 12 Apr 2014 04:26:51 -0700
Subject: [ticket/10737] Enforce allow_live_searches setting in memberlist.php.

PHPBB3-10737
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 677b228cc6..030559eeb5 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -348,6 +348,7 @@ $lang = array_merge($lang, array(
 	'LDAP_NO_SERVER_CONNECTION'			=> 'Could not connect to LDAP server.',
 	'LDAP_SEARCH_FAILED'				=> 'An error occurred while searching the LDAP directory.',
 	'LEGEND'							=> 'Legend',
+	'LIVE_SEARCHES_NOT_ALLOWED'			=> 'Live searches are not allowed.',
 	'LOADING'							=> 'Loading',
 	'LOCATION'							=> 'Location',
 	'LOCK_POST'							=> 'Lock post',
-- 
cgit v1.2.1


From 65c8280fb6a7ca9382d3d57c51bcd2aeecb128c8 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 24 Apr 2014 22:09:15 +0200
Subject: [ticket/12389] Change "PM" to "Message"

PHPBB3-12389
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 0af2ffe039..5148589471 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -412,7 +412,7 @@ $lang = array_merge($lang, array(
 	'PM_SENTBOX'				=> 'Sent messages',
 	'PM_SUBJECT'				=> 'Message subject',
 	'PM_TO'						=> 'Send to',
-	'PM_TOOLS'					=> 'PM tools',
+	'PM_TOOLS'					=> 'Message tools',
 	'PM_USERS_REMOVED_NO_PM'	=> 'Some users couldn’t be added as they have disabled private message receipt.',
 	'POST_EDIT_PM'				=> 'Edit message',
 	'POST_FORWARD_PM'			=> 'Forward message',
-- 
cgit v1.2.1


From 37751b51f95a3f05ea9a40f74978989edd2af69e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 11 Apr 2014 12:50:29 +0200
Subject: [ticket/12371] Do not add unlimited users as responders

We run into the risc that the data is longer then the character limit
of the table column. However as we trim the users list anyway, we can
also just stop adding them and display "many others" instead of "x others"

PHPBB3-12371
---
 phpBB/language/en/common.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 677b228cc6..956b593476 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -422,14 +422,16 @@ $lang = array_merge($lang, array(
 	'NOT_WATCHING_FORUM'		=> 'You are no longer subscribed to updates on this forum.',
 	'NOT_WATCHING_TOPIC'		=> 'You are no longer subscribed to this topic.',
 	'NOTIFICATIONS'				=> 'Notifications',
-	// This applies for NOTIFICATION_BOOKMARK, NOTIFICATION_POST, and NOTIFICATION_QUOTE.
+	// This applies for NOTIFICATION_BOOKMARK and NOTIFICATION_POST.
 	// %1$s will return a list of users that's concatenated using "," and "and" - see STRING_LIST
 	// Once the user count reaches 5 users or more, the list is trimmed using NOTIFICATION_X_OTHERS
+	// Once the user count reaches 20 users or more, the list is trimmed using NOTIFICATION_MANY_OTHERS
 	// Examples:
 	// A replied...
 	// A and B replied...
 	// A, B and C replied...
 	// A, B, C and 2 others replied...
+	// A, B, C and many others replied...
 	'NOTIFICATION_BOOKMARK'				=> array(
 		1	=> '%1$s replied to the topic “%2$s” you have bookmarked.',
 	),
@@ -454,7 +456,8 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by %1$s and needs approval.',
 	'NOTIFICATION_TYPE_NOT_EXIST'		=> 'The notification type "%s" is missing from the file system.',
 	'NOTIFICATION_ADMIN_ACTIVATE_USER'	=> 'The user “%1$s” is newly registered and requires activation.',
-	// Used in conjuction with NOTIFICATION_BOOKMARK, NOTIFICATION_POST, and NOTIFICATION_QUOTE.
+	// Used in conjuction with NOTIFICATION_BOOKMARK and NOTIFICATION_POST.
+	'NOTIFICATION_MANY_OTHERS'			=> 'many others',
 	'NOTIFICATION_X_OTHERS'				=> array(
 		2	=> '%d others',
 	),
-- 
cgit v1.2.1


From 5ec9f40b7898f4b38f5505f3fece18bafae5807c Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Sat, 26 Apr 2014 01:18:34 +0200
Subject: [ticket/12445] Disapproved post: the name of the poster should be in
 logs

https://tracker.phpbb.com/browse/PHPBB3-12445

PHPBB3-12445
---
 phpBB/language/en/acp/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 6f16dfabd4..7e8ee0e15c 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -551,7 +551,7 @@ $lang = array_merge($lang, array(
 	'LOG_PM_REPORT_CLOSED'		=> '<strong>Closed PM report</strong><br />» %s',
 	'LOG_PM_REPORT_DELETED'		=> '<strong>Deleted PM report</strong><br />» %s',
 	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br />» %s',
-	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” with the following reason</strong><br />» %2$s',
+	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” written by “%3$s” with the following reason</strong><br />» %2$s',
 	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
 	'LOG_POST_RESTORED'			=> '<strong>Restored post</strong><br />» %s',
 	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
@@ -564,7 +564,7 @@ $lang = array_merge($lang, array(
 
 	'LOG_TOPIC_APPROVED'		=> '<strong>Approved topic</strong><br />» %s',
 	'LOG_TOPIC_RESTORED'		=> '<strong>Restored topic</strong><br />» %s',
-	'LOG_TOPIC_DISAPPROVED'		=> '<strong>Disapproved topic “%1$s” with the following reason</strong><br />%2$s',
+	'LOG_TOPIC_DISAPPROVED'		=> '<strong>Disapproved topic “%1$s” written by “%3$s” with the following reason</strong><br />» %2$s',
 	'LOG_TOPIC_RESYNC'			=> '<strong>Resynchronised topic counters</strong><br />» %s',
 	'LOG_TOPIC_TYPE_CHANGED'	=> '<strong>Changed topic type</strong><br />» %s',
 	'LOG_UNLOCK'				=> '<strong>Unlocked topic</strong><br />» %s',
-- 
cgit v1.2.1


From 5c33c201869f224af775c016f0281640a70e8a3a Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Mon, 28 Apr 2014 18:44:56 +0200
Subject: [ticket/12445] Change the formulation

PHPBB3-12445
---
 phpBB/language/en/acp/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 7e8ee0e15c..197aa7da6b 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -551,7 +551,7 @@ $lang = array_merge($lang, array(
 	'LOG_PM_REPORT_CLOSED'		=> '<strong>Closed PM report</strong><br />» %s',
 	'LOG_PM_REPORT_DELETED'		=> '<strong>Deleted PM report</strong><br />» %s',
 	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br />» %s',
-	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” written by “%3$s” with the following reason</strong><br />» %2$s',
+	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” written by “%3$s” for the following reason</strong><br />» %2$s',
 	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
 	'LOG_POST_RESTORED'			=> '<strong>Restored post</strong><br />» %s',
 	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
@@ -564,7 +564,7 @@ $lang = array_merge($lang, array(
 
 	'LOG_TOPIC_APPROVED'		=> '<strong>Approved topic</strong><br />» %s',
 	'LOG_TOPIC_RESTORED'		=> '<strong>Restored topic</strong><br />» %s',
-	'LOG_TOPIC_DISAPPROVED'		=> '<strong>Disapproved topic “%1$s” written by “%3$s” with the following reason</strong><br />» %2$s',
+	'LOG_TOPIC_DISAPPROVED'		=> '<strong>Disapproved topic “%1$s” written by “%3$s” for the following reason</strong><br />» %2$s',
 	'LOG_TOPIC_RESYNC'			=> '<strong>Resynchronised topic counters</strong><br />» %s',
 	'LOG_TOPIC_TYPE_CHANGED'	=> '<strong>Changed topic type</strong><br />» %s',
 	'LOG_UNLOCK'				=> '<strong>Unlocked topic</strong><br />» %s',
-- 
cgit v1.2.1


From cec060bb9b74d5c832fe5c3b0570b76197079c15 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 29 Apr 2014 15:43:55 +0200
Subject: [ticket/12456] Fix missing new lines at the end of email templates

PHPBB3-12456
---
 phpBB/language/en/email/admin_activate.txt          | 3 +--
 phpBB/language/en/email/admin_send_email.txt        | 1 -
 phpBB/language/en/email/admin_welcome_activated.txt | 2 +-
 phpBB/language/en/email/admin_welcome_inactive.txt  | 2 +-
 phpBB/language/en/email/email_notify.txt            | 2 +-
 phpBB/language/en/email/installed.txt               | 2 +-
 phpBB/language/en/email/pm_report_closed.txt        | 3 +--
 phpBB/language/en/email/pm_report_deleted.txt       | 3 +--
 phpBB/language/en/email/post_approved.txt           | 2 +-
 phpBB/language/en/email/short/post_approved.txt     | 2 +-
 phpBB/language/en/email/user_activate.txt           | 2 +-
 phpBB/language/en/email/user_activate_inactive.txt  | 2 +-
 phpBB/language/en/email/user_activate_passwd.txt    | 2 +-
 phpBB/language/en/email/user_reactivate_account.txt | 2 +-
 phpBB/language/en/email/user_remind_inactive.txt    | 2 +-
 phpBB/language/en/email/user_resend_inactive.txt    | 2 +-
 phpBB/language/en/email/user_welcome.txt            | 2 +-
 phpBB/language/en/email/user_welcome_inactive.txt   | 2 +-
 18 files changed, 17 insertions(+), 21 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/admin_activate.txt b/phpBB/language/en/email/admin_activate.txt
index 8b11f1b450..a53ab1269e 100644
--- a/phpBB/language/en/email/admin_activate.txt
+++ b/phpBB/language/en/email/admin_activate.txt
@@ -10,5 +10,4 @@ Use this link to view the user's profile:
 Use this link to activate the account:
 {U_ACTIVATE}
 
-
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/admin_send_email.txt b/phpBB/language/en/email/admin_send_email.txt
index b778496258..7345a040fd 100644
--- a/phpBB/language/en/email/admin_send_email.txt
+++ b/phpBB/language/en/email/admin_send_email.txt
@@ -10,5 +10,4 @@ Message sent to you follows:
 
 {MESSAGE}
 
-
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/admin_welcome_activated.txt b/phpBB/language/en/email/admin_welcome_activated.txt
index cfdb69bdcb..2e136ac530 100644
--- a/phpBB/language/en/email/admin_welcome_activated.txt
+++ b/phpBB/language/en/email/admin_welcome_activated.txt
@@ -6,4 +6,4 @@ Your account on "{SITENAME}" has been activated by an administrator, you may log
 
 Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt
index 8605956318..f9a57b9fe3 100644
--- a/phpBB/language/en/email/admin_welcome_inactive.txt
+++ b/phpBB/language/en/email/admin_welcome_inactive.txt
@@ -16,4 +16,4 @@ Your password has been securely stored in our database and cannot be retrieved.
 
 Thank you for registering.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/email_notify.txt b/phpBB/language/en/email/email_notify.txt
index 725b52f0cc..43c9098a4f 100644
--- a/phpBB/language/en/email/email_notify.txt
+++ b/phpBB/language/en/email/email_notify.txt
@@ -14,4 +14,4 @@ A message from {FROM_USERNAME} may also be included below. Please note that this
 
 ----------
 
-{MESSAGE}
\ No newline at end of file
+{MESSAGE}
diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt
index 8f63d07635..93444581f2 100644
--- a/phpBB/language/en/email/installed.txt
+++ b/phpBB/language/en/email/installed.txt
@@ -16,4 +16,4 @@ Useful information regarding the phpBB software can be found in the docs folder
 
 In order to keep your board safe and secure, we highly recommended keeping current with software releases. For your convenience, a mailing list is available at the page referenced above.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/pm_report_closed.txt b/phpBB/language/en/email/pm_report_closed.txt
index 1b9f4a6658..0202b9d374 100644
--- a/phpBB/language/en/email/pm_report_closed.txt
+++ b/phpBB/language/en/email/pm_report_closed.txt
@@ -4,5 +4,4 @@ Hello {USERNAME},
 
 You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" has been tended to by a moderator or administrator. The report is now closed. If you have further questions, please contact {CLOSER_NAME} by private message.
 
-
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/pm_report_deleted.txt b/phpBB/language/en/email/pm_report_deleted.txt
index a868837841..991ed59f31 100644
--- a/phpBB/language/en/email/pm_report_deleted.txt
+++ b/phpBB/language/en/email/pm_report_deleted.txt
@@ -4,5 +4,4 @@ Hello {USERNAME},
 
 You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or administrator.
 
-
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt
index a02dba142a..854d785f5f 100644
--- a/phpBB/language/en/email/post_approved.txt
+++ b/phpBB/language/en/email/post_approved.txt
@@ -10,4 +10,4 @@ If you want to view the post, click the following link:
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/post_approved.txt b/phpBB/language/en/email/short/post_approved.txt
index a02dba142a..854d785f5f 100644
--- a/phpBB/language/en/email/short/post_approved.txt
+++ b/phpBB/language/en/email/short/post_approved.txt
@@ -10,4 +10,4 @@ If you want to view the post, click the following link:
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/user_activate.txt b/phpBB/language/en/email/user_activate.txt
index 7d7960c4c5..b949b68651 100644
--- a/phpBB/language/en/email/user_activate.txt
+++ b/phpBB/language/en/email/user_activate.txt
@@ -6,4 +6,4 @@ Your account on "{SITENAME}" has been deactivated, most likely due to changes ma
 
 {U_ACTIVATE}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/user_activate_inactive.txt b/phpBB/language/en/email/user_activate_inactive.txt
index a90773d48c..7743420698 100644
--- a/phpBB/language/en/email/user_activate_inactive.txt
+++ b/phpBB/language/en/email/user_activate_inactive.txt
@@ -4,4 +4,4 @@ Hello {USERNAME},
 
 Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. The administrator of the board will need to activate it before you can log in. You will receive another notification when this has occurred.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/user_activate_passwd.txt b/phpBB/language/en/email/user_activate_passwd.txt
index 695be115f8..965d5a552c 100644
--- a/phpBB/language/en/email/user_activate_passwd.txt
+++ b/phpBB/language/en/email/user_activate_passwd.txt
@@ -14,4 +14,4 @@ Password: {PASSWORD}
 
 You can of course change this password yourself via the profile page. If you have any difficulties please contact the board administrator.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt
index 385c09f4c5..7564b0a8e4 100644
--- a/phpBB/language/en/email/user_reactivate_account.txt
+++ b/phpBB/language/en/email/user_reactivate_account.txt
@@ -15,4 +15,4 @@ Please visit the following link to reactivate your account:
 
 {U_ACTIVATE}
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/user_remind_inactive.txt b/phpBB/language/en/email/user_remind_inactive.txt
index 1ba28329f6..1f136b56f2 100644
--- a/phpBB/language/en/email/user_remind_inactive.txt
+++ b/phpBB/language/en/email/user_remind_inactive.txt
@@ -8,4 +8,4 @@ This notification is a reminder that your account at "{SITENAME}", created on {R
 
 Thank you for registering at "{SITENAME}", we look forward to your participation.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt
index b9b95ce9e5..d975a07b13 100644
--- a/phpBB/language/en/email/user_resend_inactive.txt
+++ b/phpBB/language/en/email/user_resend_inactive.txt
@@ -16,4 +16,4 @@ Please visit the following link in order to activate your account:
 
 Thank you for registering.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt
index aaead86afc..f299b7b23e 100644
--- a/phpBB/language/en/email/user_welcome.txt
+++ b/phpBB/language/en/email/user_welcome.txt
@@ -14,4 +14,4 @@ Your password has been securely stored in our database and cannot be retrieved.
 
 Thank you for registering.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt
index 5cbb3af3de..b4300d0032 100644
--- a/phpBB/language/en/email/user_welcome_inactive.txt
+++ b/phpBB/language/en/email/user_welcome_inactive.txt
@@ -18,4 +18,4 @@ Your password has been securely stored in our database and cannot be retrieved.
 
 Thank you for registering.
 
-{EMAIL_SIG}
\ No newline at end of file
+{EMAIL_SIG}
-- 
cgit v1.2.1


From 38f05750b73d04b5093e2a7898e5ec576f0d2f30 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 29 Apr 2014 15:44:17 +0200
Subject: [ticket/12456] Fix duplicated empty lines in language files

PHPBB3-12456
---
 phpBB/language/en/acp/common.php      | 2 --
 phpBB/language/en/acp/extensions.php  | 1 -
 phpBB/language/en/acp/permissions.php | 1 -
 phpBB/language/en/acp/posting.php     | 2 --
 phpBB/language/en/ucp.php             | 1 -
 5 files changed, 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 6f16dfabd4..64bfb82fd7 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -85,7 +85,6 @@ $lang = array_merge($lang, array(
 	'ACP_EXTENSION_MANAGEMENT'	=> 'Extension management',
 	'ACP_EXTENSIONS'			=> 'Manage extensions',
 
-
 	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
 	'ACP_FORUM_LOGS'				=> 'Forum logs',
 	'ACP_FORUM_MANAGEMENT'			=> 'Forum management',
@@ -678,7 +677,6 @@ $lang = array_merge($lang, array(
 	'LOG_PURGE_CACHE'			=> '<strong>Purged cache</strong>',
 	'LOG_PURGE_SESSIONS'		=> '<strong>Purged sessions</strong>',
 
-
 	'LOG_RANK_ADDED'		=> '<strong>Added new rank</strong><br />» %s',
 	'LOG_RANK_REMOVED'		=> '<strong>Removed rank</strong><br />» %s',
 	'LOG_RANK_UPDATED'		=> '<strong>Updated rank</strong><br />» %s',
diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index baa7d01763..39881668c4 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -33,7 +33,6 @@ if (empty($lang) || !is_array($lang))
 // 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_merge($lang, array(
 	'EXTENSION'					=> 'Extension',
 	'EXTENSIONS'				=> 'Extensions',
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 6e3ba6876a..36af461f87 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -182,7 +182,6 @@ $lang = array_merge($lang, array(
 	'ROLE_USER_STANDARD'		=> 'Standard Features',
 	'ROLE_USER_NEW_MEMBER'		=> 'Newly Registered User Features',
 
-
 	'ROLE_DESCRIPTION_ADMIN_FORUM'			=> 'Can access the forum management and forum permission settings.',
 	'ROLE_DESCRIPTION_ADMIN_FULL'			=> 'Has access to all administrative functions of this board.<br />Not recommended.',
 	'ROLE_DESCRIPTION_ADMIN_STANDARD'		=> 'Has access to most administrative features but is not allowed to use server or system related tools.',
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index ea3eadb0dd..b65b6695a6 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -109,8 +109,6 @@ $lang = array_merge($lang, array(
 	'DISPLAY_POSTING'			=> 'On posting page',
 	'DISPLAY_POSTING_NO'		=> 'Not on posting page',
 
-
-
 	'EDIT_ICONS'				=> 'Edit icons',
 	'EDIT_SMILIES'				=> 'Edit smilies',
 	'EMOTION'					=> 'Emotion',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 5148589471..535bf78706 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -629,7 +629,6 @@ $lang = array_merge($lang, array(
 		'TO_ME'			=> 'to me'
 	),
 
-
 	'GROUPS_EXPLAIN'	=> 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you additional permissions to view content or increase your capabilities in other areas.',
 	'GROUP_LEADER'		=> 'Leaderships',
 	'GROUP_MEMBER'		=> 'Memberships',
-- 
cgit v1.2.1


From 23b3667978bb9177c8ffb6877904e117a18693fa Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 29 Apr 2014 16:24:51 +0200
Subject: [ticket/12456] Add , after the last array element

PHPBB3-12456
---
 phpBB/language/en/acp/posting.php | 4 ++--
 phpBB/language/en/common.php      | 2 +-
 phpBB/language/en/help_bbcode.php | 2 +-
 phpBB/language/en/help_faq.php    | 2 +-
 phpBB/language/en/mcp.php         | 2 +-
 phpBB/language/en/ucp.php         | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index b65b6695a6..cf570d844f 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -85,8 +85,8 @@ $lang = array_merge($lang, array(
 		'URL'			=> 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, “http://” is prefixed to the string.',
 		'LOCAL_URL'		=> 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol, as links are prefixed with “%s”',
 		'RELATIVE_URL'	=> 'A relative URL. You can use this to match parts of a URL, but be careful: a full URL is a valid relative URL. When you want to use relative URLs of your board, use the LOCAL_URL token.',
-		'COLOR'			=> 'A HTML colour, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>'
-	)
+		'COLOR'			=> 'A HTML colour, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>',
+	),
 ));
 
 // Smilies and topic icons
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 677b228cc6..f78ce76050 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -1370,7 +1370,7 @@ $lang = array_merge($lang, array(
 		'D M d, Y g:i a'		=> 'Mon Jan 01, 2007 1:37 pm',
 		'F jS, Y, g:i a'		=> 'January 1st, 2007, 1:37 pm',
 		'|d M Y|, H:i'			=> 'Today, 13:37 / 01 Jan 2007, 13:37',
-		'|F jS, Y|, g:i a'		=> 'Today, 1:37 pm / January 1st, 2007, 1:37 pm'
+		'|F jS, Y|, g:i a'		=> 'Today, 1:37 pm / January 1st, 2007, 1:37 pm',
 	),
 
 	// The default dateformat which will be used on new installs in this language
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index d627ac3908..61263752b2 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -109,5 +109,5 @@ $help = array(
 	array(
 		0 => 'Can I add my own tags?',
 		1 => 'If you are an administrator on this board and have the proper permissions, you can add further BBCodes through the Custom BBCodes section.'
-	)
+	),
 );
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 94e6622685..d803ec91e4 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -337,5 +337,5 @@ $help = array(
 	array(
 		0 => 'Who do I contact about abusive and/or legal matters related to this board?',
 		1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a <a href="http://www.google.com/search?q=whois">whois lookup</a>) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Group has <strong>absolutely no jurisdiction</strong> and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter <strong>not directly related</strong> to the phpBB.com website or the discrete software of phpBB itself. If you do email phpBB Group <strong>about any third party</strong> use of this software then you should expect a terse response or no response at all.'
-	)
+	),
 );
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index b75e0ea495..dffa40db2f 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -426,6 +426,6 @@ $lang = array_merge($lang, array(
 			'SPAM'		=> 'The reported message has the only purpose to advertise for a website or another product.',
 			'OFF_TOPIC'	=> 'The reported message is off topic.',
 			'OTHER'		=> 'The reported message does not fit into any other category, please use the further information field.',
-		)
+		),
 	),
 ));
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 535bf78706..79d2b9fa3a 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -603,14 +603,14 @@ $lang = array_merge($lang, array(
 		'PLACE_INTO_FOLDER'	=> 'Place into folder',
 		'MARK_AS_READ'		=> 'Mark as read',
 		'MARK_AS_IMPORTANT'	=> 'Mark message',
-		'DELETE_MESSAGE'	=> 'Delete message'
+		'DELETE_MESSAGE'	=> 'Delete message',
 	),
 	'PM_CHECK' => array(
 		'SUBJECT'	=> 'Subject',
 		'SENDER'	=> 'Sender',
 		'MESSAGE'	=> 'Message',
 		'STATUS'	=> 'Message status',
-		'TO'		=> 'Sent To'
+		'TO'		=> 'Sent To',
 	),
 	'PM_RULE' => array(
 		'IS_LIKE'		=> 'is like',
@@ -626,7 +626,7 @@ $lang = array_merge($lang, array(
 		'ANSWERED'		=> 'answered',
 		'FORWARDED'		=> 'forwarded',
 		'TO_GROUP'		=> 'to my default usergroup',
-		'TO_ME'			=> 'to me'
+		'TO_ME'			=> 'to me',
 	),
 
 	'GROUPS_EXPLAIN'	=> 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you additional permissions to view content or increase your capabilities in other areas.',
-- 
cgit v1.2.1


From 89391dec089e8085f486b768ad7654f62166f4a2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 29 Apr 2014 17:51:21 +0200
Subject: [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to
 legacy code.

* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.

PHPBB3-12458
---
 phpBB/language/en/groups.php  | 2 +-
 phpBB/language/en/posting.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php
index 6155d34a8c..c36d87f793 100644
--- a/phpBB/language/en/groups.php
+++ b/phpBB/language/en/groups.php
@@ -81,7 +81,7 @@ $lang = array_merge($lang, array(
 	'NOT_LEADER_OF_GROUP'			=> 'The requested operation cannot be taken because you are not a leader of the selected group.',
 	'NOT_MEMBER_OF_GROUP'			=> 'The requested operation cannot be taken because you are not a member of the selected group or your membership has not been approved yet.',
 	'NOT_RESIGN_FROM_DEFAULT_GROUP'	=> 'You are not allowed to resign from your default group.',
-	
+
 	'PRIMARY_GROUP'		=> 'Primary group',
 
 	'REMOVE_SELECTED'		=> 'Remove selected',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index c1d8cef7de..e3b6101310 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -53,7 +53,7 @@ $lang = array_merge($lang, array(
 	'BBCODE_IS_OFF'				=> '%sBBCode%s is <em>OFF</em>',
 	'BBCODE_IS_ON'				=> '%sBBCode%s is <em>ON</em>',
 	'BBCODE_I_HELP'				=> 'Italic text: [i]text[/i]',
-	'BBCODE_L_HELP'				=> 'List: [list][*]text[/list]', 
+	'BBCODE_L_HELP'				=> 'List: [list][*]text[/list]',
 	'BBCODE_LISTITEM_HELP'		=> 'List item: [*]text',
 	'BBCODE_O_HELP'				=> 'Ordered list: e.g. [list=1][*]First point[/list] or [list=a][*]Point a[/list]',
 	'BBCODE_P_HELP'				=> 'Insert image: [img]http://image_url[/img]',
-- 
cgit v1.2.1


From 5c7199f3dd1e0dd99c173f90ada615c68d486f51 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 2 May 2014 11:51:40 +0200
Subject: [ticket/12371] Fix language string

PHPBB3-12371
---
 phpBB/language/en/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 956b593476..356316f35f 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -431,7 +431,7 @@ $lang = array_merge($lang, array(
 	// A and B replied...
 	// A, B and C replied...
 	// A, B, C and 2 others replied...
-	// A, B, C and many others replied...
+	// A, B, C and others replied...
 	'NOTIFICATION_BOOKMARK'				=> array(
 		1	=> '%1$s replied to the topic “%2$s” you have bookmarked.',
 	),
@@ -457,7 +457,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TYPE_NOT_EXIST'		=> 'The notification type "%s" is missing from the file system.',
 	'NOTIFICATION_ADMIN_ACTIVATE_USER'	=> 'The user “%1$s” is newly registered and requires activation.',
 	// Used in conjuction with NOTIFICATION_BOOKMARK and NOTIFICATION_POST.
-	'NOTIFICATION_MANY_OTHERS'			=> 'many others',
+	'NOTIFICATION_MANY_OTHERS'			=> 'others',
 	'NOTIFICATION_X_OTHERS'				=> array(
 		2	=> '%d others',
 	),
-- 
cgit v1.2.1


From b39b0369aa0ac6853bde0504259166f570beb983 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sun, 3 Nov 2013 21:58:05 -0600
Subject: [feature/sqlite3] Add support for SQLite 3

Minimum version requirement is 3.6.15 as that's what ships with PHP 5.3.0
when support for SQLite 3 was added.

PHPBB3-9728
---
 phpBB/language/en/install.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 081361f661..caefc1219d 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -151,7 +151,8 @@ $lang = array_merge($lang, array(
 	'DLL_MYSQLI'				=> 'MySQL with MySQLi Extension',
 	'DLL_ORACLE'				=> 'Oracle',
 	'DLL_POSTGRES'				=> 'PostgreSQL',
-	'DLL_SQLITE'				=> 'SQLite',
+	'DLL_SQLITE'				=> 'SQLite 2',
+	'DLL_SQLITE3'				=> 'SQLite 3',
 	'DLL_XML'					=> 'XML support [ Jabber ]',
 	'DLL_ZLIB'					=> 'zlib compression support [ gz, .tar.gz, .zip ]',
 	'DL_CONFIG'					=> 'Download config',
@@ -212,6 +213,7 @@ $lang = array_merge($lang, array(
 		<li>MySQL 3.23 or above (MySQLi supported)</li>
 		<li>PostgreSQL 8.3+</li>
 		<li>SQLite 2.8.2+</li>
+		<li>SQLite 3.6.15+</li>
 		<li>Firebird 2.1+</li>
 		<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
 		<li>MS SQL Server 2005 or above (native)</li>
@@ -235,6 +237,7 @@ $lang = array_merge($lang, array(
 	'INST_ERR_DB_NO_ERROR'		=> 'No error message given.',
 	'INST_ERR_DB_NO_MYSQLI'		=> 'The version of MySQL installed on this machine is incompatible with the “MySQL with MySQLi Extension” option you have selected. Please try the “MySQL” option instead.',
 	'INST_ERR_DB_NO_SQLITE'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
+	'INST_ERR_DB_NO_SQLITE3'	=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 3.6.15.',
 	'INST_ERR_DB_NO_ORACLE'		=> 'The version of Oracle installed on this machine requires you to set the <var>NLS_CHARACTERSET</var> parameter to <var>UTF8</var>. Either upgrade your installation to 9.2+ or change the parameter.',
 	'INST_ERR_DB_NO_FIREBIRD'	=> 'The version of Firebird installed on this machine is older than 2.1, please upgrade to a newer version.',
 	'INST_ERR_DB_NO_FIREBIRD_PS'=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
-- 
cgit v1.2.1


From d486ff62091952cc83aa9c25b674100b270e8098 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Tue, 22 Apr 2014 17:18:32 +0200
Subject: [ticket/12431] Add has_poll icon to topiclists

PHPBB3-12431
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 569ec776f5..6bcb0fe9b3 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -748,6 +748,7 @@ $lang = array_merge($lang, array(
 		1	=> '%d private message in total',
 		2	=> '%d private messages in total',
 	),
+	'TOPIC_POLL'		=> 'Topic has a poll',
 	'TOTAL_POSTS'		=> 'Total posts',
 	'TOTAL_POSTS_COUNT'	=> array(
 		2	=> 'Total posts <strong>%d</strong>',
-- 
cgit v1.2.1


From daa69ecfa97c5462835e42b1046ba91b7abe3469 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Tue, 29 Apr 2014 00:44:32 +0200
Subject: [ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals

PHPBB3-12451
---
 phpBB/language/en/posting.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index e3b6101310..29ca7d82c8 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -227,9 +227,13 @@ $lang = array_merge($lang, array(
 	'STYLES_TIP'				=> 'Tip: Styles can be applied quickly to selected text.',
 
 	'TOO_FEW_CHARS'				=> 'Your message contains too few characters.',
+	'TOO_FEW_CHARS_CONTAINS'	=> array(
+		1	=> 'Your message contains %1$d character.',
+		2	=> 'Your message contains %1$d characters.',
+	),
 	'TOO_FEW_CHARS_LIMIT'		=> array(
-		1	=> 'Your message contains %1$d character. The minimum number of characters you need to enter is %2$d.',
-		2	=> 'Your message contains %1$d characters. The minimum number of characters you need to enter is %2$d.',
+		1	=> 'You need to enter at least %1$d character.',
+		2	=> 'You need to enter at least %1$d characters.',
 	),
 	'TOO_FEW_POLL_OPTIONS'		=> 'You must enter at least two poll options.',
 	'TOO_MANY_ATTACHMENTS'		=> 'Cannot add another attachment, %d is the maximum.',
-- 
cgit v1.2.1


From d7c0d604b56791481200fec2ebacb71615e303b0 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Tue, 29 Apr 2014 00:53:57 +0200
Subject: [ticket/12451] Split TOO_MANY_CHARS vars for plurals

PHPBB3-12451
---
 phpBB/language/en/posting.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 29ca7d82c8..600bc2dd9f 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -238,11 +238,14 @@ $lang = array_merge($lang, array(
 	'TOO_FEW_POLL_OPTIONS'		=> 'You must enter at least two poll options.',
 	'TOO_MANY_ATTACHMENTS'		=> 'Cannot add another attachment, %d is the maximum.',
 	'TOO_MANY_CHARS'			=> 'Your message contains too many characters.',
+	'TOO_MANY_CHARS_LIMIT'		=> array(
+		2	=> 'The maximum number of allowed characters is %1$d.',
+	),
 	'TOO_MANY_CHARS_POST'		=> array(
-		2	=> 'Your message contains %1$d characters. The maximum number of allowed characters is %2$d.',
+		2	=> 'Your message contains %1$d characters.',
 	),
 	'TOO_MANY_CHARS_SIG'		=> array(
-		2	=> 'Your signature contains %1$d characters. The maximum number of allowed characters is %2$d.',
+		2	=> 'Your signature contains %1$d characters.',
 	),
 	'TOO_MANY_POLL_OPTIONS'		=> 'You have tried to enter too many poll options.',
 	'TOO_MANY_SMILIES'			=> 'Your message contains too many smilies. The maximum number of smilies allowed is %d.',
-- 
cgit v1.2.1


From b7fde768528a1f3e17280b728c7781c4f262e8d1 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Fri, 2 May 2014 23:55:30 +0200
Subject: [ticket/12451] Remove duplicated lang var

PHPBB3-12451
---
 phpBB/language/en/posting.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 600bc2dd9f..5068f60573 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -70,6 +70,14 @@ $lang = array_merge($lang, array(
 	'CANNOT_POST_ANNOUNCE'		=> 'Sorry but you cannot post announcements.',
 	'CANNOT_POST_STICKY'		=> 'Sorry but you cannot post sticky topics.',
 	'CHANGE_TOPIC_TO'			=> 'Change topic type to',
+	'CHARS_POST_CONTAINS'		=> array(
+		1	=> 'Your message contains %1$d character.',
+ 		2	=> 'Your message contains %1$d characters.',
+	),
+	'CHARS_SIG_CONTAINS'		=> array(
+		1	=> 'Your signature contains %1$d character.',
+		2	=> 'Your signature contains %1$d characters.',
+	),
 	'CLOSE_TAGS'				=> 'Close tags',
 	'CURRENT_TOPIC'				=> 'Current topic',
 
@@ -227,10 +235,6 @@ $lang = array_merge($lang, array(
 	'STYLES_TIP'				=> 'Tip: Styles can be applied quickly to selected text.',
 
 	'TOO_FEW_CHARS'				=> 'Your message contains too few characters.',
-	'TOO_FEW_CHARS_CONTAINS'	=> array(
-		1	=> 'Your message contains %1$d character.',
-		2	=> 'Your message contains %1$d characters.',
-	),
 	'TOO_FEW_CHARS_LIMIT'		=> array(
 		1	=> 'You need to enter at least %1$d character.',
 		2	=> 'You need to enter at least %1$d characters.',
@@ -241,12 +245,6 @@ $lang = array_merge($lang, array(
 	'TOO_MANY_CHARS_LIMIT'		=> array(
 		2	=> 'The maximum number of allowed characters is %1$d.',
 	),
-	'TOO_MANY_CHARS_POST'		=> array(
-		2	=> 'Your message contains %1$d characters.',
-	),
-	'TOO_MANY_CHARS_SIG'		=> array(
-		2	=> 'Your signature contains %1$d characters.',
-	),
 	'TOO_MANY_POLL_OPTIONS'		=> 'You have tried to enter too many poll options.',
 	'TOO_MANY_SMILIES'			=> 'Your message contains too many smilies. The maximum number of smilies allowed is %d.',
 	'TOO_MANY_URLS'				=> 'Your message contains too many URLs. The maximum number of URLs allowed is %d.',
-- 
cgit v1.2.1


From e6b312221c1feebcc42da0a6be8a29beca4222c8 Mon Sep 17 00:00:00 2001
From: n-aleha <nick_aleha@myway.com>
Date: Sun, 4 May 2014 13:38:06 +0300
Subject: [ticket/12455] Remove unused language strings from common.php and
 app.php

Removed the following unused language strings from common.php:
EXTENSION_CONTROLLER_MISSING
EXTENSION_CLASS_WRONG_TYPE

Removed the following unused language strings from app.php:
CONTROLLER_NOT_FOUND
CONTROLLER_SERVICE_NOT_GIVEN
CONTROLLER_RETURN_TYPE_INVALID

PHPBB3-12455
---
 phpBB/language/en/app.php    | 3 ---
 phpBB/language/en/common.php | 2 --
 2 files changed, 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
index cb56015c30..6697532150 100644
--- a/phpBB/language/en/app.php
+++ b/phpBB/language/en/app.php
@@ -41,9 +41,6 @@ if (empty($lang) || !is_array($lang))
 $lang = array_merge($lang, array(
 	'CONTROLLER_ARGUMENT_VALUE_MISSING'	=> 'Missing value for argument #%1$s: <strong>%3$s</strong> in class <strong>%2$s</strong>',
 	'CONTROLLER_NOT_SPECIFIED'			=> 'No controller has been specified.',
-	'CONTROLLER_NOT_FOUND'				=> 'The requested page could not be found.',
 	'CONTROLLER_METHOD_NOT_SPECIFIED'	=> 'No method was specified for the controller.',
-	'CONTROLLER_SERVICE_NOT_GIVEN'		=> 'The controller "<strong>%s</strong>" must have a service specified in ./config/routing.yml.',
 	'CONTROLLER_SERVICE_UNDEFINED'		=> 'The service for controller "<strong>%s</strong>" is not defined in ./config/services.yml.',
-	'CONTROLLER_RETURN_TYPE_INVALID'	=> 'The controller object <strong>%s</strong> must return a Symfony\Component\HttpFoundation\Response object.',
 ));
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index e31164dfc8..aac4f2516e 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -218,8 +218,6 @@ $lang = array_merge($lang, array(
 	'ERROR'									=> 'Error',
 	'EXPAND_VIEW'						=> 'Expand view',
 	'EXTENSION'							=> 'Extension',
-	'EXTENSION_CONTROLLER_MISSING'		=> 'The extension <strong>%s</strong> is missing a controller class and cannot be accessed through the front-end.',
-	'EXTENSION_CLASS_WRONG_TYPE'		=> 'The extension controller class <strong>%s</strong> is not an instance of the phpbb_extension_controller_interface.',
 	'EXTENSION_DISABLED'				=> 'The extension <strong>%s</strong> is not enabled.',
 	'EXTENSION_DISABLED_AFTER_POSTING'	=> 'The extension <strong>%s</strong> has been deactivated and can no longer be displayed.',
 	'EXTENSION_DOES_NOT_EXIST'			=> 'The extension <strong>%s</strong> does not exist.',
-- 
cgit v1.2.1


From dccc9ceeb58754dee811838d616449f0251d251b Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Sat, 26 Apr 2014 00:47:06 +0200
Subject: [ticket/11942] Delete post/topic reason should be added to logs

https://tracker.phpbb.com/browse/PHPBB3-11942

PHPBB3-11942
---
 phpBB/language/en/acp/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 6f6a5f901f..66dc09b071 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -556,8 +556,8 @@ $lang = array_merge($lang, array(
 	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
 	'LOG_REPORT_DELETED'		=> '<strong>Deleted report</strong><br />» %s',
 	'LOG_RESTORE_TOPIC'			=> '<strong>Restored topic “%1$s” written by</strong><br />» %2$s',
-	'LOG_SOFTDELETE_POST'		=> '<strong>Soft deleted post “%1$s” written by</strong><br />» %2$s',
-	'LOG_SOFTDELETE_TOPIC'		=> '<strong>Soft deleted topic “%1$s” written by</strong><br />» %2$s',
+	'LOG_SOFTDELETE_POST'		=> '<strong>Soft deleted post “%1$s” written by “%2$s”</strong><br />» %3$s',
+	'LOG_SOFTDELETE_TOPIC'		=> '<strong>Soft deleted topic “%1$s” written by “%2$s”</strong><br />» %3$s',
 	'LOG_SPLIT_DESTINATION'		=> '<strong>Moved split posts</strong><br />» to %s',
 	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br />» from %s',
 
-- 
cgit v1.2.1


From 1c336c355965fbe47717744e0d5fb04125d12247 Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Sat, 26 Apr 2014 12:47:24 +0200
Subject: [ticket/11942] Adding the reason to hard deleted topic/post

PHPBB3-11942
---
 phpBB/language/en/acp/common.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 66dc09b071..3dec17b05d 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -539,9 +539,9 @@ $lang = array_merge($lang, array(
 
 	'LOG_APPROVE_TOPIC'			=> '<strong>Approved topic</strong><br />» %s',
 	'LOG_BUMP_TOPIC'			=> '<strong>User bumped topic</strong><br />» %s',
-	'LOG_DELETE_POST'			=> '<strong>Deleted post “%1$s” written by</strong><br />» %2$s',
+	'LOG_DELETE_POST'			=> '<strong>Deleted post “%1$s” written by “%2$s” with the following reason</strong><br />» %3$s',
 	'LOG_DELETE_SHADOW_TOPIC'	=> '<strong>Deleted shadow topic</strong><br />» %s',
-	'LOG_DELETE_TOPIC'			=> '<strong>Deleted topic “%1$s” written by</strong><br />» %2$s',
+	'LOG_DELETE_TOPIC'			=> '<strong>Deleted topic “%1$s” written by “%2$s” with the following reason</strong><br />» %3$s',
 	'LOG_FORK'					=> '<strong>Copied topic</strong><br />» from %s',
 	'LOG_LOCK'					=> '<strong>Locked topic</strong><br />» %s',
 	'LOG_LOCK_POST'				=> '<strong>Locked post</strong><br />» %s',
@@ -556,8 +556,8 @@ $lang = array_merge($lang, array(
 	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
 	'LOG_REPORT_DELETED'		=> '<strong>Deleted report</strong><br />» %s',
 	'LOG_RESTORE_TOPIC'			=> '<strong>Restored topic “%1$s” written by</strong><br />» %2$s',
-	'LOG_SOFTDELETE_POST'		=> '<strong>Soft deleted post “%1$s” written by “%2$s”</strong><br />» %3$s',
-	'LOG_SOFTDELETE_TOPIC'		=> '<strong>Soft deleted topic “%1$s” written by “%2$s”</strong><br />» %3$s',
+	'LOG_SOFTDELETE_POST'		=> '<strong>Soft deleted post “%1$s” written by “%2$s” with the following reason</strong><br />» %3$s',
+	'LOG_SOFTDELETE_TOPIC'		=> '<strong>Soft deleted topic “%1$s” written by “%2$s” with the following reason</strong><br />» %3$s',
 	'LOG_SPLIT_DESTINATION'		=> '<strong>Moved split posts</strong><br />» to %s',
 	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br />» from %s',
 
-- 
cgit v1.2.1


From fee4e6193397234afe0de57aa0045b9a11bf8fe5 Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Mon, 28 Apr 2014 18:43:29 +0200
Subject: [ticket/11942] Change the formulation

PHPBB3-11942
---
 phpBB/language/en/acp/common.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 3dec17b05d..2cd7ef7b64 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -539,9 +539,9 @@ $lang = array_merge($lang, array(
 
 	'LOG_APPROVE_TOPIC'			=> '<strong>Approved topic</strong><br />» %s',
 	'LOG_BUMP_TOPIC'			=> '<strong>User bumped topic</strong><br />» %s',
-	'LOG_DELETE_POST'			=> '<strong>Deleted post “%1$s” written by “%2$s” with the following reason</strong><br />» %3$s',
+	'LOG_DELETE_POST'			=> '<strong>Deleted post “%1$s” written by “%2$s” for the following reason</strong><br />» %3$s',
 	'LOG_DELETE_SHADOW_TOPIC'	=> '<strong>Deleted shadow topic</strong><br />» %s',
-	'LOG_DELETE_TOPIC'			=> '<strong>Deleted topic “%1$s” written by “%2$s” with the following reason</strong><br />» %3$s',
+	'LOG_DELETE_TOPIC'			=> '<strong>Deleted topic “%1$s” written by “%2$s” for the following reason</strong><br />» %3$s',
 	'LOG_FORK'					=> '<strong>Copied topic</strong><br />» from %s',
 	'LOG_LOCK'					=> '<strong>Locked topic</strong><br />» %s',
 	'LOG_LOCK_POST'				=> '<strong>Locked post</strong><br />» %s',
@@ -556,8 +556,8 @@ $lang = array_merge($lang, array(
 	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
 	'LOG_REPORT_DELETED'		=> '<strong>Deleted report</strong><br />» %s',
 	'LOG_RESTORE_TOPIC'			=> '<strong>Restored topic “%1$s” written by</strong><br />» %2$s',
-	'LOG_SOFTDELETE_POST'		=> '<strong>Soft deleted post “%1$s” written by “%2$s” with the following reason</strong><br />» %3$s',
-	'LOG_SOFTDELETE_TOPIC'		=> '<strong>Soft deleted topic “%1$s” written by “%2$s” with the following reason</strong><br />» %3$s',
+	'LOG_SOFTDELETE_POST'		=> '<strong>Soft deleted post “%1$s” written by “%2$s” for the following reason</strong><br />» %3$s',
+	'LOG_SOFTDELETE_TOPIC'		=> '<strong>Soft deleted topic “%1$s” written by “%2$s” for the following reason</strong><br />» %3$s',
 	'LOG_SPLIT_DESTINATION'		=> '<strong>Moved split posts</strong><br />» to %s',
 	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br />» from %s',
 
-- 
cgit v1.2.1


From cc1a304da6c8946cfd3d46fc08548109a8e1c05b Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Fri, 2 May 2014 13:16:00 +0200
Subject: [ticket/11942] Edits messages

PHPBB3-11942
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 2cd7ef7b64..f2513f647e 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -551,7 +551,7 @@ $lang = array_merge($lang, array(
 	'LOG_PM_REPORT_DELETED'		=> '<strong>Deleted PM report</strong><br />» %s',
 	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br />» %s',
 	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” written by “%3$s” for the following reason</strong><br />» %2$s',
-	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
+	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by “%2$s” for the following reason</strong><br />» %3$s',
 	'LOG_POST_RESTORED'			=> '<strong>Restored post</strong><br />» %s',
 	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
 	'LOG_REPORT_DELETED'		=> '<strong>Deleted report</strong><br />» %s',
-- 
cgit v1.2.1


From 9dc4e5a61f5bfe7299f9f6ffbd851529ad459ba1 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@darricau.eu>
Date: Sun, 20 Apr 2014 18:32:34 +0200
Subject: [ticket/12459] Fix: Soft deleted topics should appear in feeds

As for the posts, a soft deleted topic should appear (with a corresponding
message) in topic's based feeds.

PHPBB3-12459
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 4d4a955aa3..21a7aa0a64 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -740,6 +740,7 @@ $lang = array_merge($lang, array(
 	'TOPIC_REVIEW'		=> 'Topic review',
 	'TOPIC_TITLE'		=> 'Topic title',
 	'TOPIC_UNAPPROVED'	=> 'This topic has not been approved',
+	'TOPIC_DELETED'		=> 'Deleted topic:',
 	'TOTAL_ATTACHMENTS'	=> 'Attachment(s)',
 	'TOTAL_LOGS'		=> array(
 		1	=> '%d log',
-- 
cgit v1.2.1


From eccdc7447834dc7d59dcd6ffa879cbcce7a6eb00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= <m.gaetan89@gmail.com>
Date: Sun, 4 May 2014 15:45:32 +0200
Subject: [ticket/12415] Use private message instead of "pm" accronym

https://tracker.phpbb.com/browse/PHPBB3-12415

PHPBB3-12415
---
 phpBB/language/en/acp/profile.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index dc42693ca7..ab4db02053 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -68,8 +68,8 @@ $lang = array_merge($lang, array(
 	'DISPLAY_AT_REGISTER_EXPLAIN'	=> 'If this option is enabled, the field will be displayed on registration.',
 	'DISPLAY_ON_MEMBERLIST'			=> 'Display on memberlist screen',
 	'DISPLAY_ON_MEMBERLIST_EXPLAIN'	=> 'If this option is enabled, the field will be displayed in the user rows on the memberlist screen.',
-	'DISPLAY_ON_PM'					=> 'Display on view pm screen',
-	'DISPLAY_ON_PM_EXPLAIN'			=> 'If this option is enabled, the field will be displayed in the mini-profile on the pm screen.',
+	'DISPLAY_ON_PM'					=> 'Display on view private message screen',
+	'DISPLAY_ON_PM_EXPLAIN'			=> 'If this option is enabled, the field will be displayed in the mini-profile on the private message screen.',
 	'DISPLAY_ON_VT'					=> 'Display on viewtopic screen',
 	'DISPLAY_ON_VT_EXPLAIN'			=> 'If this option is enabled, the field will be displayed in the mini-profile on the topic screen.',
 	'DISPLAY_PROFILE_FIELD'			=> 'Publicly display profile field',
-- 
cgit v1.2.1


From 717f8a6671a216b4d9985c286454b47cd9cb8691 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 5 May 2014 18:58:15 +0200
Subject: [ticket/12459] Change language strings

PHPBB3-12459
---
 phpBB/language/en/common.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 21a7aa0a64..2df585ca03 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -556,7 +556,8 @@ $lang = array_merge($lang, array(
 	'POST_BY_FOE'			=> '<strong>%1$s</strong>, who is currently on your ignore list, made this post.',
 	'POST_DISPLAY'			=> '%1$sDisplay this post%2$s.',
 	'POST_DAY'				=> '%.2f posts per day',
-	'POST_DELETED'			=> 'Deleted post:',
+	'POST_DELETED_ACTION'	=> 'Deleted post:',
+	'POST_DELETED'			=> 'This post has been deleted.',
 	'POST_DELETED_BY'		=> '<strong>%2$s</strong> deleted the post by <strong>%1$s</strong> on %3$s.',
 	'POST_DELETED_BY_REASON'=> '<strong>%2$s</strong> deleted the post by <strong>%1$s</strong> on %3$s for the following reason: %4$s',
 	'POST_DETAILS'			=> 'Post details',
@@ -569,7 +570,8 @@ $lang = array_merge($lang, array(
 	'POST_SUBJECT'			=> 'Post subject',
 	'POST_TIME'				=> 'Post time',
 	'POST_TOPIC'			=> 'Post a new topic',
-	'POST_UNAPPROVED'		=> 'Post awaiting approval:',
+	'POST_UNAPPROVED_ACTION'	=> 'Post awaiting approval:',
+	'POST_UNAPPROVED'		=> 'This post has not been approved.',
 	'POWERED_BY'			=> 'Powered by %s',
 	'PREVIEW'				=> 'Preview',
 	'PREVIOUS'				=> 'Previous',		// Used in pagination
@@ -739,8 +741,8 @@ $lang = array_merge($lang, array(
 	'TOPIC_MOVED'		=> 'Moved topic',
 	'TOPIC_REVIEW'		=> 'Topic review',
 	'TOPIC_TITLE'		=> 'Topic title',
-	'TOPIC_UNAPPROVED'	=> 'This topic has not been approved',
-	'TOPIC_DELETED'		=> 'Deleted topic:',
+	'TOPIC_UNAPPROVED'	=> 'This topic has not been approved.',
+	'TOPIC_DELETED'		=> 'This topic has been deleted.',
 	'TOTAL_ATTACHMENTS'	=> 'Attachment(s)',
 	'TOTAL_LOGS'		=> array(
 		1	=> '%d log',
-- 
cgit v1.2.1


From 1cdff6067640bcd7c0d408ce73f5e4fbb5121526 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 8 May 2014 15:27:27 +0200
Subject: [ticket/12431] Lang full sentence

PHPBB3-12431
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6bcb0fe9b3..abaf73e5dc 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -748,7 +748,7 @@ $lang = array_merge($lang, array(
 		1	=> '%d private message in total',
 		2	=> '%d private messages in total',
 	),
-	'TOPIC_POLL'		=> 'Topic has a poll',
+	'TOPIC_POLL'		=> 'This topic has a poll.',
 	'TOTAL_POSTS'		=> 'Total posts',
 	'TOTAL_POSTS_COUNT'	=> array(
 		2	=> 'Total posts <strong>%d</strong>',
-- 
cgit v1.2.1


From d95164e64155ea3bdbca69532af5dd49c093b351 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 6 May 2014 17:52:12 -0700
Subject: [ticket/9388] Display only the settings for the auth method that's
 selected.

PHPBB3-9388
---
 phpBB/language/en/acp/board.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 505709d513..b796206261 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -406,6 +406,7 @@ $lang = array_merge($lang, array(
 
 	'APACHE_SETUP_BEFORE_USE'	=> 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version) and safe_mode disabled.',
 
+	'LDAP'							=> 'LDAP',
 	'LDAP_DN'						=> 'LDAP base <var>dn</var>',
 	'LDAP_DN_EXPLAIN'				=> 'This is the Distinguished Name, locating the user information, e.g. <samp>o=My Company,c=US</samp>.',
 	'LDAP_EMAIL'					=> 'LDAP email attribute',
-- 
cgit v1.2.1


From a640a455f35ccec26a80e9f9de5693dbb9e71c85 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Fri, 9 May 2014 00:07:56 +0200
Subject: [ticket/12074] Managing extensions doesn't produce any log entry

PHPBB3-12074
---
 phpBB/language/en/acp/common.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 6f6a5f901f..2896ab4e36 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -777,4 +777,22 @@ $lang = array_merge($lang, array(
 	'LOG_WORD_ADD'			=> '<strong>Added word censor</strong><br />» %s',
 	'LOG_WORD_DELETE'		=> '<strong>Deleted word censor</strong><br />» %s',
 	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br />» %s',
+
+	'LOG_EXT_ENABLE'	=> '<strong>Extension enabled</strong><br />» %s',
+	'LOG_EXT_DISABLE'	=> '<strong>Extension disabled</strong><br />» %s',
+	'LOG_EXT_PURGE'	=> '<strong>Extension’s data deleted</strong><br />» %s',
+
+	'LOG_EXT_ENABLE_ERROR'	=> '<strong>Error while enabling an extension</strong><br />» %s',
+	'LOG_EXT_DISABLE_ERROR'	=> '<strong>Error while disabling an extension</strong><br />» %s',
+	'LOG_EXT_PURGE_ERROR'	=> '<strong>Error while deleted the data of an extension</strong><br />» %s',
+
+	'LOG_EXT_ENABLE_DIR_INVALID_ERROR'		=> '<strong>Error while enabling the extension "%s"</strong><br />» Invalid directory structure.',
+	'LOG_EXT_ENABLE_NOT_AVAILABLE_ERROR'	=> '<strong>Error while enabling the extension "%s"</strong><br />» Extension unavailable for this board.',
+	'LOG_EXT_ENABLE_ALREADY_ENABLED_ERROR'	=> '<strong>Error while enabling the extension "%s"</strong><br />» Extension already enabled.',
+	'LOG_EXT_ENABLE_MIGRATION_ERROR'		=> '<strong>Error while enabling the extension "%s"</strong><br />» Migration error.',
+
+	'LOG_EXT_DISABLE_NOT_ENABLED_ERROR'	=> '<strong>Error while disabling the extension "%s"</strong><br />» Extension not enabled.',
+
+	'LOG_EXT_PURGE_ENABLED_ERROR'	=> '<strong>Error while deleting the data of the extension "%s"</strong><br />» Extension enabled.',
+	'LOG_EXT_PURGE_MIGRATION_ERROR'	=> '<strong>Error while deleting the data of the extension "%s"</strong><br />» Migration error.',
 ));
-- 
cgit v1.2.1


From 3029f93000198908bddacb0079aae2d0ecda0c5d Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Fri, 9 May 2014 00:26:07 +0200
Subject: [ticket/12074] Don't log errors

PHPBB3-12074
---
 phpBB/language/en/acp/common.php | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 2896ab4e36..8014ee64f1 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -780,19 +780,5 @@ $lang = array_merge($lang, array(
 
 	'LOG_EXT_ENABLE'	=> '<strong>Extension enabled</strong><br />» %s',
 	'LOG_EXT_DISABLE'	=> '<strong>Extension disabled</strong><br />» %s',
-	'LOG_EXT_PURGE'	=> '<strong>Extension’s data deleted</strong><br />» %s',
-
-	'LOG_EXT_ENABLE_ERROR'	=> '<strong>Error while enabling an extension</strong><br />» %s',
-	'LOG_EXT_DISABLE_ERROR'	=> '<strong>Error while disabling an extension</strong><br />» %s',
-	'LOG_EXT_PURGE_ERROR'	=> '<strong>Error while deleted the data of an extension</strong><br />» %s',
-
-	'LOG_EXT_ENABLE_DIR_INVALID_ERROR'		=> '<strong>Error while enabling the extension "%s"</strong><br />» Invalid directory structure.',
-	'LOG_EXT_ENABLE_NOT_AVAILABLE_ERROR'	=> '<strong>Error while enabling the extension "%s"</strong><br />» Extension unavailable for this board.',
-	'LOG_EXT_ENABLE_ALREADY_ENABLED_ERROR'	=> '<strong>Error while enabling the extension "%s"</strong><br />» Extension already enabled.',
-	'LOG_EXT_ENABLE_MIGRATION_ERROR'		=> '<strong>Error while enabling the extension "%s"</strong><br />» Migration error.',
-
-	'LOG_EXT_DISABLE_NOT_ENABLED_ERROR'	=> '<strong>Error while disabling the extension "%s"</strong><br />» Extension not enabled.',
-
-	'LOG_EXT_PURGE_ENABLED_ERROR'	=> '<strong>Error while deleting the data of the extension "%s"</strong><br />» Extension enabled.',
-	'LOG_EXT_PURGE_MIGRATION_ERROR'	=> '<strong>Error while deleting the data of the extension "%s"</strong><br />» Migration error.',
+	'LOG_EXT_PURGE'		=> '<strong>Extension’s data deleted</strong><br />» %s',
 ));
-- 
cgit v1.2.1


From 63e195d7f0c286b0dcbc4ae30826ee88d811c372 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 11 May 2014 13:10:51 +0200
Subject: [ticket/12527] Restore missing files and variables check

PHPBB3-12527
---
 phpBB/language/en/acp/language.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index 154551bd6e..5df99892ca 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -71,6 +71,7 @@ $lang = array_merge($lang, array(
 	'LANG_LOCAL_NAME'					=> 'Local name',
 
 	'MISSING_LANGUAGE_FILE'		=> 'Missing language file: <strong style="color:red">%s</strong>',
+	'MISSING_LANG_FILES'		=> 'Missing language files',
 	'MISSING_LANG_VARIABLES'	=> 'Missing language variables',
 	'MODS_FILES'				=> 'MODs language files',
 
-- 
cgit v1.2.1


From eaa45524129d434280ea5298fd08db8fd756297b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 11 May 2014 13:19:00 +0200
Subject: [ticket/12527] Remove unnecessary language strings

PHPBB3-12527
---
 phpBB/language/en/acp/language.php | 33 ++-------------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index 5df99892ca..a52f47bd8d 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -38,22 +38,9 @@ $lang = array_merge($lang, array(
 	'ACP_FILES'						=> 'Admin language files',
 	'ACP_LANGUAGE_PACKS_EXPLAIN'	=> 'Here you are able to install/remove language packs. The default language pack is marked with an asterisk (*).',
 
-	'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.',
-	'INVALID_UPLOAD_METHOD'		=> 'The selected upload method is not valid, please choose a different method.',
 
 	'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 /><strong>Note:</strong> Once you changed a language file, the changes will be stored within a separate 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 <strong>%s</strong> has been removed successfully. All users using this language have been reset to the boards default language.',
 	'LANGUAGE_PACK_DETAILS'				=> 'Language pack details',
@@ -70,32 +57,16 @@ $lang = array_merge($lang, array(
 	'LANG_ISO_CODE'						=> 'ISO code',
 	'LANG_LOCAL_NAME'					=> 'Local name',
 
-	'MISSING_LANGUAGE_FILE'		=> 'Missing language file: <strong style="color:red">%s</strong>',
 	'MISSING_LANG_FILES'		=> 'Missing language files',
 	'MISSING_LANG_VARIABLES'	=> 'Missing language variables',
-	'MODS_FILES'				=> 'MODs language files',
 
 	'NO_FILE_SELECTED'				=> 'You haven’t specified a language file.',
 	'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',
-	'SUBMIT_AND_UPLOAD'			=> 'Submit and upload 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 <strong>%s</strong> language pack',
+	'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 “%s” language pack',
 
 	'UNINSTALLED_LANGUAGE_PACKS'	=> 'Uninstalled language packs',
-
-	'UNABLE_TO_WRITE_FILE'		=> 'The file could not be written to %s.',
-	'UPLOAD_COMPLETED'			=> 'The upload was completed successfully.',
-	'UPLOAD_FAILED'				=> 'The upload failed for unknown reasons. You may need to replace the relevant file manually.',
-	'UPLOAD_METHOD'				=> 'Upload method',
-	'UPLOAD_SETTINGS'			=> 'Upload settings',
-
-	'WRONG_LANGUAGE_FILE'		=> 'Selected language file is invalid.',
 ));
-- 
cgit v1.2.1


From 192bb74e3c5990535f592e69a8abb8dae1389be9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 11 May 2014 13:23:41 +0200
Subject: [ticket/12527] Use a proper language string on confirm screen

PHPBB3-12527
---
 phpBB/language/en/acp/language.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index a52f47bd8d..d69cdac08c 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -38,13 +38,15 @@ $lang = array_merge($lang, array(
 	'ACP_FILES'						=> 'Admin language files',
 	'ACP_LANGUAGE_PACKS_EXPLAIN'	=> 'Here you are able to install/remove language packs. The default language pack is marked with an asterisk (*).',
 
-	'INSTALLED_LANGUAGE_PACKS'	=> 'Installed language packs',
+	'DELETE_LANGUAGE_CONFIRM'		=> 'Are you sure you wish to delete “%s”?',
+
+	'INSTALLED_LANGUAGE_PACKS'		=> 'Installed language packs',
 
 	'LANGUAGE_DETAILS_UPDATED'			=> 'Language details successfully updated.',
 	'LANGUAGE_PACK_ALREADY_INSTALLED'	=> 'This language pack is already installed.',
-	'LANGUAGE_PACK_DELETED'				=> 'The language pack <strong>%s</strong> has been removed successfully. All users using this language have been reset to the boards default language.',
+	'LANGUAGE_PACK_DELETED'				=> 'The language pack “%s” has been removed successfully. All users using this language have been reset to the boards default language.',
 	'LANGUAGE_PACK_DETAILS'				=> 'Language pack details',
-	'LANGUAGE_PACK_INSTALLED'			=> 'The language pack <strong>%s</strong> has been successfully installed.',
+	'LANGUAGE_PACK_INSTALLED'			=> 'The language pack “%s” has been successfully installed.',
 	'LANGUAGE_PACK_CPF_UPDATE'			=> 'The custom profile fields’ language strings were copied from the default language. Please change them if necessary.',
 	'LANGUAGE_PACK_ISO'					=> 'ISO',
 	'LANGUAGE_PACK_LOCALNAME'			=> 'Local name',
-- 
cgit v1.2.1


From cce6f7d4a6c2333c1dfec999def26d61f916f28d Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sun, 11 May 2014 18:20:56 +0200
Subject: [ticket/12451] Fix whitespace in posting.php lang file

PHPBB3-12451
---
 phpBB/language/en/posting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 5068f60573..2b9b03101e 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -72,7 +72,7 @@ $lang = array_merge($lang, array(
 	'CHANGE_TOPIC_TO'			=> 'Change topic type to',
 	'CHARS_POST_CONTAINS'		=> array(
 		1	=> 'Your message contains %1$d character.',
- 		2	=> 'Your message contains %1$d characters.',
+		2	=> 'Your message contains %1$d characters.',
 	),
 	'CHARS_SIG_CONTAINS'		=> array(
 		1	=> 'Your signature contains %1$d character.',
-- 
cgit v1.2.1


From 9c8e2282361281ce76af0250cedfaa5c39f57e02 Mon Sep 17 00:00:00 2001
From: n-aleha <nick_aleha@myway.com>
Date: Mon, 12 May 2014 22:15:39 +0300
Subject: [ticket/12519] Restore m_approve language description

Restore acl_m_approve language description to:
"Can approve and restore posts"

PHPBB3-12519
---
 phpBB/language/en/acp/permissions_phpbb.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 5ea151f6ea..2082d7c89d 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -142,7 +142,7 @@ $lang = array_merge($lang, array(
 	'ACL_M_EDIT'		=> 'Can edit posts',
 	'ACL_M_DELETE'		=> 'Can permanently delete posts',
 	'ACL_M_SOFTDELETE'	=> 'Can soft delete posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>',
-	'ACL_M_APPROVE'		=> 'Can approve posts',
+	'ACL_M_APPROVE'		=> 'Can approve and restore posts',
 	'ACL_M_REPORT'		=> 'Can close and delete reports',
 	'ACL_M_CHGPOSTER'	=> 'Can change post author',
 
-- 
cgit v1.2.1


From 34c1691d7e5ccf607ee72366aa0b7b19474c71e4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 15 May 2014 14:03:27 +0200
Subject: [ticket/12433] Use a different message when nesting of quotes is not
 allowed

PHPBB3-12433
---
 phpBB/language/en/posting.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 2b9b03101e..935a348ef4 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -221,6 +221,7 @@ $lang = array_merge($lang, array(
 		1	=> 'You may embed only %d quote within each other.',
 		2	=> 'You may embed only %d quotes within each other.',
 	),
+	'QUOTE_NO_NESTING'			=> 'You may not embed quotes within each other.',
 
 	'SAVE'						=> 'Save',
 	'SAVE_DATE'					=> 'Saved at',
-- 
cgit v1.2.1


From a1143332098aa2dd99bf16a1eb0b0301d5b0c5d5 Mon Sep 17 00:00:00 2001
From: n-aleha <nick_aleha@myway.com>
Date: Sun, 11 May 2014 20:23:51 +0300
Subject: [ticket/12525] Add string argument to contact and email user language
 variables

In language/en/common.php:
* Introduce a new language variable 'CONTACT' => 'Contact'
* Add a string argument to lang var 'CONTACT_USER' to avoid an appended
 '{USERNAME}' in template.
* Add a string argument to lang var 'SEND_EMAIL_USER' to avoid an appended
 '{USERNAME}' in template.

Also fix typos.

PHPBB3-12525
---
 phpBB/language/en/common.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 7026e60911..76ec863a6a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -167,7 +167,8 @@ $lang = array_merge($lang, array(
 	'CONGRATULATIONS'		=> 'Congratulations to',
 	'CONNECTION_FAILED'		=> 'Connection failed.',
 	'CONNECTION_SUCCESS'	=> 'Connection was successful!',
-	'CONTACT_USER'			=> 'Contact',
+	'CONTACT'				=> 'Contact',
+	'CONTACT_USER'			=> 'Contact %s',
 	'COOKIES_DELETED'		=> 'All board cookies successfully deleted.',
 	'CURRENT_TIME'			=> 'It is currently %s',
 
@@ -664,7 +665,7 @@ $lang = array_merge($lang, array(
 	'SELECT_DESTINATION_FORUM'	=> 'Please select a destination forum',
 	'SELECT_FORUM'				=> 'Select a forum',
 	'SEND_EMAIL'				=> 'Email',				// Used for submit buttons
-	'SEND_EMAIL_USER'			=> 'Email',				// Used as: {L_SEND_EMAIL_USER} {USERNAME} -> Email UserX
+	'SEND_EMAIL_USER'			=> 'Email %s',
 	'SEND_PRIVATE_MESSAGE'		=> 'Send private message',
 	'SETTINGS'					=> 'Settings',
 	'SIGNATURE'					=> 'Signature',
-- 
cgit v1.2.1


From b040c3f7c1e2d8c802bf06f8c4243702c4cc8cf3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 18 May 2014 12:28:28 +0200
Subject: =?UTF-8?q?[ticket/12527]=20Fix=20"board=E2=80=99s=20language"=20v?=
 =?UTF-8?q?s=20"boards=20language"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PHPBB3-12527
---
 phpBB/language/en/acp/language.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index d69cdac08c..911347b9b0 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -44,7 +44,7 @@ $lang = array_merge($lang, array(
 
 	'LANGUAGE_DETAILS_UPDATED'			=> 'Language details successfully updated.',
 	'LANGUAGE_PACK_ALREADY_INSTALLED'	=> 'This language pack is already installed.',
-	'LANGUAGE_PACK_DELETED'				=> 'The language pack “%s” has been removed successfully. All users using this language have been reset to the boards default language.',
+	'LANGUAGE_PACK_DELETED'				=> 'The language pack “%s” has been removed successfully. All users using this language have been reset to the board’s default language.',
 	'LANGUAGE_PACK_DETAILS'				=> 'Language pack details',
 	'LANGUAGE_PACK_INSTALLED'			=> 'The language pack “%s” has been successfully installed.',
 	'LANGUAGE_PACK_CPF_UPDATE'			=> 'The custom profile fields’ language strings were copied from the default language. Please change them if necessary.',
@@ -64,7 +64,7 @@ $lang = array_merge($lang, array(
 
 	'NO_FILE_SELECTED'				=> 'You haven’t specified a language file.',
 	'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_REMOVE_DEFAULT_LANG'		=> 'You are not able to remove the default language pack.<br />If you want to remove this language pack, change your board’s default language first.',
 	'NO_UNINSTALLED_LANGUAGE_PACKS'	=> 'No uninstalled language packs',
 
 	'THOSE_MISSING_LANG_FILES'			=> 'The following language files are missing from the “%s” language folder',
-- 
cgit v1.2.1


From 6e6891f841dfc4131a41a83a4c41f04feaa7397d Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Fri, 23 May 2014 22:59:46 +0200
Subject: [ticket/12325] Automatic update should notify about outdated files

PHPBB3-12325
---
 phpBB/language/en/install.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index caefc1219d..65c53c0d35 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -431,6 +431,8 @@ $lang = array_merge($lang, array(
 	'FILE_USED'						=> 'Information used from',			// Single file
 	'FILES_CONFLICT'				=> 'Conflict files',
 	'FILES_CONFLICT_EXPLAIN'		=> 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in losing the changes from the newer file.',
+	'FILES_DELETED'					=> 'Deleted files',
+	'FILES_DELETED_EXPLAIN'			=> 'The following files do not exist in the new version. These files have to be deleted from your installation.',
 	'FILES_MODIFIED'				=> 'Modified files',
 	'FILES_MODIFIED_EXPLAIN'		=> 'The following files are modified and do not represent the original files from the old version. The updated file will be a merge between your modifications and the new file.',
 	'FILES_NEW'						=> 'New files',
@@ -501,6 +503,7 @@ $lang = array_merge($lang, array(
 	'SELECT_DOWNLOAD_FORMAT'	=> 'Select download archive format',
 	'SELECT_FTP_SETTINGS'		=> 'Select FTP settings',
 	'SHOW_DIFF_CONFLICT'		=> 'Show differences/conflicts',
+	'SHOW_DIFF_DELETED'			=> 'Show file contents',
 	'SHOW_DIFF_FINAL'			=> 'Show resulting file',
 	'SHOW_DIFF_MODIFIED'		=> 'Show merged differences',
 	'SHOW_DIFF_NEW'				=> 'Show file contents',
@@ -514,6 +517,7 @@ $lang = array_merge($lang, array(
 	'STAGE_UPDATE_FILES'		=> 'Update files',
 	'STAGE_VERSION_CHECK'		=> 'Version check',
 	'STATUS_CONFLICT'			=> 'Modified file producing conflicts',
+	'L_STATUS_DELETED'			=> 'Deleted file',
 	'STATUS_MODIFIED'			=> 'Modified file',
 	'STATUS_NEW'				=> 'New file',
 	'STATUS_NEW_CONFLICT'		=> 'Conflicting new file',
-- 
cgit v1.2.1


From abb8a2892d862c097285ee7f300d12c32428e12c Mon Sep 17 00:00:00 2001
From: LEZY Thomas <thomas.gif.91@gmail.com>
Date: Tue, 27 May 2014 12:36:44 +0200
Subject: [ticket/12597] Command for executing all available cron tasks

Command cron:execute-all executes all available cron tasks.
Test files in tests/console/cron folder

PHPBB3-12597
---
 phpBB/language/en/acp/common.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 6f6a5f901f..9e7f280fa6 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -221,8 +221,11 @@ $lang = array_merge($lang, array(
 
 	'BACK'					=> 'Back',
 
+	'CLI_DESCR_CRON_EXECUTE_ALL'		=> 'Executes all available cron tasks.',
+
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
+	'CRON_LOCK_ERROR'		=> 'Could not obtain cron lock.',
 
 	'DEACTIVATE'				=> 'Deactivate',
 	'DIRECTORY_DOES_NOT_EXIST'	=> 'The entered path “%s” does not exist.',
@@ -283,6 +286,7 @@ $lang = array_merge($lang, array(
 	'REMIND'							=> 'Remind',
 	'RESYNC'							=> 'Resynchronise',
 
+	'RUNNING_TASK'			=> 'Running task: %s.',
 	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
 	'SELECT_OPTION'			=> 'Select option',
 
-- 
cgit v1.2.1


From a759704b39fc1c1353f865a633759b1369589b67 Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Tue, 27 May 2014 20:18:06 +0200
Subject: [ticket/12594] Remove @package tags and update file headers

PHPBB3-12594
---
 phpBB/language/en/acp/attachments.php       | 10 ++++++----
 phpBB/language/en/acp/ban.php               | 10 ++++++----
 phpBB/language/en/acp/board.php             | 10 ++++++----
 phpBB/language/en/acp/bots.php              | 10 ++++++----
 phpBB/language/en/acp/common.php            | 10 ++++++----
 phpBB/language/en/acp/database.php          | 10 ++++++----
 phpBB/language/en/acp/email.php             | 10 ++++++----
 phpBB/language/en/acp/extensions.php        | 13 +++++++------
 phpBB/language/en/acp/forums.php            | 10 ++++++----
 phpBB/language/en/acp/groups.php            | 10 ++++++----
 phpBB/language/en/acp/language.php          | 10 ++++++----
 phpBB/language/en/acp/modules.php           | 10 ++++++----
 phpBB/language/en/acp/permissions.php       | 10 ++++++----
 phpBB/language/en/acp/permissions_phpbb.php | 12 ++++++++----
 phpBB/language/en/acp/posting.php           | 10 ++++++----
 phpBB/language/en/acp/profile.php           | 10 ++++++----
 phpBB/language/en/acp/prune.php             | 10 ++++++----
 phpBB/language/en/acp/search.php            | 10 ++++++----
 phpBB/language/en/acp/styles.php            | 10 ++++++----
 phpBB/language/en/acp/users.php             | 10 ++++++----
 phpBB/language/en/app.php                   | 10 ++++++----
 phpBB/language/en/captcha_qa.php            | 10 ++++++----
 phpBB/language/en/captcha_recaptcha.php     | 10 ++++++----
 phpBB/language/en/common.php                | 10 ++++++----
 phpBB/language/en/groups.php                | 10 ++++++----
 phpBB/language/en/help_bbcode.php           | 10 ++++++----
 phpBB/language/en/help_faq.php              | 10 ++++++----
 phpBB/language/en/install.php               | 10 ++++++----
 phpBB/language/en/mcp.php                   | 10 ++++++----
 phpBB/language/en/memberlist.php            | 10 ++++++----
 phpBB/language/en/migrator.php              | 10 ++++++----
 phpBB/language/en/plupload.php              | 10 ++++++----
 phpBB/language/en/posting.php               | 10 ++++++----
 phpBB/language/en/search.php                | 10 ++++++----
 phpBB/language/en/search_ignore_words.php   | 10 ++++++----
 phpBB/language/en/search_synonyms.php       | 10 ++++++----
 phpBB/language/en/ucp.php                   | 10 ++++++----
 phpBB/language/en/viewforum.php             | 10 ++++++----
 phpBB/language/en/viewtopic.php             | 10 ++++++----
 39 files changed, 237 insertions(+), 158 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 6ca2865383..cf2f0a45d2 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_attachments [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 68a68ebe54..93d5cf9a8b 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_ban [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index b796206261..e2f89839c5 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_board [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php
index b8e1e9742f..142922800c 100644
--- a/phpBB/language/en/acp/bots.php
+++ b/phpBB/language/en/acp/bots.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_bots [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 8014ee64f1..d340e467be 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_common [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
index e98503ecf5..ab85701eaa 100644
--- a/phpBB/language/en/acp/database.php
+++ b/phpBB/language/en/acp/database.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_database [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index aacb35b9bb..ddacb9df25 100644
--- a/phpBB/language/en/acp/email.php
+++ b/phpBB/language/en/acp/email.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_email [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 39881668c4..8b29558fdb 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -1,15 +1,16 @@
 <?php
 /**
 *
-* acp_extensions [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
-/**
-*/
+
 if (!defined('IN_PHPBB'))
 {
 	exit;
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index d64380b6b6..b4f0f060e9 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_forums [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 58101e5f60..a7700ed681 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_groups [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index 154551bd6e..20ad8c3ac0 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_language [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php
index 9c1c799720..1213641366 100644
--- a/phpBB/language/en/acp/modules.php
+++ b/phpBB/language/en/acp/modules.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_modules [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 36af461f87..8654a9e88c 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_permissions [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 2082d7c89d..b9aeed8fcb 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -1,10 +1,14 @@
 <?php
 /**
-* acp_permissions_phpbb (phpBB Permission Set) [English]
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
 */
 
 /**
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index cf570d844f..119ad2d7e9 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_posting [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index ab4db02053..7336031218 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_profile [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index 7134efd765..130d1dbf84 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_prune [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 8d9443b481..f5bec89c2f 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_search [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 76b1d5e7dd..c2a3f777c2 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_styles [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 9faf1d0de9..980e73a685 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* acp_users [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
index 6697532150..2da0f098c1 100644
--- a/phpBB/language/en/app.php
+++ b/phpBB/language/en/app.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* app [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php
index 90e919064e..f764a83f24 100644
--- a/phpBB/language/en/captcha_qa.php
+++ b/phpBB/language/en/captcha_qa.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* captcha_qa [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php
index 3d91a9d110..18438ab53e 100644
--- a/phpBB/language/en/captcha_recaptcha.php
+++ b/phpBB/language/en/captcha_recaptcha.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* recaptcha [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 30b3078a41..7d14875976 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* common [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php
index c36d87f793..6d25fea247 100644
--- a/phpBB/language/en/groups.php
+++ b/phpBB/language/en/groups.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* groups [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index 61263752b2..0a8d30581a 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* help_bbcode [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index d803ec91e4..58afa2ba10 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* help_faq [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index caefc1219d..7235e51a94 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* install [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index dffa40db2f..bc0fd03520 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* mcp [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index f92286a092..7b6838e6d9 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* memberlist [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index 1d8886d12b..7199d21d96 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* migrator [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/plupload.php b/phpBB/language/en/plupload.php
index f174920f6b..c4a8d770a0 100644
--- a/phpBB/language/en/plupload.php
+++ b/phpBB/language/en/plupload.php
@@ -1,12 +1,14 @@
 <?php
 /**
 *
-* plupload [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
 * @copyright (c) 2010-2013 Moxiecode Systems AB
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 59d22aae23..20377287fd 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* posting [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 13aa66514c..7d5b400f82 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* search [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php
index afdbe6eecb..3db209d120 100644
--- a/phpBB/language/en/search_ignore_words.php
+++ b/phpBB/language/en/search_ignore_words.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* search_ignore_words [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php
index 18f938258c..6a8c257f0b 100644
--- a/phpBB/language/en/search_synonyms.php
+++ b/phpBB/language/en/search_synonyms.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* search_synonyms [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 3419d34e7a..878fd8ddba 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* ucp [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
index 1dee5d2e57..9946a3eda4 100644
--- a/phpBB/language/en/viewforum.php
+++ b/phpBB/language/en/viewforum.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* viewforum [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index afbad5a0d6..5890eecdb6 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -1,11 +1,13 @@
 <?php
 /**
 *
-* viewtopic [English]
+* This file is part of the phpBB Forum Software package.
 *
-* @package language
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
-- 
cgit v1.2.1


From 55e1f02151adbe9d66a2d87c00c4f1959739aa36 Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Wed, 28 May 2014 01:05:46 +0200
Subject: [ticket/12594] Replace phpBB Group with phpBB Limited

PHPBB3-12594
---
 phpBB/language/en/help_faq.php | 10 +++++-----
 phpBB/language/en/iso.txt      |  2 +-
 phpBB/language/en/ucp.php      |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 58afa2ba10..102dffcd5b 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -65,7 +65,7 @@ $help = array(
 	),
 	array(
 		0 => 'What is COPPA?',
-		1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Group cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined below.',
+		1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Limited cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined below.',
 	),
 	array(
 		0 => 'Why can’t I register?',
@@ -145,7 +145,7 @@ $help = array(
 	),
 	array(
 		0 => 'Why did I receive a warning?',
-		1 => 'Each board administrator has their own set of rules for their site. If you have broken a rule, you may be issued a warning. Please note that this is the board administrator’s decision, and the phpBB Group has nothing to do with the warnings on the given site. Contact the board administrator if you are unsure about why you were issued a warning.'
+		1 => 'Each board administrator has their own set of rules for their site. If you have broken a rule, you may be issued a warning. Please note that this is the board administrator’s decision, and the phpBB Limited has nothing to do with the warnings on the given site. Contact the board administrator if you are unsure about why you were issued a warning.'
 	),
 	array(
 		0 => 'How can I report posts to a moderator?',
@@ -330,14 +330,14 @@ $help = array(
 	),
 	array(
 		0 => 'Who wrote this bulletin board?',
-		1 => 'This software (in its unmodified form) is produced, released and is copyright <a href="https://www.phpbb.com/">phpBB Group</a>. It is made available under the GNU General Public License and may be freely distributed. See the link for more details.'
+		1 => 'This software (in its unmodified form) is produced, released and is copyright <a href="https://www.phpbb.com/">phpBB Limited</a>. It is made available under the GNU General Public License and may be freely distributed. See the link for more details.'
 	),
 	array(
 		0 => 'Why isn’t X feature available?',
-		1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added please visit the <a href="https://www.phpbb.com/ideas/">phpBB Ideas Centre</a>, where you can upvote existing ideas or suggest new features.'
+		1 => 'This software was written by and licensed through phpBB Limited. If you believe a feature needs to be added please visit the <a href="https://www.phpbb.com/ideas/">phpBB Ideas Centre</a>, where you can upvote existing ideas or suggest new features.'
 	),
 	array(
 		0 => 'Who do I contact about abusive and/or legal matters related to this board?',
-		1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a <a href="http://www.google.com/search?q=whois">whois lookup</a>) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Group has <strong>absolutely no jurisdiction</strong> and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter <strong>not directly related</strong> to the phpBB.com website or the discrete software of phpBB itself. If you do email phpBB Group <strong>about any third party</strong> use of this software then you should expect a terse response or no response at all.'
+		1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a <a href="http://www.google.com/search?q=whois">whois lookup</a>) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Limited has <strong>absolutely no jurisdiction</strong> and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Limited in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter <strong>not directly related</strong> to the phpBB.com website or the discrete software of phpBB itself. If you do email phpBB Limited <strong>about any third party</strong> use of this software then you should expect a terse response or no response at all.'
 	),
 );
diff --git a/phpBB/language/en/iso.txt b/phpBB/language/en/iso.txt
index c421dd4316..2e45cc56d0 100644
--- a/phpBB/language/en/iso.txt
+++ b/phpBB/language/en/iso.txt
@@ -1,3 +1,3 @@
 British English
 British English
-phpBB Group
\ No newline at end of file
+phpBB Limited
\ No newline at end of file
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 878fd8ddba..c3ace160e9 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -40,12 +40,12 @@ if (empty($lang) || !is_array($lang))
 $lang = array_merge($lang, array(
 	'TERMS_OF_USE_CONTENT'	=> 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended.<br />
 	<br />
-	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>” (hereinafter “GPL”) and can be downloaded from <a href="https://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet based discussions, the phpBB Group are not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="https://www.phpbb.com/">https://www.phpbb.com/</a>.<br />
+	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>” (hereinafter “GPL”) and can be downloaded from <a href="https://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet based discussions, the phpBB Limited are not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="https://www.phpbb.com/">https://www.phpbb.com/</a>.<br />
 	<br />
 	You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised.
 	',
 
-	'PRIVACY_POLICY'		=> 'This policy explains in detail how “%1$s” along with its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) use any information collected during any session of usage by you (hereinafter “your information”).<br />
+	'PRIVACY_POLICY'		=> 'This policy explains in detail how “%1$s” along with its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) use any information collected during any session of usage by you (hereinafter “your information”).<br />
 	<br />
 	Your information is collected via two ways. Firstly, by browsing “%1$s” will cause the phpBB software to create a number of cookies, which are small text files that are downloaded on to your computer’s web browser temporary files. The first two cookies just contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), automatically assigned to you by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s” and is used to store which topics have been read, thereby improving your user experience.<br />
 	<br />
-- 
cgit v1.2.1


From 9a7877274596b8330c075299adf3683c189ba6ab Mon Sep 17 00:00:00 2001
From: LEZY Thomas <thomas.gif.91@gmail.com>
Date: Wed, 28 May 2014 14:57:16 +0200
Subject: [ticket/12597] Change EXECUTE to RUN in language

Fix previous commit : change execute to run in language keys

PHPBB3-12597
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 9e7f280fa6..7b73aefcc5 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -221,7 +221,7 @@ $lang = array_merge($lang, array(
 
 	'BACK'					=> 'Back',
 
-	'CLI_DESCR_CRON_EXECUTE_ALL'		=> 'Executes all available cron tasks.',
+	'CLI_DESCR_CRON_RUN_ALL'		=> 'Runs all available cron tasks.',
 
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
-- 
cgit v1.2.1


From 9f942776ad5a3b396045e6f97db6ef655c5d9fcc Mon Sep 17 00:00:00 2001
From: LEZY Thomas <thomas.gif.91@gmail.com>
Date: Wed, 28 May 2014 19:51:59 +0200
Subject: [ticket/12597] Changes name of command  cron:run-all to cron:run.

Also adds an optional argument to specify one precise cron task to
lauch, and modifies test file accordingly.

PHPBB3-12597
---
 phpBB/language/en/acp/common.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 7b73aefcc5..a4117a2158 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -221,11 +221,13 @@ $lang = array_merge($lang, array(
 
 	'BACK'					=> 'Back',
 
-	'CLI_DESCR_CRON_RUN_ALL'		=> 'Runs all available cron tasks.',
+	'CLI_DESCR_CRON_RUN'		=> 'Runs all available cron tasks.',
+	'CLI_DESCR_CRON_ARG_RUN_1'	=> 'What task do you what to run?',
 
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
 	'CRON_LOCK_ERROR'		=> 'Could not obtain cron lock.',
+	'CRON_NO_TASK'			=> 'No such cron task',
 
 	'DEACTIVATE'				=> 'Deactivate',
 	'DIRECTORY_DOES_NOT_EXIST'	=> 'The entered path “%s” does not exist.',
-- 
cgit v1.2.1


From 532e4470ea08e6245878e49e77f1ca51354681e7 Mon Sep 17 00:00:00 2001
From: LEZY Thomas <thomas.gif.91@gmail.com>
Date: Wed, 28 May 2014 22:09:38 +0200
Subject: [ticket/12597] Fix language key name

PHPBB3-12597
---
 phpBB/language/en/acp/common.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index a4117a2158..f9f38788a6 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -221,8 +221,9 @@ $lang = array_merge($lang, array(
 
 	'BACK'					=> 'Back',
 
-	'CLI_DESCR_CRON_RUN'		=> 'Runs all available cron tasks.',
-	'CLI_DESCR_CRON_ARG_RUN_1'	=> 'What task do you what to run?',
+	'CLI_DESCRIPTION_CRON_RUN'		=> 'Runs all available cron tasks.',
+	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'What task do you what to run?',
+
 
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
-- 
cgit v1.2.1


From e0b2ceef833dee55a1701216d4f0823375e8fa74 Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Mon, 14 Apr 2014 06:56:04 +0200
Subject: [ticket/11366] Extension's version's check

Add a feature to check automatically the version of the installed
extensions. The informations are cached for 24 hours (like for the
global update check on the main page of the acp).

The informations about the versions are display both on the global list
and on the detailled page.

To do this the developper has to to let the composer.json of the latest
version available and add some informations into it :

    "extra": {
		"version-check": {
			"host": "<the host>",
			"directory": "<the directory containing the file>",
			"filename": "<the composer.json of the latest version>"
		}
    }

He can also add two extra informations which will be displayed if a new
version is available :

	"extra": {
		"download": "<download link>",
		"annoucement": "<announcement link>",
    }

Currently a notice is displayed when the "extra.version-check"
informations are
missing.

Ticket: https://tracker.phpbb.com/browse/PHPBB3-11366

Signed-off-by: Nicofuma <github@nicofuma.fr>

PHPBB3-11366
---
 phpBB/language/en/acp/extensions.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 8b29558fdb..85aef7c2d3 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -106,4 +106,11 @@ $lang = array_merge($lang, array(
 	'AUTHOR_EMAIL'			=> 'Email',
 	'AUTHOR_HOMEPAGE'		=> 'Homepage',
 	'AUTHOR_ROLE'			=> 'Role',
+
+	'NOT_UP_TO_DATE'			=> '%s is not up to date',
+	'UP_TO_DATE'			=> '%s is up to date',
+	'ANNOUNCEMENT_TOPIC'	=> 'Release Announcement',
+	'DOWNLOAD_LATEST'		=> 'Download Latest Version',
+	'NO_VERSIONCHECK'		=> 'No informations about how get the latest version.',
+//	'NO_INFO'					=> 'Version server could not be contacted',
 ));
-- 
cgit v1.2.1


From 44752c0dbfe11afb58de8956a79fbe5ec0f3e127 Mon Sep 17 00:00:00 2001
From: Nicofuma <github@nicofuma.fr>
Date: Mon, 14 Apr 2014 19:09:06 +0200
Subject: [ticket/11366] Moving to \phpbb\version_helper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ bug fix (missing exception)
+ Using \phpbb\version_helper
So, now, the version file have a new format :

	{
		"stable": {
			"<branch>": {
				"current": "<version>",
				[ "announcement": "<announcement link>", ]
				[ "download": "<download link>", ]
			},
			"<branch>": {
				...
			}
		},
		"unstable": {
		}
	}

PHPBB3-11366
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 85aef7c2d3..3a54dcf004 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -110,7 +110,7 @@ $lang = array_merge($lang, array(
 	'NOT_UP_TO_DATE'			=> '%s is not up to date',
 	'UP_TO_DATE'			=> '%s is up to date',
 	'ANNOUNCEMENT_TOPIC'	=> 'Release Announcement',
-	'DOWNLOAD_LATEST'		=> 'Download Latest Version',
+	'DOWNLOAD_LATEST'		=> 'Download Version',
 	'NO_VERSIONCHECK'		=> 'No informations about how get the latest version.',
 //	'NO_INFO'					=> 'Version server could not be contacted',
 ));
-- 
cgit v1.2.1


From e4aff6669c4a091e3b56f8c8a2b0c1eeba8bb4a9 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 5 May 2014 18:21:40 +0200
Subject: [ticket/11366] Remove unused langage entry

PHPBB3-11366
---
 phpBB/language/en/acp/extensions.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 3a54dcf004..a2962407d1 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -112,5 +112,4 @@ $lang = array_merge($lang, array(
 	'ANNOUNCEMENT_TOPIC'	=> 'Release Announcement',
 	'DOWNLOAD_LATEST'		=> 'Download Version',
 	'NO_VERSIONCHECK'		=> 'No informations about how get the latest version.',
-//	'NO_INFO'					=> 'Version server could not be contacted',
 ));
-- 
cgit v1.2.1


From a80a9efa8de086e0100b1a6d33ac349e955e9d18 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Thu, 8 May 2014 19:16:06 +0200
Subject: [ticket/11366] Correct a sentence

PHPBB3-11366
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index a2962407d1..476f4352a3 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -111,5 +111,5 @@ $lang = array_merge($lang, array(
 	'UP_TO_DATE'			=> '%s is up to date',
 	'ANNOUNCEMENT_TOPIC'	=> 'Release Announcement',
 	'DOWNLOAD_LATEST'		=> 'Download Version',
-	'NO_VERSIONCHECK'		=> 'No informations about how get the latest version.',
+	'NO_VERSIONCHECK'		=> 'No information on how to check the version.',
 ));
-- 
cgit v1.2.1


From 5e29ea77d813fb6f10583fa440ed4e55e78bd28d Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 11 May 2014 13:04:00 +0200
Subject: [ticket/11366] Coding style

PHPBB3-11366
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 476f4352a3..1df030cfca 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -111,5 +111,5 @@ $lang = array_merge($lang, array(
 	'UP_TO_DATE'			=> '%s is up to date',
 	'ANNOUNCEMENT_TOPIC'	=> 'Release Announcement',
 	'DOWNLOAD_LATEST'		=> 'Download Version',
-	'NO_VERSIONCHECK'		=> 'No information on how to check the version.',
+	'NO_VERSIONCHECK'		=> 'No version check information given.',
 ));
-- 
cgit v1.2.1


From 9173e7d7fd062cd2c0aed12c119e253cfec107f4 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 11 May 2014 18:48:45 +0200
Subject: [ticket/11366] Align language strings

PHPBB3-11366
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 1df030cfca..e15b304225 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -107,7 +107,7 @@ $lang = array_merge($lang, array(
 	'AUTHOR_HOMEPAGE'		=> 'Homepage',
 	'AUTHOR_ROLE'			=> 'Role',
 
-	'NOT_UP_TO_DATE'			=> '%s is not up to date',
+	'NOT_UP_TO_DATE'		=> '%s is not up to date',
 	'UP_TO_DATE'			=> '%s is up to date',
 	'ANNOUNCEMENT_TOPIC'	=> 'Release Announcement',
 	'DOWNLOAD_LATEST'		=> 'Download Version',
-- 
cgit v1.2.1


From 08ddd1c628f5aff1a5b5a586ce6d87132068a27a Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 11 May 2014 21:41:30 +0200
Subject: [ticket/11366] Update FILE_NOT_FOUND language string

This var is always used with a colon.

PHPBB3-11366
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 7d14875976..fea1f7c6bf 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -231,7 +231,7 @@ $lang = array_merge($lang, array(
 	'FILESIZE'				=> 'File size',
 	'FILEDATE'				=> 'File date',
 	'FILE_COMMENT'			=> 'File comment',
-	'FILE_NOT_FOUND'		=> 'The requested file could not be found.',
+	'FILE_NOT_FOUND'		=> 'The requested file could not be found',
 	'FIND_USERNAME'			=> 'Find a member',
 	'FOLDER'				=> 'Folder',
 	'FORGOT_PASS'			=> 'I forgot my password',
-- 
cgit v1.2.1


From 64467f50db496d0cc388e437dd9d843d5faf6449 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 11 May 2014 21:54:19 +0200
Subject: [ticket/11366] Update FILE_NOT_FOUND language string

PHPBB3-11366
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index fea1f7c6bf..5e524a6164 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -231,7 +231,7 @@ $lang = array_merge($lang, array(
 	'FILESIZE'				=> 'File size',
 	'FILEDATE'				=> 'File date',
 	'FILE_COMMENT'			=> 'File comment',
-	'FILE_NOT_FOUND'		=> 'The requested file could not be found',
+	'FILE_NOT_FOUND'		=> 'The requested file could not be found: %s',
 	'FIND_USERNAME'			=> 'Find a member',
 	'FOLDER'				=> 'Folder',
 	'FORGOT_PASS'			=> 'I forgot my password',
-- 
cgit v1.2.1


From 13ecddf85bce88cb0b99684040578ffa766db782 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 12:40:16 +0200
Subject: [ticket/11366] Add recheck-all link

PHPBB3-11366
---
 phpBB/language/en/acp/extensions.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index e15b304225..e151c041f3 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -112,4 +112,6 @@ $lang = array_merge($lang, array(
 	'ANNOUNCEMENT_TOPIC'	=> 'Release Announcement',
 	'DOWNLOAD_LATEST'		=> 'Download Version',
 	'NO_VERSIONCHECK'		=> 'No version check information given.',
+
+	'VERSIONCHECK_FORCE_UPDATE_ALL'	=> 'Re-Check all',
 ));
-- 
cgit v1.2.1


From 8dc10d6971ede7fbc63fb3fd92512f95d9ec5dfb Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 17:23:50 +0200
Subject: [ticket/11366] Add $config['extension_force_unstable']

PHPBB3-11366
---
 phpBB/language/en/acp/extensions.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index e151c041f3..4dc70fb951 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -84,6 +84,7 @@ $lang = array_merge($lang, array(
 	'EXTENSION_DELETE_DATA_CONFIRM'	=> 'Are you sure that you wish to delete the data associated with “%s”?<br /><br />This removes all of its data and settings and cannot be undone!',
 	'EXTENSION_DISABLE_CONFIRM'		=> 'Are you sure that you wish to disable the “%s” extension?',
 	'EXTENSION_ENABLE_CONFIRM'		=> 'Are you sure that you wish to enable the “%s” extension?',
+	'EXTENSION_FORCE_UNSTABLE_CONFIRM'	=> 'Are you sure that you wish to force the use of unstable version?',
 
 	'RETURN_TO_EXTENSION_LIST'	=> 'Return to the extension list',
 
@@ -113,5 +114,7 @@ $lang = array_merge($lang, array(
 	'DOWNLOAD_LATEST'		=> 'Download Version',
 	'NO_VERSIONCHECK'		=> 'No version check information given.',
 
-	'VERSIONCHECK_FORCE_UPDATE_ALL'	=> 'Re-Check all',
+	'VERSIONCHECK_FORCE_UPDATE_ALL'		=> 'Re-Check all',
+	'FORCE_UNSTABLE'					=> 'Always check for unstable versions',
+	'EXTENSIONS_VERSION_CHECK_SETTINGS'	=> 'Version check settings',
 ));
-- 
cgit v1.2.1


From 82c97b0a3fb9409747220fe2138016a1208c0dda Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 12 May 2014 18:36:05 +0200
Subject: [ticket/11366] Better language string for "recheck all"

PHPBB3-11366
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 4dc70fb951..e9f1c3ac5c 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -114,7 +114,7 @@ $lang = array_merge($lang, array(
 	'DOWNLOAD_LATEST'		=> 'Download Version',
 	'NO_VERSIONCHECK'		=> 'No version check information given.',
 
-	'VERSIONCHECK_FORCE_UPDATE_ALL'		=> 'Re-Check all',
+	'VERSIONCHECK_FORCE_UPDATE_ALL'		=> 'Re-Check all versions',
 	'FORCE_UNSTABLE'					=> 'Always check for unstable versions',
 	'EXTENSIONS_VERSION_CHECK_SETTINGS'	=> 'Version check settings',
 ));
-- 
cgit v1.2.1


From 031273de728e2c69e583cc4beef49087228cbc2c Mon Sep 17 00:00:00 2001
From: n-aleha <nick_aleha@myway.com>
Date: Mon, 12 May 2014 01:00:59 +0300
Subject: [ticket/11467] Add language variables for extension exception
 messages

Remove hard-coded messages and add language variables for extension
exception messages.

PHPBB3-11467
---
 phpBB/language/en/acp/extensions.php | 3 +++
 phpBB/language/en/common.php         | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index e9f1c3ac5c..6ec722bb78 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -117,4 +117,7 @@ $lang = array_merge($lang, array(
 	'VERSIONCHECK_FORCE_UPDATE_ALL'		=> 'Re-Check all versions',
 	'FORCE_UNSTABLE'					=> 'Always check for unstable versions',
 	'EXTENSIONS_VERSION_CHECK_SETTINGS'	=> 'Version check settings',
+
+	'META_FIELD_NOT_SET'	=> 'Required meta field %s has not been set.',
+	'META_FIELD_INVALID'	=> 'Meta field %s is invalid.',
 ));
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5e524a6164..2020783100 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -231,6 +231,8 @@ $lang = array_merge($lang, array(
 	'FILESIZE'				=> 'File size',
 	'FILEDATE'				=> 'File date',
 	'FILE_COMMENT'			=> 'File comment',
+	'FILE_CONTENT_ERR'		=> 'Could not read the contents of file: %s',
+	'FILE_JSON_DECODE_ERR'	=> 'Failed to decode json file: %s',
 	'FILE_NOT_FOUND'		=> 'The requested file could not be found: %s',
 	'FIND_USERNAME'			=> 'Find a member',
 	'FOLDER'				=> 'Folder',
-- 
cgit v1.2.1


From d52f34f5ec5d006ec7e610e1c72266df21e70ac7 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 5 Jun 2011 09:40:43 +0200
Subject: [ticket/10073] Add a contact administrators page and refactor email
 forms.

The message to be displayed on top of the email form cannot be configured yet.

PHPBB3-10073
---
 phpBB/language/en/common.php     | 3 ++-
 phpBB/language/en/memberlist.php | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5e524a6164..f451ac5f25 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -171,6 +171,7 @@ $lang = array_merge($lang, array(
 	'CONNECTION_SUCCESS'	=> 'Connection was successful!',
 	'CONTACT'				=> 'Contact',
 	'CONTACT_USER'			=> 'Contact %s',
+	'CONTACT_US'			=> 'Contact us',
 	'COOKIES_DELETED'		=> 'All board cookies successfully deleted.',
 	'CURRENT_TIME'			=> 'It is currently %s',
 
@@ -730,7 +731,7 @@ $lang = array_merge($lang, array(
 	'TOO_SHORT_USER_PASSWORD'		=> 'The password you entered is too short.',
 	'TOO_SHORT_USERNAME'			=> 'The username you entered is too short.',
 	'TOO_SHORT_EMAIL'				=> 'The email address you entered is too short.',
-
+	'TOO_SHORT_EMAIL_CONFIRM'		=> 'The email address confirmation you entered is too short.',
 	'TOO_SMALL'						=> 'The value you entered is too small.',
 	'TOO_SMALL_MAX_RECIPIENTS'		=> 'The value of <strong>Maximum number of allowed recipients per private message</strong> setting you entered is too small.',
 
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 7b6838e6d9..b8f2adf42b 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -49,6 +49,8 @@ $lang = array_merge($lang, array(
 	'BEFORE'				=> 'Before',
 
 	'CC_EMAIL'				=> 'Send a copy of this email to yourself.',
+	'CONTACT_USER'			=> 'Contact',
+	'CONTACT_ADMIN'			=> 'Contact a Board Administrator',
 
 	'DEST_LANG'				=> 'Language',
 	'DEST_LANG_EXPLAIN'		=> 'Select an appropriate language (if available) for the recipient of this message.',
@@ -61,6 +63,8 @@ $lang = array_merge($lang, array(
 	'EMPTY_MESSAGE_EMAIL'	=> 'You must enter a message to be emailed.',
 	'EMPTY_MESSAGE_IM'		=> 'You must enter a message to be send.',
 	'EMPTY_NAME_EMAIL'		=> 'You must enter the real name of the recipient.',
+	'EMPTY_SENDER_EMAIL'	=> 'You must provide a valid email address.',
+	'EMPTY_SENDER_NAME'		=> 'You must provide a name.',
 	'EMPTY_SUBJECT_EMAIL'	=> 'You must specify a subject for the email.',
 	'EQUAL_TO'				=> 'Equal to',
 
@@ -98,6 +102,8 @@ $lang = array_merge($lang, array(
 
 	'MORE_THAN'				=> 'More than',
 
+	'NO_CONTACT_FORM'		=> 'The board administrator contact form has been disabled.',
+	'NO_CONTACT_PAGE'		=> 'The board administrator contact page has been disabled.',
 	'NO_EMAIL'				=> 'You are not permitted to send email to this user.',
 	'NO_VIEW_USERS'			=> 'You are not authorised to view the member list or profiles.',
 
@@ -113,6 +119,9 @@ $lang = array_merge($lang, array(
 
 	'SELECT_MARKED'			=> 'Select marked',
 	'SELECT_SORT_METHOD'	=> 'Select sort method',
+	'SENDER_EMAIL_ADDRESS'	=> 'Your email address',
+	'SENDER_NAME'			=> 'Your name',
+	'SEND_AIM_MESSAGE'		=> 'Send AIM message',
 	'SEND_ICQ_MESSAGE'		=> 'Send ICQ message',
 	'SEND_IM'				=> 'Instant messaging',
 	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
-- 
cgit v1.2.1


From 6c287e57fc3d93b98632d19933968ce1bed9dee2 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Wed, 3 Aug 2011 12:45:33 -0400
Subject: [ticket/10073] Add Admin contact email template

PHPBB3-10073
---
 phpBB/language/en/email/contact_admin.txt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 phpBB/language/en/email/contact_admin.txt

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/contact_admin.txt b/phpBB/language/en/email/contact_admin.txt
new file mode 100644
index 0000000000..c895c4d687
--- /dev/null
+++ b/phpBB/language/en/email/contact_admin.txt
@@ -0,0 +1,23 @@
+
+Hello {TO_USERNAME},
+
+The following is an e-mail sent to you through the administration contact page on "{SITENAME}".
+
+<!-- IF S_IS_REGISTERED -->
+The message has been sent from an account on the site.
+Username: {FROM_USERNAME}
+E-mail address: {FROM_EMAIL_ADDRESS}
+IP Address: {FROM_IP_ADDRESS}
+Profile: {U_FROM_PROFILE}
+<!-- ELSE -->
+The message was sent from a guest who specified the following contact information:
+Name: {FROM_USERNAME}
+E-mail address: {FROM_EMAIL_ADDRESS}
+IP Address: {FROM_IP_ADDRESS}
+<!-- ENDIF -->
+
+
+Message sent to you follows
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+{MESSAGE}
-- 
cgit v1.2.1


From d3f65cd66e4c3cbf2a8af45a7db99b40d0153214 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 3 May 2014 15:59:06 +0200
Subject: [ticket/10073] Add ACP module to add bbcode text for contact admin
 info

PHPBB3-10073
---
 phpBB/language/en/acp/board.php  | 13 +++++++++++++
 phpBB/language/en/acp/common.php |  2 ++
 2 files changed, 15 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index e2f89839c5..8cb6a8f171 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -352,6 +352,19 @@ $lang = array_merge($lang, array(
 	'SESSION_LENGTH_EXPLAIN'	=> 'Sessions will expire after this time, in seconds.',
 ));
 
+// Contact Settings
+$lang = array_merge($lang, array(
+	'ACP_CONTACT_SETTINGS_EXPLAIN'		=> 'Here you can enable and disable the “Contact Us” page and also add a text that is displayed on the page.',
+
+	'CONTACT_US_ENABLE'				=> 'Enable “Contact Us” page',
+	'CONTACT_US_ENABLE_EXPLAIN'		=> 'This page allows users to send emails to board administrators',
+
+	'CONTACT_US_INFO'				=> '“Contact Us” information',
+	'CONTACT_US_INFO_EXPLAIN'		=> 'The message is displayed on the “Contact Us” page',
+	'CONTACT_US_INFO_PREVIEW'		=> '“Contact Us” information - Preview',
+	'CONTACT_US_INFO_UPDATED'		=> '“Contact Us” information has been updated.',
+));
+
 // Load Settings
 $lang = array_merge($lang, array(
 	'ACP_LOAD_SETTINGS_EXPLAIN'	=> 'Here you can enable and disable certain board functions to reduce the amount of processing required. On most servers there is no need to disable any functions. However on certain systems or in shared hosting environments it may be beneficial to disable capabilities you do not really need. You can also specify limits for system load and active sessions beyond which the board will go offline.',
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index d340e467be..b81b9c2693 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -75,6 +75,8 @@ $lang = array_merge($lang, array(
 	'ACP_CAT_USERS'				=> 'Users',
 	'ACP_CLIENT_COMMUNICATION'	=> 'Client communication',
 	'ACP_COOKIE_SETTINGS'		=> 'Cookie settings',
+	'ACP_CONTACT'				=> 'Contact page',
+	'ACP_CONTACT_SETTINGS'		=> '“Contact Us” settings',
 	'ACP_CRITICAL_LOGS'			=> 'Error log',
 	'ACP_CUSTOM_PROFILE_FIELDS'	=> 'Custom profile fields',
 
-- 
cgit v1.2.1


From d1fb8d3c9e9e154d356d4764b592369d0e8ea30f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 3 May 2014 16:01:32 +0200
Subject: [ticket/10073] Remove language string from rebase conflict

PHPBB3-10073
---
 phpBB/language/en/memberlist.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index b8f2adf42b..d900ababd1 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -121,7 +121,6 @@ $lang = array_merge($lang, array(
 	'SELECT_SORT_METHOD'	=> 'Select sort method',
 	'SENDER_EMAIL_ADDRESS'	=> 'Your email address',
 	'SENDER_NAME'			=> 'Your name',
-	'SEND_AIM_MESSAGE'		=> 'Send AIM message',
 	'SEND_ICQ_MESSAGE'		=> 'Send ICQ message',
 	'SEND_IM'				=> 'Instant messaging',
 	'SEND_JABBER_MESSAGE'	=> 'Send Jabber message',
-- 
cgit v1.2.1


From c5a51efd2084f687eea17c93d95f1e13c7496d58 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 20 May 2014 17:23:36 +0200
Subject: [ticket/10073] Change name of the ACP module

PHPBB3-10073
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index b81b9c2693..ff52509cca 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -76,7 +76,7 @@ $lang = array_merge($lang, array(
 	'ACP_CLIENT_COMMUNICATION'	=> 'Client communication',
 	'ACP_COOKIE_SETTINGS'		=> 'Cookie settings',
 	'ACP_CONTACT'				=> 'Contact page',
-	'ACP_CONTACT_SETTINGS'		=> '“Contact Us” settings',
+	'ACP_CONTACT_SETTINGS'		=> 'Contact page settings',
 	'ACP_CRITICAL_LOGS'			=> 'Error log',
 	'ACP_CUSTOM_PROFILE_FIELDS'	=> 'Custom profile fields',
 
-- 
cgit v1.2.1


From 8e48840034aa0a00fc31f577d409663a529845f0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 20 May 2014 17:41:22 +0200
Subject: [ticket/10073] Fix more "Contact Us" strings

PHPBB3-10073
---
 phpBB/language/en/acp/board.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 8cb6a8f171..d51b0999ff 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -354,15 +354,15 @@ $lang = array_merge($lang, array(
 
 // Contact Settings
 $lang = array_merge($lang, array(
-	'ACP_CONTACT_SETTINGS_EXPLAIN'		=> 'Here you can enable and disable the “Contact Us” page and also add a text that is displayed on the page.',
+	'ACP_CONTACT_SETTINGS_EXPLAIN'		=> 'Here you can enable and disable the contact page and also add a text that is displayed on the page.',
 
-	'CONTACT_US_ENABLE'				=> 'Enable “Contact Us” page',
+	'CONTACT_US_ENABLE'				=> 'Enable contact page',
 	'CONTACT_US_ENABLE_EXPLAIN'		=> 'This page allows users to send emails to board administrators',
 
-	'CONTACT_US_INFO'				=> '“Contact Us” information',
-	'CONTACT_US_INFO_EXPLAIN'		=> 'The message is displayed on the “Contact Us” page',
-	'CONTACT_US_INFO_PREVIEW'		=> '“Contact Us” information - Preview',
-	'CONTACT_US_INFO_UPDATED'		=> '“Contact Us” information has been updated.',
+	'CONTACT_US_INFO'				=> 'Contact information',
+	'CONTACT_US_INFO_EXPLAIN'		=> 'The message is displayed on the contact page',
+	'CONTACT_US_INFO_PREVIEW'		=> 'Contact page information - Preview',
+	'CONTACT_US_INFO_UPDATED'		=> 'Contact page information has been updated.',
 ));
 
 // Load Settings
-- 
cgit v1.2.1


From e7fd259766ff78edf98ee08fff83cb70ac46b6f7 Mon Sep 17 00:00:00 2001
From: LEZY Thomas <thomas.gif.91@gmail.com>
Date: Thu, 29 May 2014 16:37:45 +0200
Subject: [ticket/12597] Refactoring and test improving

Adding tests of return status
Refactoring code
Adding consistency in verbose mode

PHPBB3-12597
---
 phpBB/language/en/acp/common.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index f9f38788a6..c3bf60f642 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -222,13 +222,13 @@ $lang = array_merge($lang, array(
 	'BACK'					=> 'Back',
 
 	'CLI_DESCRIPTION_CRON_RUN'		=> 'Runs all available cron tasks.',
-	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'What task do you what to run?',
-
+	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'Name of the task to be run',
 
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
 	'CRON_LOCK_ERROR'		=> 'Could not obtain cron lock.',
-	'CRON_NO_TASK'			=> 'No such cron task',
+	'CRON_NO_SUCH_TASK'		=> 'No such cron task',
+	'CRON_NO_TASK'			=> 'No task to be run',
 
 	'DEACTIVATE'				=> 'Deactivate',
 	'DIRECTORY_DOES_NOT_EXIST'	=> 'The entered path “%s” does not exist.',
-- 
cgit v1.2.1


From 9cda850b3aedce7ae929030bcb2f6c77cd363ec1 Mon Sep 17 00:00:00 2001
From: LEZY Thomas <thomas.gif.91@gmail.com>
Date: Thu, 29 May 2014 20:46:23 +0200
Subject: [ticket/12597] Modifiying acp message

Modifying an acp message in order to include the use of the command

PHPBB3-12597
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index b796206261..c7a29f5d22 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -459,7 +459,7 @@ $lang = array_merge($lang, array(
 	'UPLOAD_ICONS_PATH'			=> 'Extension group icons storage path',
 	'UPLOAD_ICONS_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/upload_icons</samp>.',
 	'USE_SYSTEM_CRON'		=> 'Run periodic tasks from system cron',
-	'USE_SYSTEM_CRON_EXPLAIN'		=> 'When off, phpBB will arrange for periodic tasks to be run automatically. When on, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for <code>cron.php</code> to be invoked by the system cron facility at regular intervals (e.g. every 5 minutes).',
+	'USE_SYSTEM_CRON_EXPLAIN'		=> 'When off, phpBB will arrange for periodic tasks to be run automatically. When on, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for cron:run command to be run by the system cron facility at regular intervals (e.g. every 5 minutes).',
 ));
 
 // Security Settings
-- 
cgit v1.2.1


From fa3a634ae11af0a89000d5770b1c3fae10486195 Mon Sep 17 00:00:00 2001
From: LEZY Thomas <thomas.gif.91@gmail.com>
Date: Fri, 30 May 2014 10:55:03 +0200
Subject: [ticket/12597] Reformating an acp message

PHPBB3-12597
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index c7a29f5d22..1585141930 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -459,7 +459,7 @@ $lang = array_merge($lang, array(
 	'UPLOAD_ICONS_PATH'			=> 'Extension group icons storage path',
 	'UPLOAD_ICONS_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/upload_icons</samp>.',
 	'USE_SYSTEM_CRON'		=> 'Run periodic tasks from system cron',
-	'USE_SYSTEM_CRON_EXPLAIN'		=> 'When off, phpBB will arrange for periodic tasks to be run automatically. When on, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for cron:run command to be run by the system cron facility at regular intervals (e.g. every 5 minutes).',
+	'USE_SYSTEM_CRON_EXPLAIN'		=> 'When off, phpBB will arrange for periodic tasks to be run automatically. When on, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for <code>cron:run</code> command to be run by the system cron facility at regular intervals (e.g. every 5 minutes).',
 ));
 
 // Security Settings
-- 
cgit v1.2.1


From 4d80d90f7300f9dca96b5c72be5c3b66ce598791 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 30 May 2014 19:51:11 +0200
Subject: [ticket/12597] Improve language for cron:run command.

PHPBB3-12597
---
 phpBB/language/en/acp/common.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index c3bf60f642..72c9e32ef3 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -221,14 +221,14 @@ $lang = array_merge($lang, array(
 
 	'BACK'					=> 'Back',
 
-	'CLI_DESCRIPTION_CRON_RUN'		=> 'Runs all available cron tasks.',
+	'CLI_DESCRIPTION_CRON_RUN'				=> 'Runs all ready cron tasks.',
 	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'Name of the task to be run',
 
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
 	'CRON_LOCK_ERROR'		=> 'Could not obtain cron lock.',
-	'CRON_NO_SUCH_TASK'		=> 'No such cron task',
-	'CRON_NO_TASK'			=> 'No task to be run',
+	'CRON_NO_SUCH_TASK'		=> 'Could not find cron task “%s”.',
+	'CRON_NO_TASK'			=> 'No cron tasks need to be run right now.',
 
 	'DEACTIVATE'				=> 'Deactivate',
 	'DIRECTORY_DOES_NOT_EXIST'	=> 'The entered path “%s” does not exist.',
-- 
cgit v1.2.1


From cc41e2eef7b22f0a2c5960589620867fe7b987d5 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 30 May 2014 20:39:06 +0200
Subject: [ticket/12597] Update USE_SYSTEM_CRON_EXPLAIN to be a bit more
 verbose.

PHPBB3-12597
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 1585141930..5bab15bd71 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -459,7 +459,7 @@ $lang = array_merge($lang, array(
 	'UPLOAD_ICONS_PATH'			=> 'Extension group icons storage path',
 	'UPLOAD_ICONS_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/upload_icons</samp>.',
 	'USE_SYSTEM_CRON'		=> 'Run periodic tasks from system cron',
-	'USE_SYSTEM_CRON_EXPLAIN'		=> 'When off, phpBB will arrange for periodic tasks to be run automatically. When on, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for <code>cron:run</code> command to be run by the system cron facility at regular intervals (e.g. every 5 minutes).',
+	'USE_SYSTEM_CRON_EXPLAIN'		=> 'When off, phpBB will arrange for periodic tasks to be run automatically. When on, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for <code>bin/phpbbcli.php cron:run</code> to be run by the system cron facility at regular intervals (e.g. every 5 minutes).',
 ));
 
 // Security Settings
-- 
cgit v1.2.1


From 7c16d1c2abd78460c69b27a9b187e9b0e796fedc Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Fri, 30 May 2014 23:23:01 +0200
Subject: [ticket/12325] Fix the language var name

PHPBB3-12325
---
 phpBB/language/en/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 65c53c0d35..60704f2cd9 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -517,7 +517,7 @@ $lang = array_merge($lang, array(
 	'STAGE_UPDATE_FILES'		=> 'Update files',
 	'STAGE_VERSION_CHECK'		=> 'Version check',
 	'STATUS_CONFLICT'			=> 'Modified file producing conflicts',
-	'L_STATUS_DELETED'			=> 'Deleted file',
+	'STATUS_DELETED'			=> 'Deleted file',
 	'STATUS_MODIFIED'			=> 'Modified file',
 	'STATUS_NEW'				=> 'New file',
 	'STATUS_NEW_CONFLICT'		=> 'Conflicting new file',
-- 
cgit v1.2.1


From 58d7302b495783edd6e0826c100ffa93acb0693d Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Mon, 2 Jun 2014 12:17:37 +0200
Subject: [ticket/12602] Add files to print the cron list and test files.

PHPBB3-12602
---
 phpBB/language/en/acp/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 838a73caed..36de5e07ad 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -223,6 +223,7 @@ $lang = array_merge($lang, array(
 
 	'BACK'					=> 'Back',
 
+	'CLI_DESCRIPTION_CRON_LIST'	=> 'Print the cron list.',
 	'CLI_DESCRIPTION_CRON_RUN'				=> 'Runs all ready cron tasks.',
 	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'Name of the task to be run',
 
-- 
cgit v1.2.1


From 5aca27e8cfc0f9387bc62756c8f296e2cec823a3 Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Tue, 3 Jun 2014 10:54:28 +0200
Subject: [ticket/12602] Fix coding style mistakes.

PHPBB3-12602
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 36de5e07ad..c3a946466f 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -223,7 +223,7 @@ $lang = array_merge($lang, array(
 
 	'BACK'					=> 'Back',
 
-	'CLI_DESCRIPTION_CRON_LIST'	=> 'Print the cron list.',
+	'CLI_DESCRIPTION_CRON_LIST'				=> 'Print the cron list.',
 	'CLI_DESCRIPTION_CRON_RUN'				=> 'Runs all ready cron tasks.',
 	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'Name of the task to be run',
 
-- 
cgit v1.2.1


From 5efd55a34883acad2971117d3a7faf20ecd7e08b Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Wed, 4 Jun 2014 14:26:40 +0200
Subject: [ticket/12655] Run the shell when --shell is used

PHPBB3-12655
---
 phpBB/language/en/acp/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 838a73caed..0b82b447ef 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -226,6 +226,8 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_CRON_RUN'				=> 'Runs all ready cron tasks.',
 	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'Name of the task to be run',
 
+	'CLI_DESCRIPTION_OPTION_SHELL'			=> 'Launch the shell.',
+
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
 	'CRON_LOCK_ERROR'		=> 'Could not obtain cron lock.',
-- 
cgit v1.2.1


From f119e060b72b82f5b4242129a647d828370b6c49 Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Thu, 5 Jun 2014 09:12:44 +0200
Subject: [ticket/12602] Fix internationalisation of cron_list.php

PHPBB3-12602
---
 phpBB/language/en/acp/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index c3a946466f..a192ec396d 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -303,6 +303,8 @@ $lang = array_merge($lang, array(
 
 	'SHOW_ALL_OPERATIONS'	=> 'Show all operations',
 
+	'TASKS_NOT_READY'			=> 'Not ready tasks:',
+	'TASKS_READY'			=> 'Ready tasks:',
 	'TOTAL_SIZE'      		=> 'Total size',
 
 	'UCP'					=> 'User Control Panel',
-- 
cgit v1.2.1


From c3b24e200566b11e80f96f8186dbe5eab6241d72 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 29 May 2014 23:28:22 +0200
Subject: [ticket/12613] Improved pagination

PHPBB3-12613
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 2020783100..d2aa0fea54 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -341,6 +341,7 @@ $lang = array_merge($lang, array(
 	'JUMP_PAGE'				=> 'Enter the page number you wish to go to',
 	'JUMP_TO'				=> 'Jump to',
 	'JUMP_TO_PAGE'			=> 'Click to jump to page…',
+	'JUMP_TO_PAGE_FORM'		=> 'Jump to page:',
 
 	'KB'					=> 'KB',
 	'KIB'					=> 'KiB',
-- 
cgit v1.2.1


From c47b546bf08775d215da4bd07e7a93cbc68b322f Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Sun, 1 Jun 2014 10:54:04 +0200
Subject: [ticket/12613] Renamed jump-to to page-jump to prevent confusion

Jump-to can easily be confused with forum-jump.
Also switched the lang vars to reflect changes better

PHPBB3-12613
---
 phpBB/language/en/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index d2aa0fea54..8a10ad3851 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -340,8 +340,8 @@ $lang = array_merge($lang, array(
 	'JOINED'				=> 'Joined',
 	'JUMP_PAGE'				=> 'Enter the page number you wish to go to',
 	'JUMP_TO'				=> 'Jump to',
-	'JUMP_TO_PAGE'			=> 'Click to jump to page…',
-	'JUMP_TO_PAGE_FORM'		=> 'Jump to page:',
+	'JUMP_TO_PAGE'			=> 'Jump to page:',
+	'JUMP_TO_PAGE_CLICK'	=> 'Click to jump to page…',
 
 	'KB'					=> 'KB',
 	'KIB'					=> 'KiB',
-- 
cgit v1.2.1


From 5bd46c467ba30628298e4cacb6670b2bc16912a6 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 4 Jun 2014 21:51:29 +0200
Subject: [ticket/12613] Typo and L_COLON

PHPBB3-12613
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 8a10ad3851..d301086327 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -340,7 +340,7 @@ $lang = array_merge($lang, array(
 	'JOINED'				=> 'Joined',
 	'JUMP_PAGE'				=> 'Enter the page number you wish to go to',
 	'JUMP_TO'				=> 'Jump to',
-	'JUMP_TO_PAGE'			=> 'Jump to page:',
+	'JUMP_TO_PAGE'			=> 'Jump to page',
 	'JUMP_TO_PAGE_CLICK'	=> 'Click to jump to page…',
 
 	'KB'					=> 'KB',
-- 
cgit v1.2.1


From c6999481e7ebd4c24127161ad2b51d8c3e15dc05 Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Thu, 5 Jun 2014 15:11:15 +0200
Subject: [ticket/12602] Add types, change description of cron:list.

PHPBB3-12602
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index a192ec396d..239b576738 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -223,7 +223,7 @@ $lang = array_merge($lang, array(
 
 	'BACK'					=> 'Back',
 
-	'CLI_DESCRIPTION_CRON_LIST'				=> 'Print the cron list.',
+	'CLI_DESCRIPTION_CRON_LIST'				=> 'Prints a list of ready and unready cron jobs.',
 	'CLI_DESCRIPTION_CRON_RUN'				=> 'Runs all ready cron tasks.',
 	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'Name of the task to be run',
 
-- 
cgit v1.2.1


From 8f0a04f318a5cf11595eae9f52118bfef7f3d98c Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Fri, 6 Jun 2014 10:21:00 +0200
Subject: [ticket/12602] Fix language var mistakes.

PHPBB3-12602
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 239b576738..7d82e21799 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -230,8 +230,8 @@ $lang = array_merge($lang, array(
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
 	'CRON_LOCK_ERROR'		=> 'Could not obtain cron lock.',
+	'CRON_NO_RUNNABLE_TASK'	=> 'No cron task needs to be run right now.',
 	'CRON_NO_SUCH_TASK'		=> 'Could not find cron task “%s”.',
-	'CRON_NO_TASK'			=> 'No cron tasks need to be run right now.',
 
 	'DEACTIVATE'				=> 'Deactivate',
 	'DIRECTORY_DOES_NOT_EXIST'	=> 'The entered path “%s” does not exist.',
-- 
cgit v1.2.1


From 347de7f060095cc43c2a5b5575924997ac8d3dbf Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Fri, 6 Jun 2014 14:55:37 +0200
Subject: [ticket/12602] Rectify language keys.

PHPBB3-12602
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 7d82e21799..fa0c21d76e 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -230,8 +230,8 @@ $lang = array_merge($lang, array(
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
 	'CRON_LOCK_ERROR'		=> 'Could not obtain cron lock.',
-	'CRON_NO_RUNNABLE_TASK'	=> 'No cron task needs to be run right now.',
 	'CRON_NO_SUCH_TASK'		=> 'Could not find cron task “%s”.',
+	'CRON_NO_TASKS'			=> 'No cron tasks could be found.',
 
 	'DEACTIVATE'				=> 'Deactivate',
 	'DIRECTORY_DOES_NOT_EXIST'	=> 'The entered path “%s” does not exist.',
-- 
cgit v1.2.1


From 088ce641be6528bc8705b630569c98a082455aa4 Mon Sep 17 00:00:00 2001
From: Etienne Baroux <barouxe@phelma.grenoble-inp.fr>
Date: Fri, 6 Jun 2014 17:49:18 +0200
Subject: [ticket/12602] Fix language key removal.

PHPBB3-12602
---
 phpBB/language/en/acp/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index fa0c21d76e..12cdc28aa3 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -231,6 +231,7 @@ $lang = array_merge($lang, array(
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
 	'CRON_LOCK_ERROR'		=> 'Could not obtain cron lock.',
 	'CRON_NO_SUCH_TASK'		=> 'Could not find cron task “%s”.',
+	'CRON_NO_TASK'			=> 'No cron tasks need to be run right now.',
 	'CRON_NO_TASKS'			=> 'No cron tasks could be found.',
 
 	'DEACTIVATE'				=> 'Deactivate',
-- 
cgit v1.2.1


From 9a02dc3e27c955d45a9361b5d49ec860a9c240c9 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 7 Jun 2014 16:28:03 +0200
Subject: [ticket/11331] Inform user that double dots will be stripped from
 avatar paths

PHPBB3-11331
---
 phpBB/language/en/acp/board.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 5e4961c435..7dd83e83db 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -111,9 +111,9 @@ $lang = array_merge($lang, array(
 	'ALLOW_REMOTE_UPLOAD_EXPLAIN'	=> 'Allow uploading of avatars from another website.',
 	'ALLOW_UPLOAD'					=> 'Enable avatar uploading',
 	'AVATAR_GALLERY_PATH'			=> 'Avatar gallery path',
-	'AVATAR_GALLERY_PATH_EXPLAIN'	=> 'Path under your phpBB root directory for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>.',
+	'AVATAR_GALLERY_PATH_EXPLAIN'	=> 'Path under your phpBB root directory for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>.<br />Double dots like <samp>../</samp> will be stripped from the path for security reasons.',
 	'AVATAR_STORAGE_PATH'			=> 'Avatar storage path',
-	'AVATAR_STORAGE_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.<br />Avatar uploading <strong>will not be available</strong> if this path is not writable.',
+	'AVATAR_STORAGE_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.<br />Avatar uploading <strong>will not be available</strong> if this path is not writable.<br />Double dots like <samp>../</samp> will be stripped from the path for security reasons.',
 	'MAX_AVATAR_SIZE'				=> 'Maximum avatar dimensions',
 	'MAX_AVATAR_SIZE_EXPLAIN'		=> 'Width x Height in pixels.',
 	'MAX_FILESIZE'					=> 'Maximum avatar file size',
-- 
cgit v1.2.1


From 92f43c5371f1f37bd6d77ade2fc5e2804b5cc49f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 9 Jun 2014 01:40:17 +0200
Subject: [ticket/10073] Fix button descriptions

PHPBB3-10073
---
 phpBB/language/en/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index f451ac5f25..b7250f1089 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -667,8 +667,8 @@ $lang = array_merge($lang, array(
 	'SELECT_ALL_CODE'			=> 'Select all',
 	'SELECT_DESTINATION_FORUM'	=> 'Please select a destination forum',
 	'SELECT_FORUM'				=> 'Select a forum',
-	'SEND_EMAIL'				=> 'Email',				// Used for submit buttons
-	'SEND_EMAIL_USER'			=> 'Email %s',
+	'SEND_EMAIL'				=> 'Send email',				// Used for submit buttons
+	'SEND_EMAIL_USER'			=> 'Send email to %s',
 	'SEND_PRIVATE_MESSAGE'		=> 'Send private message',
 	'SETTINGS'					=> 'Settings',
 	'SIGNATURE'					=> 'Signature',
-- 
cgit v1.2.1


From 89f70673779f1908c8f000c5c053bb377e253254 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 9 Jun 2014 15:55:04 +0200
Subject: [ticket/11711] Inform user of unsupported characters while posting

PHPBB3-11711
---
 phpBB/language/en/posting.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 20377287fd..ac08b27943 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -256,6 +256,7 @@ $lang = array_merge($lang, array(
 
 	'UNAUTHORISED_BBCODE'		=> 'You cannot use certain BBCodes: %s.',
 	'UNGLOBALISE_EXPLAIN'		=> 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.',
+	'UNSUPPORTED_CHARACTERS'	=> 'Your message contains the following unsupported characters:<br />%s',
 	'UPDATE_COMMENT'			=> 'Update comment',
 	'URL_INVALID'				=> 'The URL you specified is invalid.',
 	'URL_NOT_FOUND'				=> 'The file specified could not be found.',
-- 
cgit v1.2.1


From b8151b1299c02506ffa0d665461d85e32cd4cd10 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 9 Jun 2014 18:56:13 +0200
Subject: [ticket/11711] Improve checks for unsupported characters and check
 subject

PHPBB3-11711
---
 phpBB/language/en/posting.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index ac08b27943..e8a8643cfd 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -256,7 +256,8 @@ $lang = array_merge($lang, array(
 
 	'UNAUTHORISED_BBCODE'		=> 'You cannot use certain BBCodes: %s.',
 	'UNGLOBALISE_EXPLAIN'		=> 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.',
-	'UNSUPPORTED_CHARACTERS'	=> 'Your message contains the following unsupported characters:<br />%s',
+	'UNSUPPORTED_CHARACTERS_MESSAGE'	=> 'Your message contains the following unsupported characters:<br />%s',
+	'UNSUPPORTED_CHARACTERS_SUBJECT'	=> 'Your subject contains the following unsupported characters:<br />%s',
 	'UPDATE_COMMENT'			=> 'Update comment',
 	'URL_INVALID'				=> 'The URL you specified is invalid.',
 	'URL_NOT_FOUND'				=> 'The file specified could not be found.',
-- 
cgit v1.2.1


From 3a48f765580e36b1a0e344cea78b53ef4b5b3886 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Tue, 10 Jun 2014 19:58:53 +0200
Subject: [ticket/12563] Changes 2 language variables to better understandable
 names

PHPBB3-12563
---
 phpBB/language/en/acp/styles.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index c2a3f777c2..00ab943d5f 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -71,8 +71,8 @@ $lang = array_merge($lang, array(
 	'STYLE_ERR_NAME_EXIST'		=> 'A style with that name already exists.',
 	'STYLE_ERR_STYLE_NAME'		=> 'You must supply a name for this style.',
 	'STYLE_INSTALLED'			=> 'Style "%s" has been installed.',
-	'STYLE_INSTALLED_RETURN_STYLES'	=> '<a href="%s">Click here</a> to return to installed styles list.',
-	'STYLE_INSTALLED_RETURN_UNINSTALLED'	=> '<a href="%s">Click here</a> to install more styles.',
+	'STYLE_INSTALLED_RETURN_INSTALLED_STYLES'	=> '<a href="%s">Click here</a> to return to installed styles list.',
+	'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES'	=> '<a href="%s">Click here</a> to install more styles.',
 	'STYLE_NAME'				=> 'Style name',
 	'STYLE_NOT_INSTALLED'		=> 'Style "%s" was not installed.',
 	'STYLE_PATH'				=> 'Style path',
-- 
cgit v1.2.1


From 453cb709635465cc76497fae8f5bafc002463415 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Thu, 12 Jun 2014 19:19:46 +0200
Subject: [ticket/12563] Removes strintf in acp_styles.php and shorts up <a>

PHPBB3-12563
---
 phpBB/language/en/acp/styles.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 00ab943d5f..65eb002f1a 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -71,8 +71,8 @@ $lang = array_merge($lang, array(
 	'STYLE_ERR_NAME_EXIST'		=> 'A style with that name already exists.',
 	'STYLE_ERR_STYLE_NAME'		=> 'You must supply a name for this style.',
 	'STYLE_INSTALLED'			=> 'Style "%s" has been installed.',
-	'STYLE_INSTALLED_RETURN_INSTALLED_STYLES'	=> '<a href="%s">Click here</a> to return to installed styles list.',
-	'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES'	=> '<a href="%s">Click here</a> to install more styles.',
+	'STYLE_INSTALLED_RETURN_INSTALLED_STYLES'	=> '<a href="%s">Return to installed styles list</a>.',
+	'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES'	=> '<a href="%s">Install more styles</a>.',
 	'STYLE_NAME'				=> 'Style name',
 	'STYLE_NOT_INSTALLED'		=> 'Style "%s" was not installed.',
 	'STYLE_PATH'				=> 'Style path',
-- 
cgit v1.2.1


From e18365dc63dad36082becdada8c4a7f1b650662e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 13 Jun 2014 14:00:34 +0200
Subject: [ticket/12209] Notify the admin that OAuth still allows DB
 authentification

PHPBB3-12209
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 8ab7be2abd..638e9907ac 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -414,7 +414,7 @@ $lang = array_merge($lang, array(
 	'AUTH_METHOD'				=> 'Select an authentication method',
 
 	'AUTH_PROVIDER_OAUTH_ERROR_ELEMENT_MISSING'	=> 'Both the key and secret of each enabled OAuth service provider must be provided. Only one was provided for an OAuth service provider.',
-	'AUTH_PROVIDER_OAUTH_EXPLAIN'				=> 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server.<br />These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br />Any service that does not have both a key and a secret entered here will not be available for use by the forum users.',
+	'AUTH_PROVIDER_OAUTH_EXPLAIN'				=> 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server. These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br />Any service that does not have both a key and a secret entered here will not be available for use by the forum users. Also note, that user can still register and login using the DB authentication plug-in.',
 	'AUTH_PROVIDER_OAUTH_KEY'					=> 'Key',
 	'AUTH_PROVIDER_OAUTH_TITLE'					=> 'OAuth',
 	'AUTH_PROVIDER_OAUTH_SECRET'				=> 'Secret',
-- 
cgit v1.2.1


From ff808b341c52c70f22e26d766dd248dac2e98f3d Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sat, 14 Jun 2014 14:31:12 +0200
Subject: [ticket/12563] Removes ending . from <a>

PHPBB3-12563
---
 phpBB/language/en/acp/styles.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 65eb002f1a..f46e32ec0d 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -71,8 +71,8 @@ $lang = array_merge($lang, array(
 	'STYLE_ERR_NAME_EXIST'		=> 'A style with that name already exists.',
 	'STYLE_ERR_STYLE_NAME'		=> 'You must supply a name for this style.',
 	'STYLE_INSTALLED'			=> 'Style "%s" has been installed.',
-	'STYLE_INSTALLED_RETURN_INSTALLED_STYLES'	=> '<a href="%s">Return to installed styles list</a>.',
-	'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES'	=> '<a href="%s">Install more styles</a>.',
+	'STYLE_INSTALLED_RETURN_INSTALLED_STYLES'	=> '<a href="%s">Return to installed styles list</a>',
+	'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES'	=> '<a href="%s">Install more styles</a>',
 	'STYLE_NAME'				=> 'Style name',
 	'STYLE_NOT_INSTALLED'		=> 'Style "%s" was not installed.',
 	'STYLE_PATH'				=> 'Style path',
-- 
cgit v1.2.1


From d5f4d288e92499b64e96aeafe673ed05708cc8da Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 28 May 2014 21:33:17 +0200
Subject: [ticket/12608] Improve notifications drop-down menu styling in header

PHPBB3-12608
---
 phpBB/language/en/common.php | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 9a44337294..09bac9e997 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -440,29 +440,32 @@ $lang = array_merge($lang, array(
 	// A, B, C and 2 others replied...
 	// A, B, C and others replied...
 	'NOTIFICATION_BOOKMARK'				=> array(
-		1	=> '%1$s replied to the topic “%2$s” you have bookmarked.',
+		1	=> '<strong>Reply</strong> from %1$s in bookmarked topic:',
 	),
-	'NOTIFICATION_GROUP_REQUEST'		=> '%1$s is requesting to join the group %2$s.',
-	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> 'Your request to join the group %1$s has been approved.',
-	'NOTIFICATION_PM'					=> '%1$s sent you a Private Message "%2$s".',
+	'NOTIFICATION_FORUM'				=> 'Forum: "%1$s"',
+	'NOTIFICATION_GROUP_REQUEST'		=> '<strong>Group request</strong> from %1$s to join the group %2$s.',
+	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> '<strong>Group request approved</strong> to join the group %1$s.',
+	'NOTIFICATION_PM'					=> '<strong>Private Message</strong> from %1$s:',
 	'NOTIFICATION_POST'					=> array(
-		1	=> '%1$s replied to the topic “%2$s”.',
+		1	=> '<strong>Reply</strong> from %1$s in topic:',
 	),
-	'NOTIFICATION_POST_APPROVED'		=> 'Your post was approved "%2$s".',
-	'NOTIFICATION_POST_DISAPPROVED'		=> 'Your post "%1$s" was disapproved for reason: "%2$s".',
-	'NOTIFICATION_POST_IN_QUEUE'		=> 'A new post titled "%2$s" was posted by %1$s and needs approval.',
+	'NOTIFICATION_POST_APPROVED'		=> '<strong>Post approved</strong>:',
+	'NOTIFICATION_POST_DISAPPROVED'		=> '<strong>Post disapproved</strong>:',
+	'NOTIFICATION_POST_IN_QUEUE'		=> '<strong>Post approval</strong> request by %1$s:',
 	'NOTIFICATION_QUOTE'				=> array(
-		1	=> '%1$s quoted you in the post “%2$s”.',
+		1	=> '<strong>Quoted</strong> by %1$s in:',
 	),
-	'NOTIFICATION_REPORT_PM'			=> '%1$s reported a Private Message "%2$s" for reason: "%3$s".',
-	'NOTIFICATION_REPORT_POST'			=> '%1$s reported a post "%2$s" for reason: "%3$s".',
-	'NOTIFICATION_REPORT_CLOSED'   		=> '%1$s closed the report you made for "%2$s".',
-	'NOTIFICATION_TOPIC'				=> '%1$s posted a new topic "%2$s" in the forum "%3$s".',
-	'NOTIFICATION_TOPIC_APPROVED'		=> 'Your topic "%2$s" in the forum "%3$s" was approved.',
-	'NOTIFICATION_TOPIC_DISAPPROVED'	=> 'Your topic "%1$s" was disapproved for reason: "%2$s".',
-	'NOTIFICATION_TOPIC_IN_QUEUE'		=> 'A new topic titled "%2$s" was posted by %1$s and needs approval.',
+	'NOTIFICATION_REFERENCE'			=> '"%1$s"',
+	'NOTIFICATION_REASON'				=> 'Reason: "%1$s".',
+	'NOTIFICATION_REPORT_PM'			=> '<strong>Private Message reported</strong> by %1$s:',
+	'NOTIFICATION_REPORT_POST'			=> '<strong>Post reported</strong> by %1$s:',
+	'NOTIFICATION_REPORT_CLOSED'   		=> '<strong>Report closed</strong> by %1$s for:',
+	'NOTIFICATION_TOPIC'				=> '<strong>New topic</strong> by %1$s:',
+	'NOTIFICATION_TOPIC_APPROVED'		=> '<strong>Topic approved</strong>:',
+	'NOTIFICATION_TOPIC_DISAPPROVED'	=> '<strong>Topic disapproved</strong>:',
+	'NOTIFICATION_TOPIC_IN_QUEUE'		=> '<strong>Topic approval</strong> request by %1$s:',
 	'NOTIFICATION_TYPE_NOT_EXIST'		=> 'The notification type "%s" is missing from the file system.',
-	'NOTIFICATION_ADMIN_ACTIVATE_USER'	=> 'The user “%1$s” is newly registered and requires activation.',
+	'NOTIFICATION_ADMIN_ACTIVATE_USER'	=> '<strong>Activation required</strong> for newly registered user: “%1$s”',
 	// Used in conjuction with NOTIFICATION_BOOKMARK and NOTIFICATION_POST.
 	'NOTIFICATION_MANY_OTHERS'			=> 'others',
 	'NOTIFICATION_X_OTHERS'				=> array(
-- 
cgit v1.2.1


From 693cbd247cc1d3768d56795da4a580780e6b899c Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 28 May 2014 22:49:16 +0200
Subject: [ticket/12608] Add styling (CSS class) options to notifications

This will allow different notifications to have different styles

PHPBB3-12608
---
 phpBB/language/en/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 09bac9e997..e8169fc41a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -442,7 +442,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_BOOKMARK'				=> array(
 		1	=> '<strong>Reply</strong> from %1$s in bookmarked topic:',
 	),
-	'NOTIFICATION_FORUM'				=> 'Forum: "%1$s"',
+	'NOTIFICATION_FORUM'				=> '<em>Forum:</em> %1$s',
 	'NOTIFICATION_GROUP_REQUEST'		=> '<strong>Group request</strong> from %1$s to join the group %2$s.',
 	'NOTIFICATION_GROUP_REQUEST_APPROVED'	=> '<strong>Group request approved</strong> to join the group %1$s.',
 	'NOTIFICATION_PM'					=> '<strong>Private Message</strong> from %1$s:',
@@ -456,7 +456,7 @@ $lang = array_merge($lang, array(
 		1	=> '<strong>Quoted</strong> by %1$s in:',
 	),
 	'NOTIFICATION_REFERENCE'			=> '"%1$s"',
-	'NOTIFICATION_REASON'				=> 'Reason: "%1$s".',
+	'NOTIFICATION_REASON'				=> '<em>Reason:</em> %1$s.',
 	'NOTIFICATION_REPORT_PM'			=> '<strong>Private Message reported</strong> by %1$s:',
 	'NOTIFICATION_REPORT_POST'			=> '<strong>Post reported</strong> by %1$s:',
 	'NOTIFICATION_REPORT_CLOSED'   		=> '<strong>Report closed</strong> by %1$s for:',
-- 
cgit v1.2.1


From 04164affe672be6feea676fd05cf9761bf2e477a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 20 Jun 2014 12:35:42 +0200
Subject: [ticket/12747] Drop support for Firebird

PHPBB3-12747
---
 phpBB/language/en/install.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 7235e51a94..2b7f377f5b 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -142,7 +142,6 @@ $lang = array_merge($lang, array(
 	'DEV_NO_TEST_FILE'			=> 'No value has been specified for the test_file variable in the convertor. If you are a user of this convertor, you should not be seeing this error, please report this message to the convertor author. If you are a convertor author, you must specify the name of a file which exists in the source board to allow the path to it to be verified.',
 	'DIRECTORIES_AND_FILES'		=> 'Directory and file setup',
 	'DISABLE_KEYS'				=> 'Disabling keys',
-	'DLL_FIREBIRD'				=> 'Firebird',
 	'DLL_FTP'					=> 'Remote FTP support [ Installation ]',
 	'DLL_GD'					=> 'GD graphics support [ Visual Confirmation ]',
 	'DLL_MBSTRING'				=> 'Multi-byte character support',
@@ -171,8 +170,6 @@ $lang = array_merge($lang, array(
 	'FILLING_TABLE'				=> 'Filling table <strong>%s</strong>',
 	'FILLING_TABLES'			=> 'Filling tables',
 
-	'FIREBIRD_DBMS_UPDATE_REQUIRED'		=> 'phpBB no longer supports Firebird/Interbase prior to Version 2.1. Please update your Firebird installation to at least 2.1.0 before proceeding with the update.',
-
 	'FINAL_STEP'				=> 'Process final step',
 	'FORUM_ADDRESS'				=> 'Board address',
 	'FORUM_ADDRESS_EXPLAIN'		=> 'This is the URL of your former board, for example <samp>http://www.example.com/phpBB2/</samp>. If an address is entered here and not left empty every instance of this address will be replaced by your new board address within messages, private messages and signatures.',
@@ -216,7 +213,6 @@ $lang = array_merge($lang, array(
 		<li>PostgreSQL 8.3+</li>
 		<li>SQLite 2.8.2+</li>
 		<li>SQLite 3.6.15+</li>
-		<li>Firebird 2.1+</li>
 		<li>MS SQL Server 2000 or above (directly or via ODBC)</li>
 		<li>MS SQL Server 2005 or above (native)</li>
 		<li>Oracle</li>
@@ -241,8 +237,6 @@ $lang = array_merge($lang, array(
 	'INST_ERR_DB_NO_SQLITE'		=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
 	'INST_ERR_DB_NO_SQLITE3'	=> 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 3.6.15.',
 	'INST_ERR_DB_NO_ORACLE'		=> 'The version of Oracle installed on this machine requires you to set the <var>NLS_CHARACTERSET</var> parameter to <var>UTF8</var>. Either upgrade your installation to 9.2+ or change the parameter.',
-	'INST_ERR_DB_NO_FIREBIRD'	=> 'The version of Firebird installed on this machine is older than 2.1, please upgrade to a newer version.',
-	'INST_ERR_DB_NO_FIREBIRD_PS'=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
 	'INST_ERR_DB_NO_POSTGRES'	=> 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
 	'INST_ERR_DB_NO_NAME'		=> 'No database name specified.',
 	'INST_ERR_EMAIL_INVALID'	=> 'The email address you entered is invalid.',
-- 
cgit v1.2.1


From 28012dc9e10339d7ab66a5b2e3cd394728654f47 Mon Sep 17 00:00:00 2001
From: Shitiz Garg <mail@dragooon.net>
Date: Thu, 19 Jun 2014 19:02:10 +0530
Subject: [ticket/12732] Add Skype custom profile field

PHPBB3-12732
---
 phpBB/language/en/acp/profile.php | 1 +
 phpBB/language/en/common.php      | 1 +
 phpBB/language/en/memberlist.php  | 1 +
 3 files changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 7336031218..94bd09eb5d 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -42,6 +42,7 @@ $lang = array_merge($lang, array(
 	'ALPHA_ONLY'			=> 'Alphanumeric only',
 	'ALPHA_SPACERS'			=> 'Alphanumeric and spacers',
 	'ALPHA_UNDERSCORE'		=> 'Alphanumeric and underscores',
+	'ALPHA_PUNCTUATION'		=> 'Alphanumeric with comma, dots and dashes',
 	'ALWAYS_TODAY'			=> 'Always the current date',
 
 	'BOOL_ENTRIES_EXPLAIN'	=> 'Enter your options now',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 9a44337294..352952e12c 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -676,6 +676,7 @@ $lang = array_merge($lang, array(
 	'SETTINGS'					=> 'Settings',
 	'SIGNATURE'					=> 'Signature',
 	'SKIP'						=> 'Skip to content',
+	'SKYPE'						=> 'Skype',
 	'SMTP_NO_AUTH_SUPPORT'		=> 'SMTP server does not support authentication.',
 	'SORRY_AUTH_READ'			=> 'You are not authorised to read this forum.',
 	'SORRY_AUTH_VIEW_ATTACH'	=> 'You are not authorised to download this attachment.',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index d900ababd1..b8be44d8a4 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -144,4 +144,5 @@ $lang = array_merge($lang, array(
 	'USERS_PER_PAGE'		=> 'Users per page',
 
 	'VIEWING_PROFILE'		=> 'Viewing profile - %s',
+	'VIEW_SKYPE_PROFILE'	=> 'View Skype Profile',
 ));
-- 
cgit v1.2.1


From 9d3f437149f21963532245f1ae12867291f04033 Mon Sep 17 00:00:00 2001
From: Shitiz Garg <mail@dragooon.net>
Date: Thu, 19 Jun 2014 19:23:52 +0530
Subject: [ticket/12732] Improve ALPHA_PUNCTUATION description

PHPBB3-12732
---
 phpBB/language/en/acp/profile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 94bd09eb5d..bbd442cb7a 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -42,7 +42,7 @@ $lang = array_merge($lang, array(
 	'ALPHA_ONLY'			=> 'Alphanumeric only',
 	'ALPHA_SPACERS'			=> 'Alphanumeric and spacers',
 	'ALPHA_UNDERSCORE'		=> 'Alphanumeric and underscores',
-	'ALPHA_PUNCTUATION'		=> 'Alphanumeric with comma, dots and dashes',
+	'ALPHA_PUNCTUATION'		=> 'Alphanumeric with comma, dots, underscore and dashes beginning with a letter',
 	'ALWAYS_TODAY'			=> 'Always the current date',
 
 	'BOOL_ENTRIES_EXPLAIN'	=> 'Enter your options now',
-- 
cgit v1.2.1


From 310b8af1482021cf8ab6fbe839a4150ff281c4e1 Mon Sep 17 00:00:00 2001
From: Shitiz Garg <mail@dragooon.net>
Date: Tue, 17 Jun 2014 17:51:07 +0530
Subject: [ticket/12729] Add Facebook custom profile field

PHPBB3-12729
---
 phpBB/language/en/acp/profile.php | 1 +
 phpBB/language/en/common.php      | 1 +
 phpBB/language/en/memberlist.php  | 1 +
 3 files changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 7336031218..de0b7dee88 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -39,6 +39,7 @@ if (empty($lang) || !is_array($lang))
 // Custom profile fields
 $lang = array_merge($lang, array(
 	'ADDED_PROFILE_FIELD'	=> 'Successfully added custom profile field.',
+	'ALPHA_DOTS'			=> 'Alphanumeric and dots (periods)',
 	'ALPHA_ONLY'			=> 'Alphanumeric only',
 	'ALPHA_SPACERS'			=> 'Alphanumeric and spacers',
 	'ALPHA_UNDERSCORE'		=> 'Alphanumeric and underscores',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 9a44337294..976feef234 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -226,6 +226,7 @@ $lang = array_merge($lang, array(
 	'EXTENSION_DISABLED_AFTER_POSTING'	=> 'The extension <strong>%s</strong> has been deactivated and can no longer be displayed.',
 	'EXTENSION_DOES_NOT_EXIST'			=> 'The extension <strong>%s</strong> does not exist.',
 
+	'FACEBOOK'				=> 'Facebook',
 	'FAQ'					=> 'FAQ',
 	'FAQ_EXPLAIN'			=> 'Frequently Asked Questions',
 	'FILENAME'				=> 'Filename',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index d900ababd1..341c1620b7 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -144,4 +144,5 @@ $lang = array_merge($lang, array(
 	'USERS_PER_PAGE'		=> 'Users per page',
 
 	'VIEWING_PROFILE'		=> 'Viewing profile - %s',
+	'VIEW_FACEBOOK_PROFILE' => 'View Facebook Profile',
 ));
-- 
cgit v1.2.1


From fac6ab1fd4b2509b0cf387231c8a4bba8383efb6 Mon Sep 17 00:00:00 2001
From: Shitiz Garg <mail@dragooon.net>
Date: Tue, 17 Jun 2014 18:23:36 +0530
Subject: [ticket/12733] Add Twitter custom profile field

PHPBB3-12733
---
 phpBB/language/en/common.php     | 1 +
 phpBB/language/en/memberlist.php | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 9a44337294..360bb73ce7 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -771,6 +771,7 @@ $lang = array_merge($lang, array(
 		2	=> 'Total members <strong>%d</strong>',
 	),
 	'TRACKED_PHP_ERROR'	=> 'Tracked PHP errors: %s',
+	'TWITTER'			=> 'Twitter',
 
 	'UNABLE_GET_IMAGE_SIZE'	=> 'It was not possible to determine the dimensions of the image. Please verify that the URL you entered is correct.',
 	'UNABLE_TO_DELIVER_FILE'=> 'Unable to deliver file.',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index d900ababd1..d8cc224d6f 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -144,4 +144,5 @@ $lang = array_merge($lang, array(
 	'USERS_PER_PAGE'		=> 'Users per page',
 
 	'VIEWING_PROFILE'		=> 'Viewing profile - %s',
+	'VIEW_TWITTER_PROFILE'  => 'View Twitter Profile',
 ));
-- 
cgit v1.2.1


From 03c5de594ea7da11b59db7a4bf5060c6fbfd83bc Mon Sep 17 00:00:00 2001
From: Shitiz Garg <mail@dragooon.net>
Date: Fri, 20 Jun 2014 15:59:40 +0530
Subject: [ticket/12731] Add YouTube custom profile field

PHPBB3-12731
---
 phpBB/language/en/common.php     | 1 +
 phpBB/language/en/memberlist.php | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 9a44337294..de0bdd24b9 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -857,6 +857,7 @@ $lang = array_merge($lang, array(
 	'WROTE'						=> 'wrote',
 
 	'YAHOO'				=> 'Yahoo Messenger',
+	'YOUTUBE'			=> 'YouTube',
 	'YEAR'				=> 'Year',
 	'YEAR_MONTH_DAY'	=> '(YYYY-MM-DD)',
 	'YES'				=> 'Yes',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index d900ababd1..bb2252ed59 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -144,4 +144,5 @@ $lang = array_merge($lang, array(
 	'USERS_PER_PAGE'		=> 'Users per page',
 
 	'VIEWING_PROFILE'		=> 'Viewing profile - %s',
+	'VIEW_YOUTUBE_CHANNEL'  => 'View YouTube Channel',
 ));
-- 
cgit v1.2.1


From ab83995f4493f78aec3d3281650c0f9d8bb74843 Mon Sep 17 00:00:00 2001
From: Shitiz Garg <mail@dragooon.net>
Date: Wed, 18 Jun 2014 19:36:14 +0530
Subject: [ticket/12730] Add a Google+ field by default

PHPBB3-12730
---
 phpBB/language/en/acp/profile.php | 1 +
 phpBB/language/en/common.php      | 1 +
 phpBB/language/en/memberlist.php  | 1 +
 3 files changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index fe3ad814cb..67813bcba4 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -93,6 +93,7 @@ $lang = array_merge($lang, array(
 	'FIELD_DESCRIPTION'			=> 'Field description',
 	'FIELD_DESCRIPTION_EXPLAIN'	=> 'The explanation for this field presented to the user.',
 	'FIELD_DROPDOWN'			=> 'Dropdown box',
+	'FIELD_GOOGLEPLUS'			=> 'Google+',
 	'FIELD_IDENT'				=> 'Field identification',
 	'FIELD_IDENT_ALREADY_EXIST'	=> 'The chosen field identification already exist. Please choose another name.',
 	'FIELD_IDENT_EXPLAIN'		=> 'The field identification is a name to identify the profile field within the database and the templates.',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 46f19359cd..757b9d7251 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -284,6 +284,7 @@ $lang = array_merge($lang, array(
 	'GB'						=> 'GB',
 	'GIB'						=> 'GiB',
 	'GO'						=> 'Go',
+	'GOOGLEPLUS'				=> 'Google+',
 	'GOTO_FIRST_POST'			=> 'Go to first post',
 	'GOTO_LAST_POST'			=> 'Go to last post',
 	'GOTO_PAGE'					=> 'Go to page',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index b5fd21e5e3..e02f9ff525 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -148,4 +148,5 @@ $lang = array_merge($lang, array(
 	'VIEW_SKYPE_PROFILE'	=> 'View Skype Profile',
 	'VIEW_TWITTER_PROFILE'	=> 'View Twitter Profile',
 	'VIEW_YOUTUBE_CHANNEL'  => 'View YouTube Channel',
+	'VIEW_GOOGLEPLUS_PROFILE' => 'View Google+ Profile',
 ));
-- 
cgit v1.2.1


From 6b90a0d09518a4a16ec855211b7fcddaff6668bf Mon Sep 17 00:00:00 2001
From: Shitiz Garg <mail@dragooon.net>
Date: Sat, 21 Jun 2014 03:56:40 +0530
Subject: [ticket/12753] Add invalid chars string for ALPHA_DOTS and
 ALPHA_PUNCTUATION

PHPBB3-12753
---
 phpBB/language/en/ucp.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index c3ace160e9..d4e1915076 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -209,7 +209,9 @@ $lang = array_merge($lang, array(
 	'FIELD_TOO_LARGE'					=> 'The value of “%2$s” is too large, a maximum value of %1$d is allowed.',
 	'FIELD_INVALID_CHARS_INVALID'		=> 'The field “%s” has invalid characters.',
 	'FIELD_INVALID_CHARS_NUMBERS_ONLY'	=> 'The field “%s” has invalid characters, only numbers are allowed.',
+	'FIELD_INVALID_CHARS_ALPHA_DOTS'	=> 'The field “%s” has invalid characters, only alphanumeric or . characters are allowed.',
 	'FIELD_INVALID_CHARS_ALPHA_ONLY'	=> 'The field “%s” has invalid characters, only alphanumeric characters are allowed.',
+	'FIELD_INVALID_CHARS_ALPHA_PUNCTUATION'	=> 'The field “%s” has invalid characters, only alphanumeric or _,-. characters are allowed and the first character must be alphabetic.',
 	'FIELD_INVALID_CHARS_ALPHA_SPACERS'	=> 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
 	'FIELD_INVALID_CHARS_ALPHA_UNDERSCORE'	=> 'The field “%s” has invalid characters, only alphanumeric or _ characters are allowed.',
 	'FIELD_INVALID_DATE'				=> 'The field “%s” has an invalid date.',
-- 
cgit v1.2.1


From 32a2c95f903cbbfad909945887a1cbabd84d5039 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Fri, 20 Jun 2014 15:02:08 +0200
Subject: [ticket/12723] Add Sniff ensuring PHP files use the correct file
 header

PHPBB3-12723
---
 phpBB/language/en/plupload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/plupload.php b/phpBB/language/en/plupload.php
index c4a8d770a0..15c3955a1a 100644
--- a/phpBB/language/en/plupload.php
+++ b/phpBB/language/en/plupload.php
@@ -3,8 +3,8 @@
 *
 * This file is part of the phpBB Forum Software package.
 *
-* @copyright (c) 2010-2013 Moxiecode Systems AB
 * @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @copyright (c) 2010-2013 Moxiecode Systems AB
 * @license GNU General Public License, version 2 (GPL-2.0)
 *
 * For full copyright and license information, please see
-- 
cgit v1.2.1


From c4e48ed0b962711d77adc8e5f3853350dc7c8ce0 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sun, 22 Jun 2014 21:42:59 +0200
Subject: [ticket/12563] Adds &laquo; and &raquo; to the links in
 acp_styles.php

PHPBB3-12563
---
 phpBB/language/en/acp/styles.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index f46e32ec0d..506d569d56 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -71,8 +71,8 @@ $lang = array_merge($lang, array(
 	'STYLE_ERR_NAME_EXIST'		=> 'A style with that name already exists.',
 	'STYLE_ERR_STYLE_NAME'		=> 'You must supply a name for this style.',
 	'STYLE_INSTALLED'			=> 'Style "%s" has been installed.',
-	'STYLE_INSTALLED_RETURN_INSTALLED_STYLES'	=> '<a href="%s">Return to installed styles list</a>',
-	'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES'	=> '<a href="%s">Install more styles</a>',
+	'STYLE_INSTALLED_RETURN_INSTALLED_STYLES'	=> 'Return to installed styles list',
+	'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES'	=> 'Install more styles',
 	'STYLE_NAME'				=> 'Style name',
 	'STYLE_NOT_INSTALLED'		=> 'Style "%s" was not installed.',
 	'STYLE_PATH'				=> 'Style path',
-- 
cgit v1.2.1


From 453f2904c23ddcfe98a8db1dbdbe5c09f74c0717 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Mon, 23 Jun 2014 19:38:44 +0200
Subject: [ticket/12680] Solves last bugs. viewprofile: contact --> contact
 nickname

PHPBB3-12680
---
 phpBB/language/en/memberlist.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index d900ababd1..7e897e83af 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -49,7 +49,6 @@ $lang = array_merge($lang, array(
 	'BEFORE'				=> 'Before',
 
 	'CC_EMAIL'				=> 'Send a copy of this email to yourself.',
-	'CONTACT_USER'			=> 'Contact',
 	'CONTACT_ADMIN'			=> 'Contact a Board Administrator',
 
 	'DEST_LANG'				=> 'Language',
-- 
cgit v1.2.1


From e42b316d87dcd6dade0147cd6308af5b4a5bf305 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 24 Jun 2014 20:44:59 -0700
Subject: [ticket/12760] Fix wording for unapproved posts icon...

in last post column of forum lists.
https://tracker.phpbb.com/browse/PHPBB3-12760

PHPBB3-12760
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 68b8b594c4..91f8171854 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -563,6 +563,7 @@ $lang = array_merge($lang, array(
 	'POSTED_ON_DATE'		=> 'on',
 	'POSTS'					=> 'Posts',
 	'POSTS_UNAPPROVED'		=> 'At least one post in this topic has not been approved.',
+	'POSTS_UNAPPROVED_FORUM'=> 'At least one post in this forum has not been approved.',
 	'POST_BY_AUTHOR'		=> 'by',
 	'POST_BY_FOE'			=> '<strong>%1$s</strong>, who is currently on your ignore list, made this post.',
 	'POST_DISPLAY'			=> '%1$sDisplay this post%2$s.',
-- 
cgit v1.2.1


From a540cdc3b2efd6fdb10f6c7ce9de43ac04ad2897 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 5 Jun 2014 01:31:19 +0200
Subject: [ticket/12662] Initial setup

PHPBB3-12662
---
 phpBB/language/en/common.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index b9eb0fd11d..4d958b33f0 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -64,7 +64,7 @@ $lang = array_merge($lang, array(
 	'ACCOUNT_DEACTIVATED'			=> 'Your account has been manually deactivated and is only able to be reactivated by an administrator.',
 	'ACCOUNT_NOT_ACTIVATED'			=> 'Your account has not been activated yet.',
 	'ACP'							=> 'Administration Control Panel',
-	'ACP_SHORT'						=> 'Administer',
+	'ACP_SHORT'						=> 'ACP',
 	'ACTIVE'						=> 'active',
 	'ACTIVE_ERROR'					=> 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.',
 	'ADMINISTRATOR'					=> 'Administrator',
@@ -393,7 +393,7 @@ $lang = array_merge($lang, array(
 	'MB'					=> 'MB',
 	'MIB'					=> 'MiB',
 	'MCP'					=> 'Moderator Control Panel',
-	'MCP_SHORT'				=> 'Moderate',
+	'MCP_SHORT'				=> 'MCP',
 	'MEMBERLIST'			=> 'Members',
 	'MEMBERLIST_EXPLAIN'	=> 'View complete list of members',
 	'MERGE'					=> 'Merge',
@@ -594,6 +594,8 @@ $lang = array_merge($lang, array(
 	'PRIVATE_MESSAGING'		=> 'Private messaging',
 	'PROFILE'				=> 'User Control Panel',
 
+	'QUICK_LINKS'			=> 'Quick links',
+
 	'RANK'						=> 'Rank',
 	'READING_FORUM'				=> 'Viewing topics in %s',
 	'READING_GLOBAL_ANNOUNCE'	=> 'Reading global announcement',
@@ -660,15 +662,15 @@ $lang = array_merge($lang, array(
 	'SEARCH_ADV_EXPLAIN'		=> 'View the advanced search options',
 	'SEARCH_KEYWORDS'			=> 'Search for keywords',
 	'SEARCHING_FORUMS'			=> 'Searching forums',
-	'SEARCH_ACTIVE_TOPICS'		=> 'View active topics',
+	'SEARCH_ACTIVE_TOPICS'		=> 'Active topics',
 	'SEARCH_FOR'				=> 'Search for',
 	'SEARCH_FORUM'				=> 'Search this forum…',
-	'SEARCH_NEW'				=> 'View new posts',
+	'SEARCH_NEW'				=> 'New posts',
 	'SEARCH_POSTS_BY'			=> 'Search posts by',
-	'SEARCH_SELF'				=> 'View your posts',
+	'SEARCH_SELF'				=> 'Your posts',
 	'SEARCH_TOPIC'				=> 'Search this topic…',
-	'SEARCH_UNANSWERED'			=> 'View unanswered posts',
-	'SEARCH_UNREAD'				=> 'View unread posts',
+	'SEARCH_UNANSWERED'			=> 'Unanswered posts',
+	'SEARCH_UNREAD'				=> 'Unread posts',
 	'SEARCH_USER_POSTS'			=> 'Search user’s posts',
 	'SECONDS'					=> 'Seconds',
 	'SEE_ALL'					=> 'See All',
-- 
cgit v1.2.1


From 29ec455a457574b58b3f4ce30323ea22d72389db Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 25 Jun 2014 22:14:33 +0200
Subject: [ticket/12462] Do not use string "None" for different options

... it limits translations.

PHPBB3-12462
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index d4e1915076..c4328aa3a6 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -359,6 +359,7 @@ $lang = array_merge($lang, array(
 	),
 	'NO_ACTION_MODE'				=> 'No message action specified.',
 	'NO_AUTHOR'						=> 'No author defined for this message',
+	'NO_AVATAR'						=> 'No avatar selected',
 	'NO_AVATAR_CATEGORY'			=> 'None',
 
 	'NO_AUTH_DELETE_MESSAGE'		=> 'You are not authorised to delete private messages.',
-- 
cgit v1.2.1


From 993afd9140f3f69c29f395eaf5f9e1d2d9e690bc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 25 Jun 2014 22:26:15 +0200
Subject: [ticket/12197] Fix several misleading FAQ entries

PHPBB3-12197
---
 phpBB/language/en/help_faq.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 102dffcd5b..904dc92080 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -121,7 +121,7 @@ $help = array(
 	),
 	array(
 		0 => 'How do I add a signature to my post?',
-		1 => 'To add a signature to a post you must first create one via your User Control Panel. Once created, you can check the <em>Attach a signature</em> box on the posting form to add your signature. You can also add a signature by default to all your posts by checking the appropriate radio button in your profile. If you do so, you can still prevent a signature being added to individual posts by un-checking the add signature box within the posting form.'
+		1 => 'To add a signature to a post you must first create one via your User Control Panel. Once created, you can check the <em>Attach a signature</em> box on the posting form to add your signature. You can also add a signature by default to all your posts by checking the appropriate radio button in the User Control Panel. If you do so, you can still prevent a signature being added to individual posts by un-checking the add signature box within the posting form.'
 	),
 	array(
 		0 => 'How do I create a poll?',
@@ -153,7 +153,7 @@ $help = array(
 	),
 	array(
 		0 => 'What is the “Save” button for in topic posting?',
-		1 => 'This allows you to save passages to be completed and submitted at a later date. To reload a saved passage, visit the User Control Panel.'
+		1 => 'This allows you to save drafts to be completed and submitted at a later date. To reload a saved draft, visit the User Control Panel.'
 	),
 	array(
 		0 => 'Why does my post need to be approved?',
@@ -254,7 +254,7 @@ $help = array(
 	),
 	array(
 		0 => 'I keep getting unwanted private messages!',
-		1 => 'You can block a user from sending you private messages by using message rules within your User Control Panel. If you are receiving abusive private messages from a particular user, inform a board administrator; they have the power to prevent a user from sending private messages.'
+		1 => 'You can automatically delete private messages from a user by using message rules within your User Control Panel. If you are receiving abusive private messages from a particular user, report the messages to the moderators; they have the power to prevent a user from sending private messages.'
 	),
 	array(
 		0 => 'I have received a spamming or abusive email from someone on this board!',
-- 
cgit v1.2.1


From 7e769083bff06b91bd480fe682656b32fc59a06c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 26 Jun 2014 23:44:21 +0200
Subject: [ticket/12196] Fix typo in "referrer"

Referer is a typo in the HTTP RFC and should not be used in the UI

PHPBB3-12196
---
 phpBB/language/en/acp/board.php  | 4 ++--
 phpBB/language/en/acp/common.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 638e9907ac..d451bdd515 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -524,8 +524,8 @@ $lang = array_merge($lang, array(
 	'PASS_TYPE_SYMBOL'				=> 'Must contain symbols',
 	'REF_HOST'						=> 'Only validate host',
 	'REF_PATH'						=> 'Also validate path',
-	'REFERER_VALID'					=> 'Validate Referer',
-	'REFERER_VALID_EXPLAIN'			=> 'If enabled, the referer of POST requests will be checked against the host/script path settings. This may cause issues with boards using several domains and or external logins.',
+	'REFERRER_VALID'				=> 'Validate Referrer',
+	'REFERRER_VALID_EXPLAIN'		=> 'If enabled, the referrer of POST requests will be checked against the host/script path settings. This may cause issues with boards using several domains and or external logins.',
 	'TPL_ALLOW_PHP'					=> 'Allow php in templates',
 	'TPL_ALLOW_PHP_EXPLAIN'			=> 'If this option is enabled, <code>PHP</code> and <code>INCLUDEPHP</code> statements will be recognised and parsed in templates.',
 ));
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 8470014161..b374e39367 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -702,7 +702,7 @@ $lang = array_merge($lang, array(
 	'LOG_REASON_REMOVED'	=> '<strong>Removed report/denial reason</strong><br />» %s',
 	'LOG_REASON_UPDATED'	=> '<strong>Updated report/denial reason</strong><br />» %s',
 
-	'LOG_REFERER_INVALID'		=> '<strong>Referer validation failed</strong><br />»Referer was “<em>%1$s</em>”. The request was rejected and the session killed.',
+	'LOG_REFERER_INVALID'		=> '<strong>Referrer validation failed</strong><br />»Referrer was “<em>%1$s</em>”. The request was rejected and the session killed.',
 	'LOG_RESET_DATE'			=> '<strong>Board start date reset</strong>',
 	'LOG_RESET_ONLINE'			=> '<strong>Most users online reset</strong>',
 	'LOG_RESYNC_FILES_STATS'	=> '<strong>File statistics resynchronised</strong>',
-- 
cgit v1.2.1


From 59c0a31fc45ede73f0fe99befb735f7e6aa3065f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 27 Jun 2014 10:18:36 +0200
Subject: [ticket/12645] Replace support links in SUPPORT_BODY with 3.1 links

PHPBB3-12645
---
 phpBB/language/en/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 2b7f377f5b..ba6d605783 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -345,7 +345,7 @@ $lang = array_merge($lang, array(
 	'SUB_LICENSE'				=> 'License',
 	'SUB_SUPPORT'				=> 'Support',
 	'SUCCESSFUL_CONNECT'		=> 'Successful connection',
-	'SUPPORT_BODY'				=> 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="https://www.phpbb.com/community/viewforum.php?f=65">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>MODs / Styles</h2><p>For issues relating to MODs, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=81">Modifications Forum</a>.<br />For issues relating to styles, templates and themes, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=80">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="https://www.phpbb.com/community/viewtopic.php?f=14&amp;t=571070">The phpBB Welcome Package</a><br /><a href="https://www.phpbb.com/support/">Support Section</a><br /><a href="https://www.phpbb.com/support/documentation/3.0/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, why not <a href="https://www.phpbb.com/support/">subscribe to our mailing list</a>?<br /><br />',
+	'SUPPORT_BODY'				=> 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="https://www.phpbb.com/community/viewforum.php?f=486">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>Extensions / Styles</h2><p>For issues relating to Extensions, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=451">Extensions Forum</a>.<br />For issues relating to styles, templates and themes, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=471">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="https://www.phpbb.com/community/viewtopic.php?f=14&amp;t=571070">The phpBB Welcome Package</a><br /><a href="https://www.phpbb.com/support/">Support Section</a><br /><a href="https://www.phpbb.com/support/documentation/3.1/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, why not <a href="https://www.phpbb.com/support/">subscribe to our mailing list</a>?<br /><br />',
 	'SYNC_FORUMS'				=> 'Starting to synchronise forums',
 	'SYNC_POST_COUNT'			=> 'Synchronising post_counts',
 	'SYNC_POST_COUNT_ID'		=> 'Synchronising post_counts from <var>entry</var> %1$s to %2$s.',
-- 
cgit v1.2.1


From dbefb74abec3988629a7a3665cd1bd752ab9ede6 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sat, 5 Jul 2014 23:57:57 +0200
Subject: [ticket/12807] Adds missing language variables
 language/en/acp/forums.php

PHPBB3-12807
---
 phpBB/language/en/acp/forums.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index b4f0f060e9..e8c85ae8a8 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -44,6 +44,8 @@ $lang = array_merge($lang, array(
 	'AUTO_PRUNE_FREQ_EXPLAIN'	=> 'Time in days between pruning events.',
 	'AUTO_PRUNE_VIEWED'			=> 'Auto-prune post viewed age',
 	'AUTO_PRUNE_VIEWED_EXPLAIN'	=> 'Number of days since topic was viewed after which topic is removed.',
+	'AUTO_PRUNE_SHADOW_FREQ'	=> 'Auto-prune shadow topics frequency',
+	'AUTO_PRUNE_SHADOW_DAYS'	=> 'Auto-prune shadow topics age',
 
 	'CONTINUE'						=> 'Continue',
 	'COPY_PERMISSIONS'				=> 'Copy permissions from',
-- 
cgit v1.2.1


From addcbb1585247a6890720250385427b5107dea2e Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sun, 6 Jul 2014 00:28:25 +0200
Subject: [ticket/12807] New variables for _EXPLAIN

PHPBB3-12807
---
 phpBB/language/en/acp/forums.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index e8c85ae8a8..541d05c255 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -46,6 +46,8 @@ $lang = array_merge($lang, array(
 	'AUTO_PRUNE_VIEWED_EXPLAIN'	=> 'Number of days since topic was viewed after which topic is removed.',
 	'AUTO_PRUNE_SHADOW_FREQ'	=> 'Auto-prune shadow topics frequency',
 	'AUTO_PRUNE_SHADOW_DAYS'	=> 'Auto-prune shadow topics age',
+	'AUTO_PRUNE_SHADOW_DAYS_EXPLAIN'	=> 'Number of days after which shadow topic is removed.',
+	'AUTO_PRUNE_SHADOW_FREQ_EXPLAIN'	=> 'Time in days between pruning events.',
 
 	'CONTINUE'						=> 'Continue',
 	'COPY_PERMISSIONS'				=> 'Copy permissions from',
-- 
cgit v1.2.1


From e3e0c79b7a8024ae25816b823c3ba5de19af62f2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 25 Jun 2014 21:48:24 +0200
Subject: [ticket/12515] Remove check for PostgreSQL 8.3+

PHPBB3-12515
---
 phpBB/language/en/acp/search.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index f5bec89c2f..564d9dd04c 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -60,7 +60,6 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'	=> 'Words with no more than this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 
 	'FULLTEXT_POSTGRES_INCOMPATIBLE_DATABASE'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL.',
-	'FULLTEXT_POSTGRES_TS_NOT_USABLE'	=> 'The PostgreSQL fulltext backend can only be used with PostgreSQL 8.3 and above.',
 	'FULLTEXT_POSTGRES_TOTAL_POSTS'			=> 'Total number of indexed posts',
 	'FULLTEXT_POSTGRES_VERSION_CHECK'		=> 'PostgreSQL version',
 	'FULLTEXT_POSTGRES_TS_NAME'				=> 'Text search Configuration Profile:',
-- 
cgit v1.2.1


From 4679fa543b40ae2d37f99db1907cfee0381995b5 Mon Sep 17 00:00:00 2001
From: n-aleha <nick_aleha@myway.com>
Date: Tue, 8 Jul 2014 01:13:59 +0300
Subject: [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong
 indentation

'NOTIFICATION_REPORT_CLOSED' has 3 spaces before the first tab indentation
in language/en/common.php.

PHPBB3-12768
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index dbef16c5f2..7cca760e34 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -462,7 +462,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_REASON'				=> '<em>Reason:</em> %1$s.',
 	'NOTIFICATION_REPORT_PM'			=> '<strong>Private Message reported</strong> by %1$s:',
 	'NOTIFICATION_REPORT_POST'			=> '<strong>Post reported</strong> by %1$s:',
-	'NOTIFICATION_REPORT_CLOSED'   		=> '<strong>Report closed</strong> by %1$s for:',
+	'NOTIFICATION_REPORT_CLOSED'		=> '<strong>Report closed</strong> by %1$s for:',
 	'NOTIFICATION_TOPIC'				=> '<strong>New topic</strong> by %1$s:',
 	'NOTIFICATION_TOPIC_APPROVED'		=> '<strong>Topic approved</strong>:',
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> '<strong>Topic disapproved</strong>:',
-- 
cgit v1.2.1


From f2745d1e574af528270869994f2323db68dc8466 Mon Sep 17 00:00:00 2001
From: n-aleha <nick_aleha@myway.com>
Date: Tue, 8 Jul 2014 02:09:10 +0300
Subject: [ticket/12768] More fixes in language files

More spaces converted to tabs for identation in language files.

PHPBB3-12768
---
 phpBB/language/en/acp/common.php | 4 ++--
 phpBB/language/en/common.php     | 2 +-
 phpBB/language/en/install.php    | 4 ++--
 phpBB/language/en/memberlist.php | 2 +-
 phpBB/language/en/ucp.php        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index b374e39367..61c718195e 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -247,7 +247,7 @@ $lang = array_merge($lang, array(
 	'DOWNLOAD_AS'				=> 'Download as',
 	'DOWNLOAD_STORE'			=> 'Download or store file',
 	'DOWNLOAD_STORE_EXPLAIN'	=> 'You may directly download the file or save it in your <samp>store/</samp> folder.',
-	'DOWNLOADS'          		=> 'Downloads',
+	'DOWNLOADS'					=> 'Downloads',
 
 	'EDIT'					=> 'Edit',
 	'ENABLE'				=> 'Enable',
@@ -310,7 +310,7 @@ $lang = array_merge($lang, array(
 
 	'TASKS_NOT_READY'			=> 'Not ready tasks:',
 	'TASKS_READY'			=> 'Ready tasks:',
-	'TOTAL_SIZE'      		=> 'Total size',
+	'TOTAL_SIZE'			=> 'Total size',
 
 	'UCP'					=> 'User Control Panel',
 	'USERNAMES_EXPLAIN'		=> 'Place each username on a separate line.',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 7cca760e34..5af3ad4fbc 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -299,7 +299,7 @@ $lang = array_merge($lang, array(
 		1	=> 'There is %d guest user online',
 		2	=> 'There are %d guest users online',
 	),
-	'GUEST_USERS_TOTAL'			=>  array(
+	'GUEST_USERS_TOTAL'			=> array(
 		1	=> '%d guest',
 		2	=> '%d guests',
 	),
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 65448e3299..a2b27f0a60 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -291,8 +291,8 @@ $lang = array_merge($lang, array(
 	'PCRE_UTF_SUPPORT_EXPLAIN'		=> 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.',
 	'PHP_GETIMAGESIZE_SUPPORT'			=> 'PHP function getimagesize() is available',
 	'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN'	=> '<strong>Required</strong> - In order for phpBB to function correctly, the getimagesize function needs to be available.',
-	'PHP_JSON_SUPPORT'        		=> 'PHP JSON support',
-	'PHP_JSON_SUPPORT_EXPLAIN'    	=> '<strong>Required</strong> - In order for phpBB to function correctly, the PHP JSON extension needs to be available.',
+	'PHP_JSON_SUPPORT'				=> 'PHP JSON support',
+	'PHP_JSON_SUPPORT_EXPLAIN'		=> '<strong>Required</strong> - In order for phpBB to function correctly, the PHP JSON extension needs to be available.',
 	'PHP_OPTIONAL_MODULE'			=> 'Optional modules',
 	'PHP_OPTIONAL_MODULE_EXPLAIN'	=> '<strong>Optional</strong> - These modules or applications are optional. However, if they are available they will enable extra features.',
 	'PHP_SUPPORTED_DB'				=> 'Supported databases',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index c1bb25e7fb..1a05975892 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -146,6 +146,6 @@ $lang = array_merge($lang, array(
 	'VIEW_FACEBOOK_PROFILE'	=> 'View Facebook Profile',
 	'VIEW_SKYPE_PROFILE'	=> 'View Skype Profile',
 	'VIEW_TWITTER_PROFILE'	=> 'View Twitter Profile',
-	'VIEW_YOUTUBE_CHANNEL'  => 'View YouTube Channel',
+	'VIEW_YOUTUBE_CHANNEL'	=> 'View YouTube Channel',
 	'VIEW_GOOGLEPLUS_PROFILE' => 'View Google+ Profile',
 ));
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index c4328aa3a6..d464a9219e 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -328,12 +328,12 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TYPE_BOOKMARK'						=> 'Someone replies to a topic you have bookmarked',
 	'NOTIFICATION_TYPE_GROUP_REQUEST'					=> 'Someone requests to join a group you lead',
 	'NOTIFICATION_TYPE_IN_MODERATION_QUEUE'				=> 'A post or topic needs approval',
-	'NOTIFICATION_TYPE_MODERATION_QUEUE'   				=> 'Your topics/posts are approved or disapproved by a moderator',
+	'NOTIFICATION_TYPE_MODERATION_QUEUE'				=> 'Your topics/posts are approved or disapproved by a moderator',
 	'NOTIFICATION_TYPE_PM'								=> 'Someone sends you a private message',
 	'NOTIFICATION_TYPE_POST'							=> 'Someone replies to a topic to which you are subscribed',
 	'NOTIFICATION_TYPE_QUOTE'							=> 'Someone quotes you in a post',
 	'NOTIFICATION_TYPE_REPORT'							=> 'Someone reports a post',
-	'NOTIFICATION_TYPE_TOPIC'				   			=> 'Someone creates a topic in a forum to which you are subscribed',
+	'NOTIFICATION_TYPE_TOPIC'							=> 'Someone creates a topic in a forum to which you are subscribed',
 	'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER'				=> 'Newly registered user requiring activation',
 
 	'NOTIFY_METHOD'					=> 'Notification method',
-- 
cgit v1.2.1


From 519e64205a50b15efa8589901c87f5b21448993a Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 13 Jul 2014 15:44:58 +0200
Subject: [ticket/12847] Allow the extensions to say if they can be enabled

PHPBB3-12847
---
 phpBB/language/en/acp/extensions.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 6ec722bb78..28cdc8829d 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -42,6 +42,7 @@ $lang = array_merge($lang, array(
 	'EXTENSION_INVALID_LIST'	=> 'The “%s” extension is not valid.<br />%s<br /><br />',
 	'EXTENSION_NOT_AVAILABLE'	=> 'The selected extension is not available for this board, please verify your phpBB and PHP versions are allowed (see the details page).',
 	'EXTENSION_DIR_INVALID'		=> 'The selected extension has an invalid directory structure and cannot be enabled.',
+	'EXTENSION_NOT_ENABLEABLE'	=> 'The selected extension cannot be enabled, please verify the extension’s requirements.',
 
 	'DETAILS'				=> 'Details',
 
-- 
cgit v1.2.1


From 2ec50c0ff15837489f36b014a2e36470b1672508 Mon Sep 17 00:00:00 2001
From: Carlo <carlo@phpbbitalia.net>
Date: Tue, 15 Jul 2014 00:38:07 +0200
Subject: [ticket/12685] Add --safe-mode

PHPBB3-12685
---
 phpBB/language/en/acp/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 61c718195e..0c3df5862e 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -230,6 +230,7 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'Name of the task to be run',
 
 	'CLI_DESCRIPTION_OPTION_SHELL'			=> 'Launch the shell.',
+	'CLI_DESCRIPTION_OPTION_SAFE_MODE'		=> 'Run in Safe Mode (without extensions).',
 
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
-- 
cgit v1.2.1


From 09e5896cae23534532d9f44fefc43f4b3f846f1c Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 16 Jul 2014 10:39:40 +0200
Subject: [ticket/12837] Detect "viewing contact admin page" on viewonline

PHPBB3-12837
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5af3ad4fbc..a58aec43cd 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -821,6 +821,7 @@ $lang = array_merge($lang, array(
 		1	=> 'Viewed %d time',
 		2	=> 'Viewed %d times',
 	),
+	'VIEWING_CONTACT_ADMIN'		=> 'Viewing contact page',
 	'VIEWING_FAQ'				=> 'Viewing FAQ',
 	'VIEWING_MEMBERS'			=> 'Viewing member details',
 	'VIEWING_ONLINE'			=> 'Viewing who is online',
-- 
cgit v1.2.1


From f784510494b3958f997d7777aac3bc6378809432 Mon Sep 17 00:00:00 2001
From: Carlo <carlo@phpbbitalia.net>
Date: Thu, 17 Jul 2014 01:16:04 +0200
Subject: [ticket/12663] Extract CLI language string into their own file

PHPBB3-12663
---
 phpBB/language/en/acp/cli.php    | 44 ++++++++++++++++++++++++++++++++++++++++
 phpBB/language/en/acp/common.php |  7 -------
 2 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 phpBB/language/en/acp/cli.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/cli.php b/phpBB/language/en/acp/cli.php
new file mode 100644
index 0000000000..e9eb26b154
--- /dev/null
+++ b/phpBB/language/en/acp/cli.php
@@ -0,0 +1,44 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* 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_merge($lang, array(
+	'CLI_DESCRIPTION_CRON_LIST'				=> 'Prints a list of ready and unready cron jobs.',
+	'CLI_DESCRIPTION_CRON_RUN'				=> 'Runs all ready cron tasks.',
+	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'Name of the task to be run',
+
+	'CLI_DESCRIPTION_OPTION_SHELL'			=> 'Launch the shell.',
+	'CLI_DESCRIPTION_OPTION_SAFE_MODE'		=> 'Run in Safe Mode (without extensions).',
+));
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 0c3df5862e..91fc1215fc 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -225,13 +225,6 @@ $lang = array_merge($lang, array(
 
 	'BACK'					=> 'Back',
 
-	'CLI_DESCRIPTION_CRON_LIST'				=> 'Prints a list of ready and unready cron jobs.',
-	'CLI_DESCRIPTION_CRON_RUN'				=> 'Runs all ready cron tasks.',
-	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'Name of the task to be run',
-
-	'CLI_DESCRIPTION_OPTION_SHELL'			=> 'Launch the shell.',
-	'CLI_DESCRIPTION_OPTION_SAFE_MODE'		=> 'Run in Safe Mode (without extensions).',
-
 	'COLOUR_SWATCH'			=> 'Web-safe colour swatch',
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
 	'CRON_LOCK_ERROR'		=> 'Could not obtain cron lock.',
-- 
cgit v1.2.1


From e78a6046ca8f90e11527590ecd9c4ce0c8ecbe18 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 17 Jul 2014 16:54:42 +0200
Subject: [ticket/12663] Have cli.php language file at top level; unrelated to
 ACP.

PHPBB3-12663
---
 phpBB/language/en/acp/cli.php | 44 -------------------------------------------
 phpBB/language/en/cli.php     | 44 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 phpBB/language/en/acp/cli.php
 create mode 100644 phpBB/language/en/cli.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/cli.php b/phpBB/language/en/acp/cli.php
deleted file mode 100644
index e9eb26b154..0000000000
--- a/phpBB/language/en/acp/cli.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* 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_merge($lang, array(
-	'CLI_DESCRIPTION_CRON_LIST'				=> 'Prints a list of ready and unready cron jobs.',
-	'CLI_DESCRIPTION_CRON_RUN'				=> 'Runs all ready cron tasks.',
-	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'Name of the task to be run',
-
-	'CLI_DESCRIPTION_OPTION_SHELL'			=> 'Launch the shell.',
-	'CLI_DESCRIPTION_OPTION_SAFE_MODE'		=> 'Run in Safe Mode (without extensions).',
-));
diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
new file mode 100644
index 0000000000..e9eb26b154
--- /dev/null
+++ b/phpBB/language/en/cli.php
@@ -0,0 +1,44 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* 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_merge($lang, array(
+	'CLI_DESCRIPTION_CRON_LIST'				=> 'Prints a list of ready and unready cron jobs.',
+	'CLI_DESCRIPTION_CRON_RUN'				=> 'Runs all ready cron tasks.',
+	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'Name of the task to be run',
+
+	'CLI_DESCRIPTION_OPTION_SHELL'			=> 'Launch the shell.',
+	'CLI_DESCRIPTION_OPTION_SAFE_MODE'		=> 'Run in Safe Mode (without extensions).',
+));
-- 
cgit v1.2.1


From 8a5ec8d9d157009b708bf7b0a4086c5dcf7e5eb4 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Fri, 18 Jul 2014 00:28:24 +0200
Subject: [ticket/12748] Fix typo in terms of use

PHPBB3-12748
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index d464a9219e..d692828bd7 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -40,7 +40,7 @@ if (empty($lang) || !is_array($lang))
 $lang = array_merge($lang, array(
 	'TERMS_OF_USE_CONTENT'	=> 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended.<br />
 	<br />
-	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>” (hereinafter “GPL”) and can be downloaded from <a href="https://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet based discussions, the phpBB Limited are not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="https://www.phpbb.com/">https://www.phpbb.com/</a>.<br />
+	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) which is a bulletin board solution released under the “<a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>” (hereinafter “GPL”) and can be downloaded from <a href="https://www.phpbb.com/">www.phpbb.com</a>. The phpBB software only facilitates internet based discussions; phpBB Limited is not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: <a href="https://www.phpbb.com/">https://www.phpbb.com/</a>.<br />
 	<br />
 	You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised.
 	',
-- 
cgit v1.2.1


From d16ce219269ce5da0b737582c9aafea6b220b8b2 Mon Sep 17 00:00:00 2001
From: n-aleha <nick_aleha@myway.com>
Date: Mon, 14 Jul 2014 23:03:05 +0300
Subject: [ticket/12851] Fix the Font colour button title

PHPBB3-12851
---
 phpBB/language/en/posting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 31d49e8bdf..2cd6ec59cc 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -60,7 +60,7 @@ $lang = array_merge($lang, array(
 	'BBCODE_O_HELP'				=> 'Ordered list: e.g. [list=1][*]First point[/list] or [list=a][*]Point a[/list]',
 	'BBCODE_P_HELP'				=> 'Insert image: [img]http://image_url[/img]',
 	'BBCODE_Q_HELP'				=> 'Quote text: [quote]text[/quote]',
-	'BBCODE_S_HELP'				=> 'Font colour: [color=red]text[/color]  Tip: you can also use color=#FF0000',
+	'BBCODE_S_HELP'				=> 'Font colour: [color=red]text[/color] or [color=#FF0000]text[/color]',
 	'BBCODE_U_HELP'				=> 'Underline text: [u]text[/u]',
 	'BBCODE_W_HELP'				=> 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]',
 	'BBCODE_Y_HELP'				=> 'List: Add list element',
-- 
cgit v1.2.1


From 4092b63be39453f9a7ce4f985217099ab10aae90 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Wed, 23 Jul 2014 00:35:09 +0530
Subject: [ticket/12656] Use lang keys for CLI command descriptions

PHPBB3-12656
---
 phpBB/language/en/cli.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index e9eb26b154..ea6952d5e4 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -35,10 +35,21 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 $lang = array_merge($lang, array(
-	'CLI_DESCRIPTION_CRON_LIST'				=> 'Prints a list of ready and unready cron jobs.',
-	'CLI_DESCRIPTION_CRON_RUN'				=> 'Runs all ready cron tasks.',
-	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'	=> 'Name of the task to be run',
-
-	'CLI_DESCRIPTION_OPTION_SHELL'			=> 'Launch the shell.',
-	'CLI_DESCRIPTION_OPTION_SAFE_MODE'		=> 'Run in Safe Mode (without extensions).',
+	'CLI_DESCRIPTION_CRON_LIST'					=> 'Prints a list of ready and unready cron jobs.',
+	'CLI_DESCRIPTION_CRON_RUN'					=> 'Runs all ready cron tasks.',
+	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'		=> 'Name of the task to be run',
+	'CLI_DESCRIPTION_DB_MIGRATE'				=> 'Updates the database by applying migrations.',
+	'CLI_DESCRIPTION_DELETE_CONFIG'				=> 'Deletes a configuration option',
+	'CLI_DESCRIPTION_DISABLE_EXTENSION'			=> 'Disables the specified extension.',
+	'CLI_DESCRIPTION_ENABLE_EXTENSION'			=> 'Enables the specified extension.',
+	'CLI_DESCRIPTION_FIND_MIGRATIONS'			=> 'Finds migrations that are not depended on.',
+	'CLI_DESCRIPTION_GET_CONFIG'				=> 'Gets a configuration option\'s value',
+	'CLI_DESCRIPTION_INCREMENT_CONFIG'			=> 'Increments a configuration option\'s value',
+	'CLI_DESCRIPTION_LIST_EXTENSIONS'			=> 'Lists all extensions in the database and on the filesystem.',
+	'CLI_DESCRIPTION_OPTION_SAFE_MODE'			=> 'Run in Safe Mode (without extensions).',
+	'CLI_DESCRIPTION_OPTION_SHELL'				=> 'Launch the shell.',
+	'CLI_DESCRIPTION_PURGE_EXTENSION'			=> 'Purges the specified extension.',
+	'CLI_DESCRIPTION_RECALCULATE_EMAIL_HASH'	=> 'Recalculates the user_email_hash column of the users table.',
+	'CLI_DESCRIPTION_SET_ATOMIC_CONFIG'			=> 'Sets a configuration option\'s value only if the old matches the current value',
+	'CLI_DESCRIPTION_SET_CONFIG'				=> 'Sets a configuration option\'s value'
 ));
-- 
cgit v1.2.1


From c81438e1f85633dd770fcddd8e332b278338732f Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Wed, 23 Jul 2014 01:23:44 +0530
Subject: [ticket/12656] Use lang keys for all CLI strings

PHPBB3-12656
---
 phpBB/language/en/cli.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index ea6952d5e4..0c6ee1f1f0 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -35,6 +35,18 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 $lang = array_merge($lang, array(
+	'CLI_CONFIG_CANNOT_CACHED'			=> 'Set this option if the configuration option changes too frequently to be efficiently cached.',
+	'CLI_CONFIG_CURRENT'				=> 'Current configuration value, use 0 and 1 to specify boolean values',
+	'CLI_CONFIG_DELETE_SUCCESS'			=> 'Successfully deleted config %s.',
+	'CLI_CONFIG_NEW'					=> 'New configuration value, use 0 and 1 to specify boolean values',
+	'CLI_CONFIG_NOT_EXISTS'				=> 'Config %s does not exist',
+	'CLI_CONFIG_OPTION_NAME'			=> 'The configuration option\'s name',
+	'CLI_CONFIG_PRINT_WITHOUT_NEWLINE'	=> 'Set this option if the value should be printed without a new line at the end.',
+	'CLI_CONFIG_INCREMENT_BY'			=> 'Amount to increment by',
+	'CLI_CONFIG_INCREMENT_SUCCESS'		=> 'Successfully incremented config %s',
+	'CLI_CONFIG_SET_FAILURE'			=> 'Could not set config %s',
+	'CLI_CONFIG_SET_SUCCESS'			=> 'Successfully set config %s',
+
 	'CLI_DESCRIPTION_CRON_LIST'					=> 'Prints a list of ready and unready cron jobs.',
 	'CLI_DESCRIPTION_CRON_RUN'					=> 'Runs all ready cron tasks.',
 	'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1'		=> 'Name of the task to be run',
@@ -51,5 +63,16 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_PURGE_EXTENSION'			=> 'Purges the specified extension.',
 	'CLI_DESCRIPTION_RECALCULATE_EMAIL_HASH'	=> 'Recalculates the user_email_hash column of the users table.',
 	'CLI_DESCRIPTION_SET_ATOMIC_CONFIG'			=> 'Sets a configuration option\'s value only if the old matches the current value',
-	'CLI_DESCRIPTION_SET_CONFIG'				=> 'Sets a configuration option\'s value'
+	'CLI_DESCRIPTION_SET_CONFIG'				=> 'Sets a configuration option\'s value',
+
+	'CLI_EXTENSION_DISABLE_FAILURE'		=> 'Could not disable extension %s',
+	'CLI_EXTENSION_DISABLE_SUCCESS'		=> 'Successfully disabled extension %s',
+	'CLI_EXTENSION_ENABLE_FAILURE'		=> 'Could not enable extension %s',
+	'CLI_EXTENSION_ENABLE_SUCCESS'		=> 'Successfully enabled extension %s',
+	'CLI_EXTENSION_NAME'				=> 'Name of the extension',
+	'CLI_EXTENSION_PURGE_FAILURE'		=> 'Could not purge extension %s',
+	'CLI_EXTENSION_PURGE_SUCCESS'		=> 'Successfully purge extension %s',
+	'CLI_EXTENSION_NOT_FOUND'			=> 'No extensions were found.'
+
+	'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS'	=> 'Successfully recalculated all email hashes.'
 ));
-- 
cgit v1.2.1


From 91b0e75cc7af68e1dcd72b637f9b99d8f139908d Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Thu, 24 Jul 2014 01:08:31 +0530
Subject: =?UTF-8?q?[ticket/12656]=20Use=20utf8=20=E2=80=99=20instead=20of?=
 =?UTF-8?q?=20escaping=20'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PHPBB3-12656
---
 phpBB/language/en/cli.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index 0c6ee1f1f0..cb8cbb55a8 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -40,7 +40,7 @@ $lang = array_merge($lang, array(
 	'CLI_CONFIG_DELETE_SUCCESS'			=> 'Successfully deleted config %s.',
 	'CLI_CONFIG_NEW'					=> 'New configuration value, use 0 and 1 to specify boolean values',
 	'CLI_CONFIG_NOT_EXISTS'				=> 'Config %s does not exist',
-	'CLI_CONFIG_OPTION_NAME'			=> 'The configuration option\'s name',
+	'CLI_CONFIG_OPTION_NAME'			=> 'The configuration option’s name',
 	'CLI_CONFIG_PRINT_WITHOUT_NEWLINE'	=> 'Set this option if the value should be printed without a new line at the end.',
 	'CLI_CONFIG_INCREMENT_BY'			=> 'Amount to increment by',
 	'CLI_CONFIG_INCREMENT_SUCCESS'		=> 'Successfully incremented config %s',
@@ -55,15 +55,15 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_DISABLE_EXTENSION'			=> 'Disables the specified extension.',
 	'CLI_DESCRIPTION_ENABLE_EXTENSION'			=> 'Enables the specified extension.',
 	'CLI_DESCRIPTION_FIND_MIGRATIONS'			=> 'Finds migrations that are not depended on.',
-	'CLI_DESCRIPTION_GET_CONFIG'				=> 'Gets a configuration option\'s value',
-	'CLI_DESCRIPTION_INCREMENT_CONFIG'			=> 'Increments a configuration option\'s value',
+	'CLI_DESCRIPTION_GET_CONFIG'				=> 'Gets a configuration option’s value',
+	'CLI_DESCRIPTION_INCREMENT_CONFIG'			=> 'Increments a configuration option’s value',
 	'CLI_DESCRIPTION_LIST_EXTENSIONS'			=> 'Lists all extensions in the database and on the filesystem.',
 	'CLI_DESCRIPTION_OPTION_SAFE_MODE'			=> 'Run in Safe Mode (without extensions).',
 	'CLI_DESCRIPTION_OPTION_SHELL'				=> 'Launch the shell.',
 	'CLI_DESCRIPTION_PURGE_EXTENSION'			=> 'Purges the specified extension.',
 	'CLI_DESCRIPTION_RECALCULATE_EMAIL_HASH'	=> 'Recalculates the user_email_hash column of the users table.',
-	'CLI_DESCRIPTION_SET_ATOMIC_CONFIG'			=> 'Sets a configuration option\'s value only if the old matches the current value',
-	'CLI_DESCRIPTION_SET_CONFIG'				=> 'Sets a configuration option\'s value',
+	'CLI_DESCRIPTION_SET_ATOMIC_CONFIG'			=> 'Sets a configuration option’s value only if the old matches the current value',
+	'CLI_DESCRIPTION_SET_CONFIG'				=> 'Sets a configuration option’s value',
 
 	'CLI_EXTENSION_DISABLE_FAILURE'		=> 'Could not disable extension %s',
 	'CLI_EXTENSION_DISABLE_SUCCESS'		=> 'Successfully disabled extension %s',
-- 
cgit v1.2.1


From ed9fb450de8da791ab7928a04af7c952614c5b14 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Thu, 24 Jul 2014 18:56:52 +0530
Subject: [ticket/12656] Fix syntax in language file

PHPBB3-12656
---
 phpBB/language/en/cli.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index cb8cbb55a8..d9eede9881 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -72,7 +72,7 @@ $lang = array_merge($lang, array(
 	'CLI_EXTENSION_NAME'				=> 'Name of the extension',
 	'CLI_EXTENSION_PURGE_FAILURE'		=> 'Could not purge extension %s',
 	'CLI_EXTENSION_PURGE_SUCCESS'		=> 'Successfully purge extension %s',
-	'CLI_EXTENSION_NOT_FOUND'			=> 'No extensions were found.'
+	'CLI_EXTENSION_NOT_FOUND'			=> 'No extensions were found.',
 
-	'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS'	=> 'Successfully recalculated all email hashes.'
+	'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS'	=> 'Successfully recalculated all email hashes.',
 ));
-- 
cgit v1.2.1


From 8a046743bc083f8ca26d70cc5a1b63bd47b92f57 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 27 Jul 2014 14:56:12 +0530
Subject: [ticket/12656] Fix typo for "purged extension"

PHPBB3-12656
---
 phpBB/language/en/cli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index d9eede9881..eb0f5bb357 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -71,7 +71,7 @@ $lang = array_merge($lang, array(
 	'CLI_EXTENSION_ENABLE_SUCCESS'		=> 'Successfully enabled extension %s',
 	'CLI_EXTENSION_NAME'				=> 'Name of the extension',
 	'CLI_EXTENSION_PURGE_FAILURE'		=> 'Could not purge extension %s',
-	'CLI_EXTENSION_PURGE_SUCCESS'		=> 'Successfully purge extension %s',
+	'CLI_EXTENSION_PURGE_SUCCESS'		=> 'Successfully purged extension %s',
 	'CLI_EXTENSION_NOT_FOUND'			=> 'No extensions were found.',
 
 	'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS'	=> 'Successfully recalculated all email hashes.',
-- 
cgit v1.2.1


From 4f23bb711ca457efba370d7ac67394e0db59b578 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 7 Aug 2014 12:21:46 +0200
Subject: [ticket/12822] Remove "None" option from avatar select boxes

This option is just used for deleting avatars for which we already have
a checkbox.

PHPBB3-12822
---
 phpBB/language/en/common.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a58aec43cd..13fc56e0a1 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -483,7 +483,6 @@ $lang = array_merge($lang, array(
 	'NO_AUTH_ADMIN_USER_DIFFER'	=> 'You are not able to re-authenticate as a different user.',
 	'NO_AUTH_OPERATION'			=> 'You do not have the necessary permissions to complete this operation.',
 	'NO_AVATARS'				=> 'No avatars currently available',
-	'NO_AVATAR_SELECTED'		=> 'You have not selected any avatar.',
 	'NO_CONNECT_TO_SMTP_HOST'	=> 'Could not connect to smtp host : %1$s : %2$s',
 	'NO_BIRTHDAYS'				=> 'No birthdays today',
 	'NO_EMAIL_MESSAGE'			=> 'Email message was blank.',
-- 
cgit v1.2.1


From e0c2013bb921f04f032744c3bc351c015c759d8d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 7 Aug 2014 17:19:08 +0200
Subject: [ticket/12822] Add method for deleting avatars and use confirm_box

The method will take care of the actual deletion process in the avatar manager.
Additionally, we'll be using a confirm box while deleting the avatar to prevent
users from accidentally deleting their avatars.

PHPBB3-12822
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 13fc56e0a1..f84ace9f51 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -167,6 +167,7 @@ $lang = array_merge($lang, array(
 	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as it appears. All letters are case insensitive.',
 	'CONFIRM_CODE_WRONG'	=> 'The confirmation code you entered was incorrect.',
 	'CONFIRM_OPERATION'		=> 'Are you sure you wish to carry out this operation?',
+	'CONFIRM_AVATAR_DELETE' => 'Are you sure you wish to delete this avatar?',
 	'CONGRATULATIONS'		=> 'Congratulations to',
 	'CONNECTION_FAILED'		=> 'Connection failed.',
 	'CONNECTION_SUCCESS'	=> 'Connection was successful!',
-- 
cgit v1.2.1


From 12caf2f03dfa3440e810ce59583567b9a45953ad Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 9 Aug 2014 12:01:09 +0200
Subject: [ticket/12938] Remove the 'Download all attachments' feature.

PHPBB3-12938
---
 phpBB/language/en/common.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a58aec43cd..4ce69e0b85 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -191,8 +191,6 @@ $lang = array_merge($lang, array(
 	'DISPLAY_MESSAGES'		=> 'Display messages from previous',
 	'DISPLAY_POSTS'			=> 'Display posts from previous',
 	'DISPLAY_TOPICS'		=> 'Display topics from previous',
-	'DOWNLOAD_ALL'			=> 'Download all',
-	'DOWNLOAD_ALL_ATTACHMENTS'	=> 'Download all attachments',
 	'DOWNLOADED'			=> 'Downloaded',
 	'DOWNLOADING_FILE'		=> 'Downloading file',
 	'DOWNLOAD_COUNTS'		=> array(
-- 
cgit v1.2.1


From 55260127bd91e53f8bb5bc78e6304468b5b0aba9 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 13 Aug 2014 15:22:34 +0200
Subject: [ticket/12961] Add link in anti-spam ACP page to titania

PHPBB3-12961
---
 phpBB/language/en/acp/board.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index d451bdd515..c4d250778a 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -298,6 +298,8 @@ $lang = array_merge($lang, array(
 // Visual Confirmation Settings
 $lang = array_merge($lang, array(
 	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a <em>CAPTCHA</em>, a test which is designed to be difficult for computers to solve.',
+	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the',
+	'ACP_VC_EXT_LINK'						=> 'phpBB.com anti-spam extensions database',
 	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
 	'CAPTCHA_UNAVAILABLE'					=> 'The plugin cannot be selected as its requirements are not met.',
 	'CAPTCHA_GD'							=> 'GD image',
-- 
cgit v1.2.1


From 73426d2d304537144c00ff84d6e38eba9d92e45a Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 14 Aug 2014 22:22:20 +0200
Subject: [ticket/12961] Refactor lang entry

PHPBB3-12961
---
 phpBB/language/en/acp/board.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index c4d250778a..4a51b8e5b9 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -298,8 +298,7 @@ $lang = array_merge($lang, array(
 // Visual Confirmation Settings
 $lang = array_merge($lang, array(
 	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a <em>CAPTCHA</em>, a test which is designed to be difficult for computers to solve.',
-	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the',
-	'ACP_VC_EXT_LINK'						=> 'phpBB.com anti-spam extensions database',
+	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the %sphpBB.com anti-spam extensions database%s.',
 	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
 	'CAPTCHA_UNAVAILABLE'					=> 'The plugin cannot be selected as its requirements are not met.',
 	'CAPTCHA_GD'							=> 'GD image',
-- 
cgit v1.2.1


From 45405a48a8914aca114db51eb97c0009be5d349f Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Fri, 15 Aug 2014 22:53:05 +0200
Subject: [ticket/12961] Move link to language file

PHPBB3-12961
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 4a51b8e5b9..40f9310457 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -298,7 +298,7 @@ $lang = array_merge($lang, array(
 // Visual Confirmation Settings
 $lang = array_merge($lang, array(
 	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a <em>CAPTCHA</em>, a test which is designed to be difficult for computers to solve.',
-	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the %sphpBB.com anti-spam extensions database%s.',
+	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the <a href="https://www.phpbb.com/go/anti-spam-ext" target="_blank" style="font-weight: bold;">phpBB.com anti-spam extensions database</a>.',
 	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
 	'CAPTCHA_UNAVAILABLE'					=> 'The plugin cannot be selected as its requirements are not met.',
 	'CAPTCHA_GD'							=> 'GD image',
-- 
cgit v1.2.1


From 923a818e377af474023909caf604f36c7f79cd6b Mon Sep 17 00:00:00 2001
From: Mario Skouat <forum@skouat.org>
Date: Thu, 21 Aug 2014 19:37:03 +0200
Subject: [ticket/13003] Add missing language keys

PHPBB3-13003
---
 phpBB/language/en/cli.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index eb0f5bb357..0e7dc39b95 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -73,6 +73,9 @@ $lang = array_merge($lang, array(
 	'CLI_EXTENSION_PURGE_FAILURE'		=> 'Could not purge extension %s',
 	'CLI_EXTENSION_PURGE_SUCCESS'		=> 'Successfully purged extension %s',
 	'CLI_EXTENSION_NOT_FOUND'			=> 'No extensions were found.',
+	'CLI_EXTENSIONS_AVAILABLE'			=> 'Available',
+	'CLI_EXTENSIONS_DISABLED'			=> 'Disabled',
+	'CLI_EXTENSIONS_ENABLED'			=> 'Enabled',
 
 	'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS'	=> 'Successfully recalculated all email hashes.',
 ));
-- 
cgit v1.2.1


From ca55f22c731fd56fbadd49f7672f8e04a1198b0d Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 21 Aug 2014 20:05:55 +0200
Subject: [ticket/12961] Add additional link to the KB

PHPBB3-12961
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 40f9310457..338947c123 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -298,7 +298,7 @@ $lang = array_merge($lang, array(
 // Visual Confirmation Settings
 $lang = array_merge($lang, array(
 	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a <em>CAPTCHA</em>, a test which is designed to be difficult for computers to solve.',
-	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the <a href="https://www.phpbb.com/go/anti-spam-ext" target="_blank" style="font-weight: bold;">phpBB.com anti-spam extensions database</a>.',
+	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the <a href="https://www.phpbb.com/go/anti-spam-ext" target="_blank" style="font-weight: bold;">phpBB.com anti-spam extensions database</a>. For more information on preventing spam on your board, visit the <a href="https://www.phpbb.com/go/anti-spam" target="_blank" style="font-weight: bold;">phpBB.com knowledge base</a>.',
 	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
 	'CAPTCHA_UNAVAILABLE'					=> 'The plugin cannot be selected as its requirements are not met.',
 	'CAPTCHA_GD'							=> 'GD image',
-- 
cgit v1.2.1


From f22ee4f73abdd6706e0bbb0f0717801dd63db8cb Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Fri, 22 Aug 2014 15:23:35 +0200
Subject: [ticket/12961] Remove target="_blank" and switch to <strong>

PHPBB3-12961
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 338947c123..8db4782dfe 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -298,7 +298,7 @@ $lang = array_merge($lang, array(
 // Visual Confirmation Settings
 $lang = array_merge($lang, array(
 	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a <em>CAPTCHA</em>, a test which is designed to be difficult for computers to solve.',
-	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the <a href="https://www.phpbb.com/go/anti-spam-ext" target="_blank" style="font-weight: bold;">phpBB.com anti-spam extensions database</a>. For more information on preventing spam on your board, visit the <a href="https://www.phpbb.com/go/anti-spam" target="_blank" style="font-weight: bold;">phpBB.com knowledge base</a>.',
+	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the <a href="https://www.phpbb.com/go/anti-spam-ext"><strong>phpBB.com anti-spam extensions database</strong></a>. For more information on preventing spam on your board, visit the <a href="https://www.phpbb.com/go/anti-spam"><strong>.com knowledge base</strong></a>.',
 	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
 	'CAPTCHA_UNAVAILABLE'					=> 'The plugin cannot be selected as its requirements are not met.',
 	'CAPTCHA_GD'							=> 'GD image',
-- 
cgit v1.2.1


From 5eea1ca44e38b126b68d9b10840adff9b7852d62 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Sat, 23 Aug 2014 12:32:43 +0200
Subject: [ticket/12961] Fix missing phpBB.com

Don't know how that happened. Weird

PHPBB3-12961
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 8db4782dfe..ab6da0def5 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -298,7 +298,7 @@ $lang = array_merge($lang, array(
 // Visual Confirmation Settings
 $lang = array_merge($lang, array(
 	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a <em>CAPTCHA</em>, a test which is designed to be difficult for computers to solve.',
-	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the <a href="https://www.phpbb.com/go/anti-spam-ext"><strong>phpBB.com anti-spam extensions database</strong></a>. For more information on preventing spam on your board, visit the <a href="https://www.phpbb.com/go/anti-spam"><strong>.com knowledge base</strong></a>.',
+	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the <a href="https://www.phpbb.com/go/anti-spam-ext"><strong>phpBB.com anti-spam extensions database</strong></a>. For more information on preventing spam on your board, visit the <a href="https://www.phpbb.com/go/anti-spam"><strong>phpBB.com knowledge base</strong></a>.',
 	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
 	'CAPTCHA_UNAVAILABLE'					=> 'The plugin cannot be selected as its requirements are not met.',
 	'CAPTCHA_GD'							=> 'GD image',
-- 
cgit v1.2.1


From ab9cdcadfb65000631272079b27e6438807e8ae8 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Tue, 26 Aug 2014 12:45:54 +0200
Subject: [ticket/12961] Shorten ext-db link text

PHPBB3-12961
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index ab6da0def5..24cfe4556b 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -298,7 +298,7 @@ $lang = array_merge($lang, array(
 // Visual Confirmation Settings
 $lang = array_merge($lang, array(
 	'ACP_VC_SETTINGS_EXPLAIN'				=> 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a <em>CAPTCHA</em>, a test which is designed to be difficult for computers to solve.',
-	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the <a href="https://www.phpbb.com/go/anti-spam-ext"><strong>phpBB.com anti-spam extensions database</strong></a>. For more information on preventing spam on your board, visit the <a href="https://www.phpbb.com/go/anti-spam"><strong>phpBB.com knowledge base</strong></a>.',
+	'ACP_VC_EXT_GET_MORE'					=> 'For additional (and possibly better) anti-spam plugins, visit the <a href="https://www.phpbb.com/go/anti-spam-ext"><strong>phpBB.com Extensions Database</strong></a>. For more information on preventing spam on your board, visit the <a href="https://www.phpbb.com/go/anti-spam"><strong>phpBB.com Knowledge Base</strong></a>.',
 	'AVAILABLE_CAPTCHAS'					=> 'Available plugins',
 	'CAPTCHA_UNAVAILABLE'					=> 'The plugin cannot be selected as its requirements are not met.',
 	'CAPTCHA_GD'							=> 'GD image',
-- 
cgit v1.2.1


From b9cb3b9e3ed17c2cf8737767ce7d67ed966216b5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 5 Sep 2014 13:24:31 +0200
Subject: [ticket/12983] Correctly validate sorting options in the UCP

PHPBB3-12983
---
 phpBB/language/en/common.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 783faa8fad..c27086fd38 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -864,6 +864,10 @@ $lang = array_merge($lang, array(
 	'WRONG_DATA_COLOUR'			=> 'The colour value you entered is invalid.',
 	'WRONG_DATA_JABBER'			=> 'The name you entered is not a valid Jabber account name.',
 	'WRONG_DATA_LANG'			=> 'The language you specified is not valid.',
+	'WRONG_DATA_POST_SD'		=> 'The post sort direction you specified is not valid.',
+	'WRONG_DATA_POST_SK'		=> 'The post sort option you specified is not valid.',
+	'WRONG_DATA_TOPIC_SD'		=> 'The topic sort direction you specified is not valid.',
+	'WRONG_DATA_TOPIC_SK'		=> 'The topic sort option you specified is not valid.',
 	'WROTE'						=> 'wrote',
 
 	'YAHOO'				=> 'Yahoo Messenger',
-- 
cgit v1.2.1


From 4b4a673d98a6708f98b111ec8c30f66b1d8a0e41 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Mon, 8 Sep 2014 23:14:33 +0200
Subject: [ticket/13022] Language adjustments

PHPBB3-13022
---
 phpBB/language/en/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 7d5b400f82..ec5dd99eb8 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -86,7 +86,7 @@ $lang = array_merge($lang, array(
 	'RESULT_DAYS'			=> 'Limit results to previous',
 	'RESULT_SORT'			=> 'Sort results by',
 	'RETURN_FIRST'			=> 'Return first',
-	'RETURN_TO_SEARCH_ADV'	=> 'Return to advanced search',
+	'GO_TO_SEARCH_ADV'	=> 'Go to advanced search',
 
 	'SEARCHED_FOR'				=> 'Search term used',
 	'SEARCHED_TOPIC'			=> 'Searched topic',
-- 
cgit v1.2.1


From d9f36ae7e1e6bf6aeb69f2491234ce0903a6543d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 9 Sep 2014 21:28:01 +0200
Subject: [ticket/12976] Correctly use plurals for attachment count in UCP
 navigation

PHPBB3-12976
---
 phpBB/language/en/common.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index c27086fd38..83e1f4eaa1 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -518,6 +518,10 @@ $lang = array_merge($lang, array(
 	'NO_USER_SPECIFIED'			=> 'No username was specified.',
 
 	// Nullar/Singular/Plural language entry. The key numbers define the number range in which a certain grammatical expression is valid.
+	'NUM_ATTACHMENTS'		=> array(
+		1	=> '%d attachment',
+		2	=> '%d attachments',
+	),
 	'NUM_POSTS_IN_QUEUE'		=> array(
 		0			=> 'No posts in queue',		// 0
 		1			=> '1 post in queue',		// 1
-- 
cgit v1.2.1


From 8c11927b553717a8cd7d2afeb3e545ed54551c20 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 14 Sep 2014 10:39:25 -0700
Subject: [ticket/13019] Rename deletion reason label.

PHPBB3-13019
---
 phpBB/language/en/posting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 2cd6ec59cc..924395ed44 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -93,7 +93,7 @@ $lang = array_merge($lang, array(
 	'DELETE_POST_PERMANENTLY'	=> 'Permanently delete this post so it can not be recovered',
 	'DELETE_POSTS_CONFIRM'		=> 'Are you sure you want to delete these posts?',
 	'DELETE_POSTS_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete these posts?',
-	'DELETE_REASON'				=> 'Soft delete reason',
+	'DELETE_REASON'				=> 'Reason for deletion',
 	'DELETE_REASON_EXPLAIN'		=> 'The specified reason for deletion will be visible to moderators.',
 	'DELETE_POST_WARN'			=> 'Delete this post',
 	'DELETE_TOPIC_CONFIRM'		=> 'Are you sure you want to delete this topic?',
-- 
cgit v1.2.1


From 265c621c9ede226cf50140057c5184245d4bf779 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Mon, 14 Apr 2014 15:20:46 +0200
Subject: [ticket/12408] Add quick setting for "default guest style" to ACP

PHPBB3-12408
---
 phpBB/language/en/acp/board.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index d451bdd515..3008797a84 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -46,6 +46,9 @@ $lang = array_merge($lang, array(
 	'DEFAULT_DATE_FORMAT_EXPLAIN'	=> 'The date format is the same as the PHP <code>date</code> function.',
 	'DEFAULT_LANGUAGE'				=> 'Default language',
 	'DEFAULT_STYLE'					=> 'Default style',
+	'DEFAULT_STYLE_EXPLAIN'			=> 'The default board style for logged in users.',
+	'DEFAULT_GUEST_STYLE'			=> 'Default guest style',
+	'DEFAULT_GUEST_STYLE_EXPLAIN'	=> 'The default board style for guests.',
 	'DISABLE_BOARD'					=> 'Disable board',
 	'DISABLE_BOARD_EXPLAIN'			=> 'This will make the board unavailable to users who are neither administrators nor moderators. You can also enter a short (255 character) message to display if you wish.',
 	'DISPLAY_LAST_SUBJECT'			=> 'Display subject of last added post on forum list',
-- 
cgit v1.2.1


From aaddf41e5b105c6e1b57a5e75267db69576afdf6 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Sat, 24 May 2014 16:01:08 +0200
Subject: [ticket/12408] Changed lang vars, added fieldset and removed
 "default"

PHPBB3-12408
---
 phpBB/language/en/acp/board.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 3008797a84..07bf927936 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -41,18 +41,19 @@ $lang = array_merge($lang, array(
 	'ACP_BOARD_SETTINGS_EXPLAIN'	=> 'Here you can determine the basic operation of your board, give it a fitting name and description, and among other settings adjust the default values for timezone and language.',
 	'BOARD_INDEX_TEXT'				=> 'Board index text',
 	'BOARD_INDEX_TEXT_EXPLAIN'		=> 'This text is displayed as the board index in the board’s breadcrumbs. If not specified, it will default to “Board index”.',
+	'BOARD_STYLE'					=> 'Board style',
 	'CUSTOM_DATEFORMAT'				=> 'Custom…',
 	'DEFAULT_DATE_FORMAT'			=> 'Date format',
 	'DEFAULT_DATE_FORMAT_EXPLAIN'	=> 'The date format is the same as the PHP <code>date</code> function.',
 	'DEFAULT_LANGUAGE'				=> 'Default language',
 	'DEFAULT_STYLE'					=> 'Default style',
-	'DEFAULT_STYLE_EXPLAIN'			=> 'The default board style for logged in users.',
-	'DEFAULT_GUEST_STYLE'			=> 'Default guest style',
-	'DEFAULT_GUEST_STYLE_EXPLAIN'	=> 'The default board style for guests.',
+	'DEFAULT_STYLE_EXPLAIN'			=> 'The default style for new users.',
 	'DISABLE_BOARD'					=> 'Disable board',
 	'DISABLE_BOARD_EXPLAIN'			=> 'This will make the board unavailable to users who are neither administrators nor moderators. You can also enter a short (255 character) message to display if you wish.',
 	'DISPLAY_LAST_SUBJECT'			=> 'Display subject of last added post on forum list',
 	'DISPLAY_LAST_SUBJECT_EXPLAIN'	=> 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesn’t have read access are not shown.',
+	'GUEST_STYLE'					=> 'Guest style',
+	'GUEST_STYLE_EXPLAIN'			=> 'The board style for guests.',
 	'OVERRIDE_STYLE'				=> 'Override user style',
 	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
 	'SITE_DESC'						=> 'Site description',
-- 
cgit v1.2.1


From 5a780dfab1ba972bc116b4fdd4e8dfa186f9c74a Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Mon, 15 Sep 2014 14:49:56 +0200
Subject: [ticket/12408] Clarify the behavior of "override style"

PHPBB3-12408
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 07bf927936..2e4f89a6ae 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -55,7 +55,7 @@ $lang = array_merge($lang, array(
 	'GUEST_STYLE'					=> 'Guest style',
 	'GUEST_STYLE_EXPLAIN'			=> 'The board style for guests.',
 	'OVERRIDE_STYLE'				=> 'Override user style',
-	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
+	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s (and guest’s) style with the style as defined under "Default style".',
 	'SITE_DESC'						=> 'Site description',
 	'SITE_HOME_TEXT'				=> 'Main website text',
 	'SITE_HOME_TEXT_EXPLAIN'		=> 'This text will be displayed as a link to your website homepage in the board’s breadcrumbs. If not specified, it will default to “Home”.',
-- 
cgit v1.2.1


From 9a3aeb8a99e7edeb38b5791adf71cfd13059957b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 17 Sep 2014 15:54:00 +0200
Subject: [ticket/12858] Remove hardcoded language entries from timezone
 selects

PHPBB3-12858
---
 phpBB/language/en/common.php | 54 +++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 83e1f4eaa1..79d504a67d 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -937,32 +937,34 @@ $lang = array_merge($lang, array(
 	// Timezones can be translated. We use this for the Etc/GMT timezones here,
 	// because they are named invers to their offset.
 	'timezones'		=> array(
-		'UTC'			=> 'UTC',
-
-		'Etc/GMT-12'	=> 'GMT+12',
-		'Etc/GMT-11'	=> 'GMT+11',
-		'Etc/GMT-10'	=> 'GMT+10',
-		'Etc/GMT-9'		=> 'GMT+9',
-		'Etc/GMT-8'		=> 'GMT+8',
-		'Etc/GMT-7'		=> 'GMT+7',
-		'Etc/GMT-6'		=> 'GMT+6',
-		'Etc/GMT-5'		=> 'GMT+5',
-		'Etc/GMT-4'		=> 'GMT+4',
-		'Etc/GMT-3'		=> 'GMT+3',
-		'Etc/GMT-2'		=> 'GMT+2',
-		'Etc/GMT-1'		=> 'GMT+1',
-		'Etc/GMT+1'		=> 'GMT-1',
-		'Etc/GMT+2'		=> 'GMT-2',
-		'Etc/GMT+3'		=> 'GMT-3',
-		'Etc/GMT+4'		=> 'GMT-4',
-		'Etc/GMT+5'		=> 'GMT-5',
-		'Etc/GMT+6'		=> 'GMT-6',
-		'Etc/GMT+7'		=> 'GMT-7',
-		'Etc/GMT+8'		=> 'GMT-8',
-		'Etc/GMT+9'		=> 'GMT-9',
-		'Etc/GMT+10'	=> 'GMT-10',
-		'Etc/GMT+11'	=> 'GMT-11',
-		'Etc/GMT+12'	=> 'GMT-12',
+		'UTC'					=> 'UTC',
+		'UTC_OFFSET'			=> 'UTC%1$s',
+		'UTC_OFFSET_CURRENT'	=> 'UTC%1$s - %2$s',
+
+		'Etc/GMT-12'	=> 'UTC+12',
+		'Etc/GMT-11'	=> 'UTC+11',
+		'Etc/GMT-10'	=> 'UTC+10',
+		'Etc/GMT-9'		=> 'UTC+9',
+		'Etc/GMT-8'		=> 'UTC+8',
+		'Etc/GMT-7'		=> 'UTC+7',
+		'Etc/GMT-6'		=> 'UTC+6',
+		'Etc/GMT-5'		=> 'UTC+5',
+		'Etc/GMT-4'		=> 'UTC+4',
+		'Etc/GMT-3'		=> 'UTC+3',
+		'Etc/GMT-2'		=> 'UTC+2',
+		'Etc/GMT-1'		=> 'UTC+1',
+		'Etc/GMT+1'		=> 'UTC-1',
+		'Etc/GMT+2'		=> 'UTC-2',
+		'Etc/GMT+3'		=> 'UTC-3',
+		'Etc/GMT+4'		=> 'UTC-4',
+		'Etc/GMT+5'		=> 'UTC-5',
+		'Etc/GMT+6'		=> 'UTC-6',
+		'Etc/GMT+7'		=> 'UTC-7',
+		'Etc/GMT+8'		=> 'UTC-8',
+		'Etc/GMT+9'		=> 'UTC-9',
+		'Etc/GMT+10'	=> 'UTC-10',
+		'Etc/GMT+11'	=> 'UTC-11',
+		'Etc/GMT+12'	=> 'UTC-12',
 
 		'Africa/Abidjan'	=> 'Africa/Abidjan',
 		'Africa/Accra'		=> 'Africa/Accra',
-- 
cgit v1.2.1


From dc65058c20f5828dd33c6811c2f65bb14375a12e Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 13 Sep 2014 12:35:44 +0800
Subject: [ticket/13055] Add string profile fields validation options to
 support unicode

PHPBB3-13055
---
 phpBB/language/en/acp/profile.php | 6 ++++++
 phpBB/language/en/ucp.php         | 5 +++++
 2 files changed, 11 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 67813bcba4..6cb4a20eb0 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -119,6 +119,12 @@ $lang = array_merge($lang, array(
 
 	'LANG_SPECIFIC_OPTIONS'		=> 'Language specific options [<strong>%s</strong>]',
 
+	'LETTER_NUM_DOTS'			=> 'Any letters, numbers and dots (periods)',
+	'LETTER_NUM_ONLY'			=> 'Any letters and numbers',
+	'LETTER_NUM_PUNCTUATION'	=> 'Any letters, numbers, comma, dots, underscores and dashes beginning with any letter',
+	'LETTER_NUM_SPACERS'		=> 'Any letters, numbers and spacers',
+	'LETTER_NUM_UNDERSCORE'		=> 'Any letters, numbers and underscores',
+
 	'MAX_FIELD_CHARS'		=> 'Maximum number of characters',
 	'MAX_FIELD_NUMBER'		=> 'Highest allowed number',
 	'MIN_FIELD_CHARS'		=> 'Minimum number of characters',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index d692828bd7..101292e171 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -214,6 +214,11 @@ $lang = array_merge($lang, array(
 	'FIELD_INVALID_CHARS_ALPHA_PUNCTUATION'	=> 'The field “%s” has invalid characters, only alphanumeric or _,-. characters are allowed and the first character must be alphabetic.',
 	'FIELD_INVALID_CHARS_ALPHA_SPACERS'	=> 'The field “%s” has invalid characters, only alphanumeric, space or -+_[] characters are allowed.',
 	'FIELD_INVALID_CHARS_ALPHA_UNDERSCORE'	=> 'The field “%s” has invalid characters, only alphanumeric or _ characters are allowed.',
+	'FIELD_INVALID_CHARS_LETTER_NUM_DOTS'	=> 'The field “%s” has invalid characters, only letter, number or . characters are allowed.',
+	'FIELD_INVALID_CHARS_LETTER_NUM_ONLY'	=> 'The field “%s” has invalid characters, only letter and number characters are allowed.',
+	'FIELD_INVALID_CHARS_LETTER_NUM_PUNCTUATION'	=> 'The field “%s” has invalid characters, only letter, number or _,-. characters are allowed and the first character must be alphabetic.',
+	'FIELD_INVALID_CHARS_LETTER_NUM_SPACERS'		=> 'The field “%s” has invalid characters, only letter, number, space or -+_[] characters are allowed.',
+	'FIELD_INVALID_CHARS_LETTER_NUM_UNDERSCORE'		=> 'The field “%s” has invalid characters, only letter, number or _ characters are allowed.',
 	'FIELD_INVALID_DATE'				=> 'The field “%s” has an invalid date.',
 	'FIELD_INVALID_URL'					=> 'The field “%s” has an invalid url.',
 	'FIELD_INVALID_VALUE'				=> 'The field “%s” has an invalid value.',
-- 
cgit v1.2.1


From a2b5ec7e1bed7238a8ac92592b613cfcba764d8d Mon Sep 17 00:00:00 2001
From: Giampaolo Falqui <giampaolofalqui@gmail.com>
Date: Thu, 18 Sep 2014 02:25:39 +0200
Subject: [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAIN

PHPBB3-13068
---
 phpBB/language/en/acp/profile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 67813bcba4..d27deed602 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -99,7 +99,7 @@ $lang = array_merge($lang, array(
 	'FIELD_IDENT_EXPLAIN'		=> 'The field identification is a name to identify the profile field within the database and the templates.',
 	'FIELD_INT'					=> 'Numbers',
 	'FIELD_IS_CONTACT'			=> 'Display field as a contact field',
-	'FIELD_IS_CONTACT_EXPLAIN'	=> 'Contact fields are displayed with in the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages.',
+	'FIELD_IS_CONTACT_EXPLAIN'	=> 'Contact fields are displayed within the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages.',
 	'FIELD_LENGTH'				=> 'Length of input box',
 	'FIELD_NOT_FOUND'			=> 'Profile field not found.',
 	'FIELD_STRING'				=> 'Single text field',
-- 
cgit v1.2.1


From 31e43ce1243a2a68f8d975f07a9e52d082b6aa54 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Thu, 18 Sep 2014 12:13:17 +0200
Subject: [ticket/12489] Add notice about %s wildcard in
 FIELD_IS_CONTACT_EXPLAIN

PHPBB3-12489
---
 phpBB/language/en/acp/profile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index d27deed602..176e8832ae 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -99,7 +99,7 @@ $lang = array_merge($lang, array(
 	'FIELD_IDENT_EXPLAIN'		=> 'The field identification is a name to identify the profile field within the database and the templates.',
 	'FIELD_INT'					=> 'Numbers',
 	'FIELD_IS_CONTACT'			=> 'Display field as a contact field',
-	'FIELD_IS_CONTACT_EXPLAIN'	=> 'Contact fields are displayed within the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages.',
+	'FIELD_IS_CONTACT_EXPLAIN'	=> 'Contact fields are displayed within the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages. You can use <samp>%s</samp> placeholder that will be replaced by the value provided by the user.',
 	'FIELD_LENGTH'				=> 'Length of input box',
 	'FIELD_NOT_FOUND'			=> 'Profile field not found.',
 	'FIELD_STRING'				=> 'Single text field',
-- 
cgit v1.2.1


From 39d46e25991de64ed3bf6ff36cdbf349bf666512 Mon Sep 17 00:00:00 2001
From: Mario Skouat <forum@skouat.org>
Date: Sun, 21 Sep 2014 10:43:10 +0200
Subject: [ticket/13041] Reordering "Login and Registration Issues"

PHPBB3-13041
---
 phpBB/language/en/help_faq.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 904dc92080..3bc7e8cdd8 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -36,40 +36,36 @@ $help = array(
 		1 => 'Login and Registration Issues'
 	),
 	array(
-		0 => 'Why can’t I login?',
-		1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact the board owner to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.'
-	),
-	array(
-		0 => 'Why do I need to register at all?',
+		0 => 'Why do I need to register?',
 		1 => 'You may not have to, it is up to the administrator of the board as to whether you need to register in order to post messages. However; registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.'
 	),
 	array(
-		0 => 'Why do I get logged off automatically?',
-		1 => 'If you do not check the <em>Remember me</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.'
-	),
-	array(
-		0 => 'How do I prevent my username appearing in the online user listings?',
-		1 => 'Within your User Control Panel, under “Board preferences”, you will find the option <em>Hide your online status</em>. Enable this option with <samp>Yes</samp> and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.'
+		0 => 'What is COPPA?',
+		1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Limited cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined below.',
 	),
 	array(
-		0 => 'I’ve lost my password!',
-		1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I’ve forgotten my password</em>. Follow the instructions and you should be able to log in again shortly.'
+		0 => 'Why can’t I register?',
+		1 => 'It is possible the website owner has banned your IP address or disallowed the username you are attempting to register. The website owner could have also disabled registration to prevent new visitors from signing up. Contact a board administrator for assistance.',
 	),
 	array(
 		0 => 'I registered but cannot login!',
 		1 => 'First, check your username and password. If they are correct, then one of two things may have happened. If COPPA support is enabled and you specified being under 13 years old during registration, you will have to follow the instructions you received. Some boards will also require new registrations to be activated, either by yourself or by an administrator before you can logon; this information was present during registration. If you were sent an email, follow the instructions. If you did not receive an email, you may have provided an incorrect email address or the email may have been picked up by a spam filer. If you are sure the email address you provided is correct, try contacting an administrator.'
 	),
+	array(
+		0 => 'Why can’t I login?',
+		1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact the board owner to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.'
+	),
 	array(
 		0 => 'I registered in the past but cannot login any more?!',
 		1 => 'It is possible an administrator has deactivated or deleted your account for some reason. Also, many boards periodically remove users who have not posted for a long time to reduce the size of the database. If this has happened, try registering again and being more involved in discussions.'
 	),
 	array(
-		0 => 'What is COPPA?',
-		1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Limited cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined below.',
+		0 => 'I’ve lost my password!',
+		1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I’ve forgotten my password</em>. Follow the instructions and you should be able to log in again shortly.'
 	),
 	array(
-		0 => 'Why can’t I register?',
-		1 => 'It is possible the website owner has banned your IP address or disallowed the username you are attempting to register. The website owner could have also disabled registration to prevent new visitors from signing up. Contact a board administrator for assistance.',
+		0 => 'Why do I get logged off automatically?',
+		1 => 'If you do not check the <em>Remember me</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.'
 	),
 	array(
 		0 => 'What does the “Delete all board cookies” do?',
@@ -83,6 +79,10 @@ $help = array(
 		0 => 'How do I change my settings?',
 		1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found at the top of board pages. This system will allow you to change all your settings and preferences.'
 	),
+	array(
+		0 => 'How do I prevent my username appearing in the online user listings?',
+		1 => 'Within your User Control Panel, under “Board preferences”, you will find the option <em>Hide your online status</em>. Enable this option with <samp>Yes</samp> and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.'
+	),
 	array(
 		0 => 'The times are not correct!',
 		1 => 'It is possible the time displayed is from a timezone different from the one you are in. If this is the case, visit your User Control Panel and change your timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings, can only be done by registered users. If you are not registered, this is a good time to do so.'
-- 
cgit v1.2.1


From e816006b8e5e0040f70411495b8722f982811475 Mon Sep 17 00:00:00 2001
From: Mario Skouat <forum@skouat.org>
Date: Wed, 1 Oct 2014 20:14:30 +0200
Subject: [ticket/13041] Updating "User Preferences and settings"

PHPBB3-13041
---
 phpBB/language/en/help_faq.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 3bc7e8cdd8..378c8b7d85 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -77,7 +77,7 @@ $help = array(
 	),
 	array(
 		0 => 'How do I change my settings?',
-		1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found at the top of board pages. This system will allow you to change all your settings and preferences.'
+		1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found by clicking on your username at the top of board pages. This system will allow you to change all your settings and preferences.'
 	),
 	array(
 		0 => 'How do I prevent my username appearing in the online user listings?',
@@ -93,11 +93,15 @@ $help = array(
 	),
 	array(
 		0 => 'My language is not in the list!',
-		1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB website (see link at the bottom of board pages).'
+		1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the <a href="https://www.phpbb.com/">phpBB</a>&reg; website.'
 	),
 	array(
-		0 => 'How do I show an image along with my username?',
-		1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.'
+		0 => 'What do the images next to my username?',
+		1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user.'
+	),
+	array(
+		0 => 'How do I display an avatar?',
+		1 => 'Within your User Control Panel, under “Profile” you can add an avatar by using one of the four following methods: Gravatar, Gallery, Remote or Upload. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.'
 	),
 	array(
 		0 => 'What is my rank and how do I change it?',
-- 
cgit v1.2.1


From abb1244b443e6564a36879f67804e2c3e6e5909d Mon Sep 17 00:00:00 2001
From: Mario Skouat <forum@skouat.org>
Date: Thu, 2 Oct 2014 10:27:48 +0200
Subject: [ticket/13041] Updating "Login and Registration Issues"

PHPBB3-13041
---
 phpBB/language/en/help_faq.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 378c8b7d85..5f870744fc 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -41,11 +41,11 @@ $help = array(
 	),
 	array(
 		0 => 'What is COPPA?',
-		1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Limited cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined below.',
+		1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Limited and board team cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.',
 	),
 	array(
 		0 => 'Why can’t I register?',
-		1 => 'It is possible the website owner has banned your IP address or disallowed the username you are attempting to register. The website owner could have also disabled registration to prevent new visitors from signing up. Contact a board administrator for assistance.',
+		1 => 'It is possible the board owner has disabled registration to prevent new visitors from signing up. The board owner could have also banned your IP address or disallowed the username you are attempting to register. Contact a board administrator for assistance.',
 	),
 	array(
 		0 => 'I registered but cannot login!',
@@ -61,7 +61,7 @@ $help = array(
 	),
 	array(
 		0 => 'I’ve lost my password!',
-		1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I’ve forgotten my password</em>. Follow the instructions and you should be able to log in again shortly.'
+		1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I forgot my password</em>. Follow the instructions and you should be able to log in again shortly.<br />However, if you are not able to reset your password, contact the board administrator.'
 	),
 	array(
 		0 => 'Why do I get logged off automatically?',
@@ -69,7 +69,7 @@ $help = array(
 	),
 	array(
 		0 => 'What does the “Delete all board cookies” do?',
-		1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.',
+		1 => '“Delete all board cookies” deletes the cookies created by phpBB3 which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.',
 	),
 	array(
 		0 => '--',
-- 
cgit v1.2.1


From 64eec22884e5e328d9f211aebe24a7704862b0f9 Mon Sep 17 00:00:00 2001
From: Mario Skouat <forum@skouat.org>
Date: Thu, 2 Oct 2014 11:53:39 +0200
Subject: [ticket/13041] Updating "Posting Issues"

PHPBB3-13041
---
 phpBB/language/en/help_faq.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 5f870744fc..21ce3c29bf 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -117,7 +117,7 @@ $help = array(
 	),
 	array(
 		0 => 'How do I post a topic in a forum?',
-		1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can vote in polls, etc.'
+		1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can post attachments, etc.'
 	),
 	array(
 		0 => 'How do I edit or delete a post?',
-- 
cgit v1.2.1


From 1fb4ebb34a22f72077d670c22f2d238c70cf4c5e Mon Sep 17 00:00:00 2001
From: Mario Skouat <forum@skouat.org>
Date: Thu, 2 Oct 2014 11:54:48 +0200
Subject: [ticket/13041] Updating "Searching the Forums"

PHPBB3-13041
---
 phpBB/language/en/help_faq.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 21ce3c29bf..cb1a5ffea2 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -298,7 +298,7 @@ $help = array(
 	),
 	array(
 		0 => 'How can I find my own posts and topics?',
-		1 => 'Your own posts can be retrieved either by clicking the “Search user’s posts” within the User Control Panel or via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropriately.'
+		1 => 'Your own posts can be retrieved either by clicking the “Show your posts” within the User Control Panel or by clicking “Search user’s posts” via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropriately.'
 	),
 	array(
 		0 => '--',
-- 
cgit v1.2.1


From 8c628a6dc209977d8ed96137b3be209927a5e093 Mon Sep 17 00:00:00 2001
From: Mario Skouat <forum@skouat.org>
Date: Thu, 2 Oct 2014 12:56:56 +0200
Subject: [ticket/13041] Updating "phpBB3 Issues"

PHPBB3-13041
---
 phpBB/language/en/help_faq.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index cb1a5ffea2..249e13cddb 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -330,11 +330,11 @@ $help = array(
 	),
 	array(
 		0 => '--',
-		1 => 'phpBB 3 Issues'
+		1 => 'phpBB3 Issues'
 	),
 	array(
 		0 => 'Who wrote this bulletin board?',
-		1 => 'This software (in its unmodified form) is produced, released and is copyright <a href="https://www.phpbb.com/">phpBB Limited</a>. It is made available under the GNU General Public License and may be freely distributed. See the link for more details.'
+		1 => 'This software (in its unmodified form) is produced, released and is copyright <a href="https://www.phpbb.com/">phpBB Limited</a>. It is made available under the GNU General Public License, version 2 (GPL-2.0) and may be freely distributed. See the link for more details.'
 	),
 	array(
 		0 => 'Why isn’t X feature available?',
@@ -344,4 +344,8 @@ $help = array(
 		0 => 'Who do I contact about abusive and/or legal matters related to this board?',
 		1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a <a href="http://www.google.com/search?q=whois">whois lookup</a>) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Limited has <strong>absolutely no jurisdiction</strong> and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Limited in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter <strong>not directly related</strong> to the phpBB.com website or the discrete software of phpBB itself. If you do email phpBB Limited <strong>about any third party</strong> use of this software then you should expect a terse response or no response at all.'
 	),
+	array(
+		0 => 'Who do I contact a board administrator?',
+		1 => 'All users of the board can use the form “Contact us”, if the option was enabled by the board administrator.<br />Members of the board, can also use “The team” link.'
+	),
 );
-- 
cgit v1.2.1


From e5a5933db61e3c6748e62f931c0e07abfb4586e8 Mon Sep 17 00:00:00 2001
From: Mario Skouat <forum@skouat.org>
Date: Thu, 2 Oct 2014 12:57:17 +0200
Subject: [ticket/13041] Updating "Topic Subscriptions and Bookmarks"

PHPBB3-13041
---
 phpBB/language/en/help_faq.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 249e13cddb..e75e672413 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -310,7 +310,7 @@ $help = array(
 	),
 	array(
 		0 => 'How do I subscribe to specific forums or topics?',
-		1 => 'To subscribe to a specific forum, click the “Subscribe forum” link upon entering the forum. To subscribe to a topic, reply to the topic with the subscribe checkbox checked or click the “Subscribe topic” link within the topic itself.'
+		1 => 'To subscribe to a specific forum, click the “Subscribe forum” link upon entering the forum.<br />To subscribe to a topic, reply to the topic with the subscribe checkbox checked or click the “Subscribe topic” link by clicking the button “Topic tools”.<br /> These links are usually at the bottom of page.'
 	),
 	array(
 		0 => 'How do I remove my subscriptions?',
-- 
cgit v1.2.1


From 0c0024497d8e28e40cdd3ca05690781e9f963c55 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Tue, 7 Oct 2014 10:24:30 +0200
Subject: [ticket/12489] Language correction

PHPBB3-12489
---
 phpBB/language/en/acp/profile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 176e8832ae..7620ce3a5e 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -99,7 +99,7 @@ $lang = array_merge($lang, array(
 	'FIELD_IDENT_EXPLAIN'		=> 'The field identification is a name to identify the profile field within the database and the templates.',
 	'FIELD_INT'					=> 'Numbers',
 	'FIELD_IS_CONTACT'			=> 'Display field as a contact field',
-	'FIELD_IS_CONTACT_EXPLAIN'	=> 'Contact fields are displayed within the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages. You can use <samp>%s</samp> placeholder that will be replaced by the value provided by the user.',
+	'FIELD_IS_CONTACT_EXPLAIN'	=> 'Contact fields are displayed within the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages. You can use <samp>%s</samp> as a placeholder variable which will be replaced by a value provided by the user.',
 	'FIELD_LENGTH'				=> 'Length of input box',
 	'FIELD_NOT_FOUND'			=> 'Profile field not found.',
 	'FIELD_STRING'				=> 'Single text field',
-- 
cgit v1.2.1


From 97db21882935e31c6f539b2f76d7339e1cd0c07f Mon Sep 17 00:00:00 2001
From: Mario Skouat <forum@skouat.org>
Date: Wed, 8 Oct 2014 00:14:00 +0200
Subject: [ticket/13041] Added multiple changes

- "phpBB3" replaced by "phpBB"
- Added the changes suggested by VSE.
- "Subscriptions and Bookmarks" reviewed
- Added trailing comma on modified lines

PHPBB3-13041
---
 phpBB/language/en/help_faq.php | 46 +++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index e75e672413..4c73b105ea 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -41,11 +41,11 @@ $help = array(
 	),
 	array(
 		0 => 'What is COPPA?',
-		1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Limited and board team cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.',
+		1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that phpBB Limited and the owner’s of this board cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.',
 	),
 	array(
 		0 => 'Why can’t I register?',
-		1 => 'It is possible the board owner has disabled registration to prevent new visitors from signing up. The board owner could have also banned your IP address or disallowed the username you are attempting to register. Contact a board administrator for assistance.',
+		1 => 'It is possible a board administrator has disabled registration to prevent new visitors from signing up. A board administrator could have also banned your IP address or disallowed the username you are attempting to register. Contact a board administrator for assistance.',
 	),
 	array(
 		0 => 'I registered but cannot login!',
@@ -53,7 +53,7 @@ $help = array(
 	),
 	array(
 		0 => 'Why can’t I login?',
-		1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact the board owner to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.'
+		1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact a board administrator to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.',
 	),
 	array(
 		0 => 'I registered in the past but cannot login any more?!',
@@ -61,15 +61,15 @@ $help = array(
 	),
 	array(
 		0 => 'I’ve lost my password!',
-		1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I forgot my password</em>. Follow the instructions and you should be able to log in again shortly.<br />However, if you are not able to reset your password, contact the board administrator.'
+		1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I forgot my password</em>. Follow the instructions and you should be able to log in again shortly.<br />However, if you are not able to reset your password, contact the board administrator.',
 	),
 	array(
 		0 => 'Why do I get logged off automatically?',
-		1 => 'If you do not check the <em>Remember me</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.'
+		1 => 'If you do not check the <em>Remember me</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the <em>Remember me</em> box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.',
 	),
 	array(
 		0 => 'What does the “Delete all board cookies” do?',
-		1 => '“Delete all board cookies” deletes the cookies created by phpBB3 which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.',
+		1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board administrator. If you are having login or logout problems, deleting board cookies may help.',
 	),
 	array(
 		0 => '--',
@@ -77,7 +77,7 @@ $help = array(
 	),
 	array(
 		0 => 'How do I change my settings?',
-		1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found by clicking on your username at the top of board pages. This system will allow you to change all your settings and preferences.'
+		1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found by clicking on your username at the top of board pages. This system will allow you to change all your settings and preferences.',
 	),
 	array(
 		0 => 'How do I prevent my username appearing in the online user listings?',
@@ -93,15 +93,15 @@ $help = array(
 	),
 	array(
 		0 => 'My language is not in the list!',
-		1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the <a href="https://www.phpbb.com/">phpBB</a>&reg; website.'
+		1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the <a href="https://www.phpbb.com/">phpBB</a>&reg; website.',
 	),
 	array(
 		0 => 'What do the images next to my username?',
-		1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user.'
+		1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user.',
 	),
 	array(
 		0 => 'How do I display an avatar?',
-		1 => 'Within your User Control Panel, under “Profile” you can add an avatar by using one of the four following methods: Gravatar, Gallery, Remote or Upload. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.'
+		1 => 'Within your User Control Panel, under “Profile” you can add an avatar by using one of the four following methods: Gravatar, Gallery, Remote or Upload. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator.',
 	),
 	array(
 		0 => 'What is my rank and how do I change it?',
@@ -117,7 +117,7 @@ $help = array(
 	),
 	array(
 		0 => 'How do I post a topic in a forum?',
-		1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can post attachments, etc.'
+		1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can post attachments, etc.',
 	),
 	array(
 		0 => 'How do I edit or delete a post?',
@@ -286,7 +286,7 @@ $help = array(
 	),
 	array(
 		0 => 'Why does my search return no results?',
-		1 => 'Your search was probably too vague and included many common terms which are not indexed by phpBB3. Be more specific and use the options available within Advanced search.'
+		1 => 'Your search was probably too vague and included many common terms which are not indexed by phpBB. Be more specific and use the options available within Advanced search.',
 	),
 	array(
 		0 => 'Why does my search return a blank page!?',
@@ -298,19 +298,23 @@ $help = array(
 	),
 	array(
 		0 => 'How can I find my own posts and topics?',
-		1 => 'Your own posts can be retrieved either by clicking the “Show your posts” within the User Control Panel or by clicking “Search user’s posts” via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropriately.'
+		1 => 'Your own posts can be retrieved either by clicking the “Show your posts” link within the User Control Panel or by clicking the “Search user’s posts” link via your own profile page or by clicking the “Quick links” menu on the top of the board. To search for your topics, use the Advanced search page and fill in the various options appropriately.',
 	),
 	array(
 		0 => '--',
-		1 => 'Topic Subscriptions and Bookmarks'
+		1 => 'Subscriptions and Bookmarks',
 	),
 	array(
 		0 => 'What is the difference between bookmarking and subscribing?',
-		1 => 'Bookmarking in phpBB3 is much like bookmarking in your web browser. You aren’t alerted when there’s an update, but you can come back to the topic later. Subscribing, however, will notify you when there is an update to the topic or forum on the board via your preferred method or methods.'
+		1 => 'With phpBB 3.0, bookmarking a topic was much like bookmarking in your web browser. You were not alerted when there was an update. Since phpBB 3.1, bookmarking is much like subscribing to a topic. You can to be notified when there is an update. However, unlike subscribing, you are not able to bookmark a forum.',
 	),
 	array(
-		0 => 'How do I subscribe to specific forums or topics?',
-		1 => 'To subscribe to a specific forum, click the “Subscribe forum” link upon entering the forum.<br />To subscribe to a topic, reply to the topic with the subscribe checkbox checked or click the “Subscribe topic” link by clicking the button “Topic tools”.<br /> These links are usually at the bottom of page.'
+		0 => 'How do I bookmark or subscribe to specific topics?',
+		1 => 'You can bookmark or subscribe to a specific topic by clicking the appropriate link in the “Topic tools” menu, conveniently located near the top and bottom of a topic discussion.<br />You can also subscribe, not bookmark, to a topic by replying to a topic and checking the “Notify me when a reply is posted” checkbox.',
+	),
+	array(
+		0 => 'How do I subscribe to specific forums?',
+		1 => 'To subscribe to a specific forum, click the “Subscribe forum” link, at the bottom of page, upon entering the forum.',
 	),
 	array(
 		0 => 'How do I remove my subscriptions?',
@@ -330,11 +334,11 @@ $help = array(
 	),
 	array(
 		0 => '--',
-		1 => 'phpBB3 Issues'
+		1 => 'phpBB Issues',
 	),
 	array(
 		0 => 'Who wrote this bulletin board?',
-		1 => 'This software (in its unmodified form) is produced, released and is copyright <a href="https://www.phpbb.com/">phpBB Limited</a>. It is made available under the GNU General Public License, version 2 (GPL-2.0) and may be freely distributed. See the link for more details.'
+		1 => 'This software (in its unmodified form) is produced, released and is copyright <a href="https://www.phpbb.com/">phpBB Limited</a>. It is made available under the GNU General Public License, version 2 (GPL-2.0) and may be freely distributed. See the link for more details.',
 	),
 	array(
 		0 => 'Why isn’t X feature available?',
@@ -345,7 +349,7 @@ $help = array(
 		1 => 'Any of the administrators listed on the “The team” page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a <a href="http://www.google.com/search?q=whois">whois lookup</a>) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Limited has <strong>absolutely no jurisdiction</strong> and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Limited in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter <strong>not directly related</strong> to the phpBB.com website or the discrete software of phpBB itself. If you do email phpBB Limited <strong>about any third party</strong> use of this software then you should expect a terse response or no response at all.'
 	),
 	array(
-		0 => 'Who do I contact a board administrator?',
-		1 => 'All users of the board can use the form “Contact us”, if the option was enabled by the board administrator.<br />Members of the board, can also use “The team” link.'
+		0 => 'How do I contact a board administrator?',
+		1 => 'All users of the board can use the “Contact us” form, if the option was enabled by the board administrator.<br />Members of the board can also use the “The team” link.',
 	),
 );
-- 
cgit v1.2.1


From 2bc79701e61c05ddacf643724400eae77c0c4bc2 Mon Sep 17 00:00:00 2001
From: Mario Skouat <forum@skouat.org>
Date: Sat, 11 Oct 2014 10:43:01 +0200
Subject: [ticket/13041] Added multiple changes

- Added the changes reported by VSE.

PHPBB3-13041
---
 phpBB/language/en/help_faq.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 4c73b105ea..caa34025a4 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -298,7 +298,7 @@ $help = array(
 	),
 	array(
 		0 => 'How can I find my own posts and topics?',
-		1 => 'Your own posts can be retrieved either by clicking the “Show your posts” link within the User Control Panel or by clicking the “Search user’s posts” link via your own profile page or by clicking the “Quick links” menu on the top of the board. To search for your topics, use the Advanced search page and fill in the various options appropriately.',
+		1 => 'Your own posts can be retrieved either by clicking the “Show your posts” link within the User Control Panel or by clicking the “Search user’s posts” link via your own profile page or by clicking the “Quick links” menu at the top of the board. To search for your topics, use the Advanced search page and fill in the various options appropriately.',
 	),
 	array(
 		0 => '--',
@@ -306,7 +306,7 @@ $help = array(
 	),
 	array(
 		0 => 'What is the difference between bookmarking and subscribing?',
-		1 => 'With phpBB 3.0, bookmarking a topic was much like bookmarking in your web browser. You were not alerted when there was an update. Since phpBB 3.1, bookmarking is much like subscribing to a topic. You can to be notified when there is an update. However, unlike subscribing, you are not able to bookmark a forum.',
+		1 => 'In phpBB 3.0, bookmarking topics worked much like bookmarking in a web browser. You were not alerted when there was an update. As of phpBB 3.1, bookmarking is more like subscribing to a topic. You can be notified when a bookmarked topic is updated. Subscribing, however, will notify you when there is an update to a topic or forum on the board. Notification options for bookmarks and subscriptions can be configured in the User Control Panel.',
 	),
 	array(
 		0 => 'How do I bookmark or subscribe to specific topics?',
-- 
cgit v1.2.1


From 56d7c2c6ed3e5924aeced53a163bfd1aa8288034 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Tue, 14 Oct 2014 17:58:29 +0200
Subject: [ticket/13126] Improve the feedback when running the migrations

PHPBB3-13126
---
 phpBB/language/en/migrator.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index 7199d21d96..f5a56816c2 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -41,12 +41,16 @@ $lang = array_merge($lang, array(
 
 	'GROUP_NOT_EXIST'					=> 'The group "%s" unexpectedly does not exist.',
 
+	'MIGRATION_APPLY_DEPENDENCIES'		=> 'Apply dependencies of %s.',
 	'MIGRATION_DATA_DONE'				=> 'Installed Data: %1$s; Time: %2$.2f seconds',
 	'MIGRATION_DATA_IN_PROGRESS'		=> 'Installing Data: %1$s; Time: %2$.2f seconds',
+	'MIGRATION_DATA_RUNNING'			=> 'Installing Data: %s.',
 	'MIGRATION_EFFECTIVELY_INSTALLED'	=> 'Migration already effectively installed (skipped): %s',
 	'MIGRATION_EXCEPTION_ERROR'			=> 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.',
 	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
+	'MIGRATION_NOT_VALID'				=> '%s is not a valid migration.',
 	'MIGRATION_SCHEMA_DONE'				=> 'Installed Schema: %1$s; Time: %2$.2f seconds',
+	'MIGRATION_SCHEMA_RUNNING'			=> 'Installing Schema: %s.',
 
 	'MODULE_ERROR'						=> 'An error occurred while creating a module: %s',
 	'MODULE_INFO_FILE_NOT_EXIST'		=> 'A required module info file is missing: %2$s',
-- 
cgit v1.2.1


From 1a128f9a768fac8e27c960172153b0be9cc53b61 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 15 Oct 2014 16:07:01 +0200
Subject: [ticket/12796] Use dedicated lang vars

PHPBB3-12796
---
 phpBB/language/en/memberlist.php | 2 ++
 phpBB/language/en/ucp.php        | 1 +
 2 files changed, 3 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 1a05975892..b8c626d331 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -54,6 +54,8 @@ $lang = array_merge($lang, array(
 	'DEST_LANG'				=> 'Language',
 	'DEST_LANG_EXPLAIN'		=> 'Select an appropriate language (if available) for the recipient of this message.',
 
+	'EDIT_PROFILE'			=> 'Edit profile',
+
 	'EMAIL_BODY_EXPLAIN'	=> 'This message will be sent as plain text, do not include any HTML or BBCode. The return address for this message will be set to your email address.',
 	'EMAIL_DISABLED'		=> 'Sorry but all email related functions have been disabled.',
 	'EMAIL_SENT'			=> 'The email has been sent.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 101292e171..ad7063d3f9 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -589,6 +589,7 @@ $lang = array_merge($lang, array(
 	),
 	'VIEW_PREVIOUS_HISTORY'		=> 'Previous PM in history',
 	'VIEW_PREVIOUS_PM'			=> 'Previous PM',
+	'VIEW_PROFILE'				=> 'View profile',
 	'VIEW_SIGS'					=> 'Display signatures',
 	'VIEW_SMILIES'				=> 'Display smilies as images',
 	'VIEW_TOPICS_DAYS'			=> 'Display topics from previous days',
-- 
cgit v1.2.1


From 01df1d3301ab533e92e374594d8cb35692def491 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Fri, 17 Oct 2014 15:40:03 +0200
Subject: [ticket/11863] Grey out unavailable activation methods when emails
 disabled

Further fall back to USER_ACTIVATION_DISABLE when emails are disabled
but evaluate it at runtime.

PHPBB3-11863
---
 phpBB/language/en/acp/board.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index ae7565d608..a2bfb43be7 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -221,7 +221,7 @@ $lang = array_merge($lang, array(
 	'ACP_REGISTER_SETTINGS_EXPLAIN'		=> 'Here you are able to define registration and profile related settings.',
 
 	'ACC_ACTIVATION'				=> 'Account activation',
-	'ACC_ACTIVATION_EXPLAIN'		=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. “Board-wide email” must be enabled in order to use user or admin activation.',
+	'ACC_ACTIVATION_EXPLAIN'		=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. <em>“Board-wide email” must be enabled in order to use user or admin activation.</em>',
 	'NEW_MEMBER_POST_LIMIT'			=> 'New member post limit',
 	'NEW_MEMBER_POST_LIMIT_EXPLAIN'	=> 'New members are within the <em>Newly Registered Users</em> group until they reach this number of posts. You can use this group to keep them from using the PM system or to review their posts. <strong>A value of 0 disables this feature.</strong>',
 	'NEW_MEMBER_GROUP_DEFAULT'		=> 'Set Newly Registered Users group to default',
@@ -556,7 +556,7 @@ $lang = array_merge($lang, array(
 	'EMAIL_SIG'						=> 'Email signature',
 	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all emails the board sends.',
 	'ENABLE_EMAIL'					=> 'Enable board-wide emails',
-	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no emails will be sent by the board at all. <em>Note the user and admin account activation settings require this setting to be enabled. If currently using “user” or “admin” activation in the activation settings, disabling this setting will require no activation of new accounts.</em>',
+	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no emails will be sent by the board at all. <em>Note the user and admin account activation settings require this setting to be enabled. If currently using “user” or “admin” activation in the activation settings, disabling this setting will disable registration.</em>',
 	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
 	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
 	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',
-- 
cgit v1.2.1


From f049fcd6046bbbeea035b02a78638bbacee7dce1 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Fri, 17 Oct 2014 15:42:11 +0200
Subject: [ticket/11863] Display warning to user because of activation method

PHPBB3-11863
---
 phpBB/language/en/acp/board.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index a2bfb43be7..8d6c1c141d 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -222,6 +222,7 @@ $lang = array_merge($lang, array(
 
 	'ACC_ACTIVATION'				=> 'Account activation',
 	'ACC_ACTIVATION_EXPLAIN'		=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. <em>“Board-wide email” must be enabled in order to use user or admin activation.</em>',
+	'ACC_ACTIVATION_WARNING'		=> 'Please note that the currently selected activation method requires emails to be enabled, otherwise registration will be disabled. We recommend to either select a different activation method or reenable emails.',
 	'NEW_MEMBER_POST_LIMIT'			=> 'New member post limit',
 	'NEW_MEMBER_POST_LIMIT_EXPLAIN'	=> 'New members are within the <em>Newly Registered Users</em> group until they reach this number of posts. You can use this group to keep them from using the PM system or to review their posts. <strong>A value of 0 disables this feature.</strong>',
 	'NEW_MEMBER_GROUP_DEFAULT'		=> 'Set Newly Registered Users group to default',
-- 
cgit v1.2.1


From 737894027acb70eed46d8ee87e4be7c660902fd7 Mon Sep 17 00:00:00 2001
From: Mario Skouat <forum@skouat.org>
Date: Sat, 18 Oct 2014 13:28:18 +0200
Subject: [ticket/13041] Added multiple changes

- Improper english in some sentences.
- Improper use of singular/plural in some sentences
- Replace "the board administrator" by "a board administrator"
- Update the category "Posting Issues" and "Subscriptions and Bookmarks"

PHPBB3-13041
---
 phpBB/language/en/help_faq.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index caa34025a4..0327fc36eb 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -61,15 +61,15 @@ $help = array(
 	),
 	array(
 		0 => 'I’ve lost my password!',
-		1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I forgot my password</em>. Follow the instructions and you should be able to log in again shortly.<br />However, if you are not able to reset your password, contact the board administrator.',
+		1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click <em>I forgot my password</em>. Follow the instructions and you should be able to log in again shortly.<br />However, if you are not able to reset your password, contact a board administrator.',
 	),
 	array(
 		0 => 'Why do I get logged off automatically?',
-		1 => 'If you do not check the <em>Remember me</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the <em>Remember me</em> box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.',
+		1 => 'If you do not check the <em>Remember me</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the <em>Remember me</em> box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means a board administrator has disabled this feature.',
 	),
 	array(
 		0 => 'What does the “Delete all board cookies” do?',
-		1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board administrator. If you are having login or logout problems, deleting board cookies may help.',
+		1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. They also provide functions such as read tracking if they have been enabled by a board administrator. If you are having login or logout problems, deleting board cookies may help.',
 	),
 	array(
 		0 => '--',
@@ -93,10 +93,10 @@ $help = array(
 	),
 	array(
 		0 => 'My language is not in the list!',
-		1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the <a href="https://www.phpbb.com/">phpBB</a>&reg; website.',
+		1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking a board administrator if he can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the <a href="https://www.phpbb.com/">phpBB</a>&reg; website.',
 	),
 	array(
-		0 => 'What do the images next to my username?',
+		0 => 'What are the images next to my username?',
 		1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user.',
 	),
 	array(
@@ -116,8 +116,8 @@ $help = array(
 		1 => 'Posting Issues'
 	),
 	array(
-		0 => 'How do I post a topic in a forum?',
-		1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can post attachments, etc.',
+		0 => 'How do I create a new topic in a forum or reply to any of them?',
+		1 => 'Click the button “New Topic” on the forum screen or “Post Reply” on the topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum screen. Example: You can post new topics, You can post attachments, etc.',
 	),
 	array(
 		0 => 'How do I edit or delete a post?',
@@ -306,11 +306,11 @@ $help = array(
 	),
 	array(
 		0 => 'What is the difference between bookmarking and subscribing?',
-		1 => 'In phpBB 3.0, bookmarking topics worked much like bookmarking in a web browser. You were not alerted when there was an update. As of phpBB 3.1, bookmarking is more like subscribing to a topic. You can be notified when a bookmarked topic is updated. Subscribing, however, will notify you when there is an update to a topic or forum on the board. Notification options for bookmarks and subscriptions can be configured in the User Control Panel.',
+		1 => 'In phpBB 3.0, bookmarking topics worked much like bookmarking in a web browser. You were not alerted when there was an update. As of phpBB 3.1, bookmarking is more like subscribing to a topic. You can be notified when a bookmarked topic is updated. Subscribing, however, will notify you when there is an update to a topic or forum on the board. Notification options for bookmarks and subscriptions can be configured in the User Control Panel, under “Board preferences”.',
 	),
 	array(
 		0 => 'How do I bookmark or subscribe to specific topics?',
-		1 => 'You can bookmark or subscribe to a specific topic by clicking the appropriate link in the “Topic tools” menu, conveniently located near the top and bottom of a topic discussion.<br />You can also subscribe, not bookmark, to a topic by replying to a topic and checking the “Notify me when a reply is posted” checkbox.',
+		1 => 'You can add bookmark or subscribe to a specific topic by clicking the appropriate link in the “Topic tools” menu, conveniently located near the top and bottom of a topic discussion.<br />Replying to a topic with the “Notify me when a reply is posted” option checked will also subscribe you to the topic.',
 	),
 	array(
 		0 => 'How do I subscribe to specific forums?',
-- 
cgit v1.2.1


From e7ad87e15fc0ff88c88797c2817f901c3c606ca4 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 18 Oct 2014 12:32:39 -0400
Subject: [ticket/13181] Replace database credentials with placeholders in
 sphinx conf

PHPBB3-13181
---
 phpBB/language/en/acp/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 564d9dd04c..98412cb050 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -83,7 +83,7 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_PORT_EXPLAIN'			=> 'Port on which the sphinx search daemon (searchd) listens. Leave empty to use the default Sphinx API port 9312',
 	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx search for phpBB supports MySQL and PostgreSQL only.',
 	'FULLTEXT_SPHINX_CONFIG_FILE'			=> 'Sphinx config file',
-	'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'	=> 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon.',
+	'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'	=> 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon. Replace the [dbuser] and [dbpassword] placeholders with your database credentials.',
 	'FULLTEXT_SPHINX_NO_CONFIG_DATA'		=> 'The sphinx data and config directory paths are not defined. Please define them to generate the config file.',
 
 	'GENERAL_SEARCH_SETTINGS'				=> 'General search settings',
-- 
cgit v1.2.1


From 4b99ab70667c9aed0ba15943b53e1379eef3a86e Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 21 Oct 2014 09:54:25 -0700
Subject: [ticket/13041] Final grammar and language changes to help_faq

PHPBB3-13041
---
 phpBB/language/en/help_faq.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 0327fc36eb..69cb70df62 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -41,7 +41,7 @@ $help = array(
 	),
 	array(
 		0 => 'What is COPPA?',
-		1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that phpBB Limited and the owner’s of this board cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.',
+		1 => 'COPPA, or the Children’s Online Privacy Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that phpBB Limited and the owner’s of this board cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.',
 	),
 	array(
 		0 => 'Why can’t I register?',
@@ -69,7 +69,7 @@ $help = array(
 	),
 	array(
 		0 => 'What does the “Delete all board cookies” do?',
-		1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. They also provide functions such as read tracking if they have been enabled by a board administrator. If you are having login or logout problems, deleting board cookies may help.',
+		1 => '“Delete all board cookies” deletes the cookies created by phpBB which keep you authenticated and logged into the board. Cookies also provide functions such as read tracking if they have been enabled by a board administrator. If you are having login or logout problems, deleting board cookies may help.',
 	),
 	array(
 		0 => '--',
@@ -81,7 +81,7 @@ $help = array(
 	),
 	array(
 		0 => 'How do I prevent my username appearing in the online user listings?',
-		1 => 'Within your User Control Panel, under “Board preferences”, you will find the option <em>Hide your online status</em>. Enable this option with <samp>Yes</samp> and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.'
+		1 => 'Within your User Control Panel, under “Board preferences”, you will find the option <em>Hide your online status</em>. Enable this option and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.'
 	),
 	array(
 		0 => 'The times are not correct!',
@@ -93,11 +93,11 @@ $help = array(
 	),
 	array(
 		0 => 'My language is not in the list!',
-		1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking a board administrator if he can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the <a href="https://www.phpbb.com/">phpBB</a>&reg; website.',
+		1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking a board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the <a href="https://www.phpbb.com/">phpBB</a>&reg; website.',
 	),
 	array(
 		0 => 'What are the images next to my username?',
-		1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually a larger image, is known as an avatar and is generally unique or personal to each user.',
+		1 => 'There are two images which may appear along with a username when viewing posts. One of them may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. Another, usually larger, image is known as an avatar and is generally unique or personal to each user.',
 	),
 	array(
 		0 => 'How do I display an avatar?',
@@ -116,8 +116,8 @@ $help = array(
 		1 => 'Posting Issues'
 	),
 	array(
-		0 => 'How do I create a new topic in a forum or reply to any of them?',
-		1 => 'Click the button “New Topic” on the forum screen or “Post Reply” on the topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum screen. Example: You can post new topics, You can post attachments, etc.',
+		0 => 'How do I create a new topic or post a reply?',
+		1 => 'To post a new topic in a forum, click "New Topic". To post a reply to a topic, click "Post Reply". You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can post attachments, etc.',
 	),
 	array(
 		0 => 'How do I edit or delete a post?',
@@ -310,7 +310,7 @@ $help = array(
 	),
 	array(
 		0 => 'How do I bookmark or subscribe to specific topics?',
-		1 => 'You can add bookmark or subscribe to a specific topic by clicking the appropriate link in the “Topic tools” menu, conveniently located near the top and bottom of a topic discussion.<br />Replying to a topic with the “Notify me when a reply is posted” option checked will also subscribe you to the topic.',
+		1 => 'You can bookmark or subscribe to a specific topic by clicking the appropriate link in the “Topic tools” menu, conveniently located near the top and bottom of a topic discussion.<br />Replying to a topic with the “Notify me when a reply is posted” option checked will also subscribe you to the topic.',
 	),
 	array(
 		0 => 'How do I subscribe to specific forums?',
@@ -338,7 +338,7 @@ $help = array(
 	),
 	array(
 		0 => 'Who wrote this bulletin board?',
-		1 => 'This software (in its unmodified form) is produced, released and is copyright <a href="https://www.phpbb.com/">phpBB Limited</a>. It is made available under the GNU General Public License, version 2 (GPL-2.0) and may be freely distributed. See the link for more details.',
+		1 => 'This software (in its unmodified form) is produced, released and is copyright <a href="https://www.phpbb.com/">phpBB Limited</a>. It is made available under the GNU General Public License, version 2 (GPL-2.0) and may be freely distributed. See <a href="https://www.phpbb.com/about/">About phpBB</a> for more details.',
 	),
 	array(
 		0 => 'Why isn’t X feature available?',
-- 
cgit v1.2.1


From 48dc4c02ae097258f8b4a9c39c38580d29b640f3 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Wed, 22 Oct 2014 18:02:43 -0400
Subject: [ticket/13205] Add a mark all messages read link to PM folders

PHPBB3-13205
---
 phpBB/language/en/ucp.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index ad7063d3f9..07751d1f7f 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -417,6 +417,8 @@ $lang = array_merge($lang, array(
 	'PM_FROM_REMOVED_AUTHOR'	=> 'This message was sent by a user no longer registered.',
 	'PM_ICON'					=> 'PM icon',
 	'PM_INBOX'					=> 'Inbox',
+	'PM_MARK_ALL_READ'			=> 'Mark all messages read',
+	'PM_MARK_ALL_READ_SUCCESS'	=> 'All private messages in this folder have been marked read',
 	'PM_NO_USERS'				=> 'The requested users to be added do not exist.',
 	'PM_OUTBOX'					=> 'Outbox',
 	'PM_SENTBOX'				=> 'Sent messages',
-- 
cgit v1.2.1


From 8bdbadabb23c0288ddb9af60c9883b6021d2c239 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@gmail.com>
Date: Sat, 1 Nov 2014 10:53:57 -0500
Subject: [ticket/13267] Update Automatic Update instructions to include vendor
 directory

PHPBB3-13267
---
 phpBB/language/en/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index a2b27f0a60..107de9c64f 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -547,7 +547,7 @@ $lang = array_merge($lang, array(
 		<ul style="margin-left: 20px; font-size: 1.1em;">
 			<li>Go to the <a href="https://www.phpbb.com/downloads/" title="https://www.phpbb.com/downloads/">phpBB.com downloads page</a> and download the "Automatic Update Package" archive.<br /><br /></li>
 			<li>Unpack the archive.<br /><br /></li>
-			<li>Upload the complete uncompressed install folder to your phpBB root directory (where your config.php file is).<br /><br /></li>
+			<li>Upload the complete uncompressed "install" and "vendor" folders to your phpBB root directory (where your config.php file is).<br /><br /></li>
 		</ul>
 
 		<p>Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.<br /><br />
-- 
cgit v1.2.1


From b32dc8c667b58e6cf6c481af734c8677d7211047 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Tue, 4 Nov 2014 18:22:46 +0100
Subject: [ticket/13284] Fix request name so users can cc themselves

PHPBB3-13284
---
 phpBB/language/en/memberlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index b8c626d331..5605f8f4b5 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -48,7 +48,7 @@ $lang = array_merge($lang, array(
 
 	'BEFORE'				=> 'Before',
 
-	'CC_EMAIL'				=> 'Send a copy of this email to yourself.',
+	'CC_SENDER'				=> 'Send a copy of this email to yourself.',
 	'CONTACT_ADMIN'			=> 'Contact a Board Administrator',
 
 	'DEST_LANG'				=> 'Language',
-- 
cgit v1.2.1


From 25a7c6e829bfa70997dd2bcca483cf40a475db54 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Wed, 5 Nov 2014 21:16:04 +0100
Subject: [ticket/13083] Fix language string NO_ENTRIES for logs

The string was misleading because there does not
always have to be a period when viewing log entries.

PHPBB3-13083
---
 phpBB/language/en/mcp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index bc0fd03520..a961068657 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -237,7 +237,7 @@ $lang = array_merge($lang, array(
 	'NOT_MODERATOR'					=> 'You are not a moderator of this forum.',
 	'NO_DESTINATION_FORUM'			=> 'Please select a forum for destination.',
 	'NO_DESTINATION_FORUM_FOUND'	=> 'There is no destination forum available.',
-	'NO_ENTRIES'					=> 'No log entries for this period.',
+	'NO_ENTRIES'					=> 'No log entries.',
 	'NO_FEEDBACK'					=> 'No feedback exists for this user.',
 	'NO_FINAL_TOPIC_SELECTED'		=> 'You have to select a destination topic for merging posts.',
 	'NO_MATCHES_FOUND'				=> 'No matches found.',
-- 
cgit v1.2.1


From f930a754717f0b6e6a2c991065a1c148a29bf660 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Fri, 21 Nov 2014 23:18:42 +0100
Subject: [ticket/13357] Adds missing LOG_MOVED_TOPIC for 3.0.12 left-over
 entries

PHPBB3-13357
---
 phpBB/language/en/acp/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 91fc1215fc..fdbc4aebd0 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -558,6 +558,7 @@ $lang = array_merge($lang, array(
 	'LOG_LOCK_POST'				=> '<strong>Locked post</strong><br />» %s',
 	'LOG_MERGE'					=> '<strong>Merged posts</strong> into topic<br />» %s',
 	'LOG_MOVE'					=> '<strong>Moved topic</strong><br />» from %1$s to %2$s',
+	'LOG_MOVED_TOPIC'			=> '<strong>Moved topic</strong><br />» %s',
 	'LOG_PM_REPORT_CLOSED'		=> '<strong>Closed PM report</strong><br />» %s',
 	'LOG_PM_REPORT_DELETED'		=> '<strong>Deleted PM report</strong><br />» %s',
 	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br />» %s',
-- 
cgit v1.2.1


From 7f8c4d877a9d9d5837e1b3612b2678d024ca087b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 29 Oct 2014 17:44:42 +0100
Subject: [ticket/10744] Prevent installing styles with reserved names

PHPBB3-10744
---
 phpBB/language/en/acp/styles.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 506d569d56..e6b05c8282 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -74,6 +74,7 @@ $lang = array_merge($lang, array(
 	'STYLE_INSTALLED_RETURN_INSTALLED_STYLES'	=> 'Return to installed styles list',
 	'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES'	=> 'Install more styles',
 	'STYLE_NAME'				=> 'Style name',
+	'STYLE_NAME_RESERVED'		=> 'Style "%s" can not be installed, because the name is reserved.',
 	'STYLE_NOT_INSTALLED'		=> 'Style "%s" was not installed.',
 	'STYLE_PATH'				=> 'Style path',
 	'STYLE_UNINSTALL'			=> 'Uninstall',
-- 
cgit v1.2.1


From 86b3c54c772e78ce5de4e9cb2bf4a90b54c1dfee Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Sat, 22 Nov 2014 11:56:52 +0100
Subject: [ticket/11033] Update string to reflect real requirements

PHPBB3-11033
---
 phpBB/language/en/acp/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 98412cb050..bda965b615 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -84,7 +84,7 @@ $lang = array_merge($lang, array(
 	'FULLTEXT_SPHINX_WRONG_DATABASE'		=> 'The sphinx search for phpBB supports MySQL and PostgreSQL only.',
 	'FULLTEXT_SPHINX_CONFIG_FILE'			=> 'Sphinx config file',
 	'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'	=> 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon. Replace the [dbuser] and [dbpassword] placeholders with your database credentials.',
-	'FULLTEXT_SPHINX_NO_CONFIG_DATA'		=> 'The sphinx data and config directory paths are not defined. Please define them to generate the config file.',
+	'FULLTEXT_SPHINX_NO_CONFIG_DATA'		=> 'The sphinx data directory path is not defined. Please define the path and submit to generate the config file.',
 
 	'GENERAL_SEARCH_SETTINGS'				=> 'General search settings',
 	'GO_TO_SEARCH_INDEX'					=> 'Go to search index page',
-- 
cgit v1.2.1


From dfbc109b59a63c25cda9df4d6ab4e476760b1308 Mon Sep 17 00:00:00 2001
From: kochi <kochi@centrum.cz>
Date: Sat, 29 Nov 2014 12:53:30 +0100
Subject: [ticket/13400] Information text if the server load id high at search

PHPBB3-13400
---
 phpBB/language/en/search.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index ec5dd99eb8..13e5bf7a97 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -71,6 +71,7 @@ $lang = array_merge($lang, array(
 	'NO_RECENT_SEARCHES'	=> 'No searches have been carried out recently.',
 	'NO_SEARCH'				=> 'Sorry but you are not permitted to use the search system.',
 	'NO_SEARCH_RESULTS'		=> 'No suitable matches were found.',
+	'NO_SEARCH_LOAD'		=> 'Sorry but you cannot use search at this time. The server has high load. Please try again later.',
 	'NO_SEARCH_TIME'		=> array(
 		1	=> 'Sorry but you cannot use search at this time. Please try again in %d second.',
 		2	=> 'Sorry but you cannot use search at this time. Please try again in %d seconds.',
-- 
cgit v1.2.1


From bb4b3d273168657c664f1bc527d60b7b281ad607 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 9 Dec 2014 17:06:38 -0800
Subject: [ticket/13302] Update documentation and support forum links to 3.1
 versions.

PHPBB3-13302
---
 phpBB/language/en/acp/permissions.php | 2 +-
 phpBB/language/en/install.php         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 8654a9e88c..1ade2d6eb8 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -54,7 +54,7 @@ $lang = array_merge($lang, array(
 
 		<br />
 
-		<p>For further information on setting up and managing permissions on your phpBB3 board, please see <a href="https://www.phpbb.com/support/documentation/3.0/quickstart/quick_permissions.html">Chapter 1.5 of our Quick Start Guide</a>.</p>
+		<p>For further information on setting up and managing permissions on your phpBB3 board, please see the section on <a href="https://www.phpbb.com/support/docs/en/3.1/ug/quickstart/permissions/">Setting permissions of our Quick Start Guide</a>.</p>
 	',
 
 	'ACL_NEVER'				=> 'Never',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 107de9c64f..dd22e84fcb 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -80,7 +80,7 @@ $lang = array_merge($lang, array(
 	'CONTINUE_OLD_CONVERSION'	=> 'Continue previously started conversion',
 	'CONVERT'					=> 'Convert',
 	'CONVERT_COMPLETE'			=> 'Conversion completed',
-	'CONVERT_COMPLETE_EXPLAIN'	=> 'You have now successfully converted your board to phpBB 3.1. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="https://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=46">support forums</a>.',
+	'CONVERT_COMPLETE_EXPLAIN'	=> 'You have now successfully converted your board to phpBB 3.1. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="https://www.phpbb.com/support/docs/en/3.1/ug/">Documentation</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=466">support forums</a>.',
 	'CONVERT_INTRO'				=> 'Welcome to the phpBB Unified Convertor Framework',
 	'CONVERT_INTRO_BODY'		=> 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.',
 	'CONVERT_NEW_CONVERSION'	=> 'New conversion',
@@ -192,7 +192,7 @@ $lang = array_merge($lang, array(
 		<h2>Convert an existing board to phpBB3</h2>
 		<p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed to the convertor</a>.</p>
 		<h2>Go live with your phpBB3!</h2>
-		<p>Clicking the button below will take you to a form for submitting statistical data to phpBB in your Administration Control Panel (ACP). We would appreciate it if you could help us by sending that information. Afterwards you should take some time to examine the options available to you. Remember that help is available online via the <a href="https://www.phpbb.com/support/documentation/3.0/">Documentation</a>, <a href="%3$s">README</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=46">Support Forums</a>.</p><p><strong>Please delete, move or rename the install directory before using your board. While this directory exists, only the Administration Control Panel (ACP) will be accessible.</strong>',
+		<p>Clicking the button below will take you to a form for submitting statistical data to phpBB in your Administration Control Panel (ACP). We would appreciate it if you could help us by sending that information. Afterwards you should take some time to examine the options available to you. Remember that help is available online via the <a href="https://www.phpbb.com/support/docs/en/3.1/ug/">Documentation</a>, <a href="%3$s">README</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=466">Support Forums</a>.</p><p><strong>Please delete, move or rename the install directory before using your board. While this directory exists, only the Administration Control Panel (ACP) will be accessible.</strong>',
 	'INSTALL_INTRO'				=> 'Welcome to Installation',
 
 	'INSTALL_INTRO_BODY'		=> 'With this option, it is possible to install phpBB3 onto your server.</p><p>In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p>
@@ -274,7 +274,7 @@ $lang = array_merge($lang, array(
 	'MAKE_FOLDER_WRITABLE'		=> 'Please make sure that this folder exists and is writable by the webserver then try again:<br />»<strong>%s</strong>.',
 	'MAKE_FOLDERS_WRITABLE'		=> 'Please make sure that these folders exist and are writable by the webserver then try again:<br />»<strong>%s</strong>.',
 
-	'MYSQL_SCHEMA_UPDATE_REQUIRED'	=> 'Your MySQL database schema for phpBB is outdated. phpBB detected a schema for MySQL 3.x/4.x, but the server runs on MySQL %2$s.<br /><strong>Before you proceed the update, you need to upgrade the schema.</strong><br /><br />Please refer to the <a href="https://www.phpbb.com/kb/article/doesnt-have-a-default-value-errors/">Knowledge Base article about upgrading the MySQL schema</a>. If you encounter problems, please use <a href="https://www.phpbb.com/community/viewforum.php?f=46">our support forums</a>.',
+	'MYSQL_SCHEMA_UPDATE_REQUIRED'	=> 'Your MySQL database schema for phpBB is outdated. phpBB detected a schema for MySQL 3.x/4.x, but the server runs on MySQL %2$s.<br /><strong>Before you proceed the update, you need to upgrade the schema.</strong><br /><br />Please refer to the <a href="https://www.phpbb.com/kb/article/doesnt-have-a-default-value-errors/">Knowledge Base article about upgrading the MySQL schema</a>. If you encounter problems, please use <a href="https://www.phpbb.com/community/viewforum.php?f=466">our support forums</a>.',
 
 	'NAMING_CONFLICT'			=> 'Naming conflict: %s and %s are both aliases<br /><br />%s',
 	'NEXT_STEP'					=> 'Proceed to next step',
@@ -345,7 +345,7 @@ $lang = array_merge($lang, array(
 	'SUB_LICENSE'				=> 'License',
 	'SUB_SUPPORT'				=> 'Support',
 	'SUCCESSFUL_CONNECT'		=> 'Successful connection',
-	'SUPPORT_BODY'				=> 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="https://www.phpbb.com/community/viewforum.php?f=486">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>Extensions / Styles</h2><p>For issues relating to Extensions, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=451">Extensions Forum</a>.<br />For issues relating to styles, templates and themes, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=471">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="https://www.phpbb.com/community/viewtopic.php?f=14&amp;t=571070">The phpBB Welcome Package</a><br /><a href="https://www.phpbb.com/support/">Support Section</a><br /><a href="https://www.phpbb.com/support/documentation/3.1/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, why not <a href="https://www.phpbb.com/support/">subscribe to our mailing list</a>?<br /><br />',
+	'SUPPORT_BODY'				=> 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="https://www.phpbb.com/community/viewforum.php?f=486">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>Extensions / Styles</h2><p>For issues relating to Extensions, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=451">Extensions Forum</a>.<br />For issues relating to styles, templates and themes, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=471">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="https://www.phpbb.com/community/viewtopic.php?f=14&amp;t=571070">The phpBB Welcome Package</a><br /><a href="https://www.phpbb.com/support/">Support Section</a><br /><a href="https://www.phpbb.com/support/docs/en/3.1/ug/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, why not <a href="https://www.phpbb.com/support/">subscribe to our mailing list</a>?<br /><br />',
 	'SYNC_FORUMS'				=> 'Starting to synchronise forums',
 	'SYNC_POST_COUNT'			=> 'Synchronising post_counts',
 	'SYNC_POST_COUNT_ID'		=> 'Synchronising post_counts from <var>entry</var> %1$s to %2$s.',
-- 
cgit v1.2.1


From e1eac80b8f0dd62ef2f8c48a863dbe50458e75c5 Mon Sep 17 00:00:00 2001
From: n-aleha <nick_aleha@myway.com>
Date: Sat, 7 Feb 2015 19:33:19 +0200
Subject: [ticket/13586] Allow '0' as username with Jabber notifications

PHPBB3-13586
---
 phpBB/language/en/email/short/newtopic_notify.txt | 2 +-
 phpBB/language/en/email/short/topic_notify.txt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt
index bf6799e5be..5089e7dcb8 100644
--- a/phpBB/language/en/email/short/newtopic_notify.txt
+++ b/phpBB/language/en/email/short/newtopic_notify.txt
@@ -2,7 +2,7 @@ Subject: New topic notification - "{FORUM_NAME}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
+You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
 
 {U_FORUM}
 
diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt
index 472375fb22..529478eae2 100644
--- a/phpBB/language/en/email/short/topic_notify.txt
+++ b/phpBB/language/en/email/short/topic_notify.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
 
 If you want to view the newest post made since your last visit, click the following link:
 {U_NEWEST_POST}
-- 
cgit v1.2.1


From ec8aeaf2cd6cd50a60bd164324235d2f9132d12d Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Mon, 16 Feb 2015 20:27:52 +0100
Subject: [ticket/13618] Fix typo in English FAQ

PHPBB3-13618
---
 phpBB/language/en/help_faq.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 69cb70df62..8f08ac1cd3 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -41,7 +41,7 @@ $help = array(
 	),
 	array(
 		0 => 'What is COPPA?',
-		1 => 'COPPA, or the Children’s Online Privacy Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that phpBB Limited and the owner’s of this board cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.',
+		1 => 'COPPA, or the Children’s Online Privacy Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that phpBB Limited and the owners of this board cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined in question “Who do I contact about abusive and/or legal matters related to this board?”.',
 	),
 	array(
 		0 => 'Why can’t I register?',
-- 
cgit v1.2.1


From 60f31d48e2dd3f2b698987cb55c9d27fc6a80424 Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Wed, 15 Apr 2015 06:17:29 -0400
Subject: [ticket/13763] Fix typo in extension lang file

PHPBB3-13763
---
 phpBB/language/en/acp/extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 28cdc8829d..bacb33c70a 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -75,7 +75,7 @@ $lang = array_merge($lang, array(
 			<li>Upload the new files</li>
 			<li>Enable the extension</li>
 		</ol>',
-	'EXTENSION_REMOVE_HEADLINE'	=> 'Completly removing an extension from your board',
+	'EXTENSION_REMOVE_HEADLINE'	=> 'Completely removing an extension from your board',
 	'EXTENSION_REMOVE_EXPLAIN'	=> '<ol>
 			<li>Disable the extension</li>
 			<li>Delete the extension’s data</li>
-- 
cgit v1.2.1


From 281661c23e2c7627dbd7fe45bb0d68b3afe2eaaa Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 26 Apr 2015 20:57:56 -0700
Subject: [ticket/13778] Update wording of the reCaptcha instructions

PHPBB3-13778
---
 phpBB/language/en/captcha_recaptcha.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php
index 18438ab53e..df2ad4e51b 100644
--- a/phpBB/language/en/captcha_recaptcha.php
+++ b/phpBB/language/en/captcha_recaptcha.php
@@ -47,6 +47,6 @@ $lang = array_merge($lang, array(
 	'RECAPTCHA_PRIVATE'				=> 'Private reCaptcha key',
 	'RECAPTCHA_PRIVATE_EXPLAIN'		=> 'Your private reCaptcha key. Keys can be obtained on <a href="http://www.google.com/recaptcha">www.google.com/recaptcha</a>.',
 
-	'RECAPTCHA_EXPLAIN'				=> 'In an effort to prevent automatic submissions, we require that you enter both of the words displayed into the text field underneath.',
+	'RECAPTCHA_EXPLAIN'				=> 'In an effort to prevent automatic submissions, we require that you type the text displayed into the field underneath.',
 	'RECAPTCHA_SOCKET_ERROR'		=> 'There was a problem connecting to the RECAPTCHA service: could not open socket. Try again later.',
 ));
-- 
cgit v1.2.1


From c818873d48985839f8d9b66b39e89c4406f3bcce Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 28 Apr 2015 00:02:42 -0700
Subject: [ticket/11521] Add missing lang strings for migration exceptions

PHPBB3-11521
---
 phpBB/language/en/migrator.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index f5a56816c2..244a5faadf 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -52,6 +52,13 @@ $lang = array_merge($lang, array(
 	'MIGRATION_SCHEMA_DONE'				=> 'Installed Schema: %1$s; Time: %2$.2f seconds',
 	'MIGRATION_SCHEMA_RUNNING'			=> 'Installing Schema: %s.',
 
+	'MIGRATION_INVALID_DATA_MISSING_CONDITION'		=> 'A migration is invalid. An if statement helper is missing a condition.',
+	'MIGRATION_INVALID_DATA_MISSING_STEP'			=> 'A migration is invalid. An if statement helper is missing a valid call to a migration step.',
+	'MIGRATION_INVALID_DATA_CUSTOM_NOT_CALLABLE'	=> 'A migration is invalid. A custom callable function could not be called.',
+	'MIGRATION_INVALID_DATA_UNKNOWN_TYPE'			=> 'A migration is invalid. An unknown migration tool type was encountered.',
+	'MIGRATION_INVALID_DATA_UNDEFINED_TOOL'			=> 'A migration is invalid. An undefined migration tool was encountered.',
+	'MIGRATION_INVALID_DATA_UNDEFINED_METHOD'		=> 'A migration is invalid. An undefined migration tool method was encountered.',
+
 	'MODULE_ERROR'						=> 'An error occurred while creating a module: %s',
 	'MODULE_INFO_FILE_NOT_EXIST'		=> 'A required module info file is missing: %2$s',
 	'MODULE_NOT_EXIST'					=> 'A required module does not exist: %s',
-- 
cgit v1.2.1


From a620651ca1fbd9eb42bfbe9e5d093a2a92590548 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 6 Jun 2015 10:30:09 -0700
Subject: [ticket/13818] Add browse CDB links to ext style lang management

PHPBB3-13818
---
 phpBB/language/en/acp/extensions.php | 8 ++++++++
 phpBB/language/en/acp/language.php   | 2 ++
 phpBB/language/en/acp/styles.php     | 2 ++
 3 files changed, 12 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index bacb33c70a..e5d6789764 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -68,6 +68,12 @@ $lang = array_merge($lang, array(
 	'EXTENSION_NAME'			=> 'Extension Name',
 	'EXTENSION_ACTIONS'			=> 'Actions',
 	'EXTENSION_OPTIONS'			=> 'Options',
+	'EXTENSION_INSTALL_HEADLINE'=> 'Installing an extension',
+	'EXTENSION_INSTALL_EXPLAIN'	=> '<ol>
+			<li>Download an extension from phpBB’s extensions database</li>
+			<li>Unzip the extension and upload it to the <samp>ext/</samp> directory of your phpBB board</li>
+			<li>Enable the extension, here in the Extensions manager</li>
+		</ol>',
 	'EXTENSION_UPDATE_HEADLINE'	=> 'Updating an extension',
 	'EXTENSION_UPDATE_EXPLAIN'	=> '<ol>
 			<li>Disable the extension</li>
@@ -119,6 +125,8 @@ $lang = array_merge($lang, array(
 	'FORCE_UNSTABLE'					=> 'Always check for unstable versions',
 	'EXTENSIONS_VERSION_CHECK_SETTINGS'	=> 'Version check settings',
 
+	'BROWSE_EXTENSIONS_DATABASE'		=> 'Browse extensions database',
+
 	'META_FIELD_NOT_SET'	=> 'Required meta field %s has not been set.',
 	'META_FIELD_INVALID'	=> 'Meta field %s is invalid.',
 ));
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index f46e78efd4..d14491ae75 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -73,4 +73,6 @@ $lang = array_merge($lang, array(
 	'THOSE_MISSING_LANG_VARIABLES'		=> 'The following language variables are missing from the “%s” language pack',
 
 	'UNINSTALLED_LANGUAGE_PACKS'	=> 'Uninstalled language packs',
+
+	'BROWSE_LANGUAGE_PACKS_DATABASE'	=> 'Browse language packs database',
 ));
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index e6b05c8282..0d91eb3704 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -83,4 +83,6 @@ $lang = array_merge($lang, array(
 	'STYLE_USED_BY'				=> 'Used by (including robots)',
 
 	'UNINSTALL_DEFAULT'		=> 'You cannot uninstall the default style.',
+
+	'BROWSE_STYLES_DATABASE'	=> 'Browse styles database',
 ));
-- 
cgit v1.2.1


From 8bb48b575df3a952606a1fb4a0aaf68882766ec8 Mon Sep 17 00:00:00 2001
From: Zoddo <zoddo.ino@gmail.com>
Date: Fri, 26 Jun 2015 14:53:05 +0200
Subject: [ticket/13967] Use HTTPS on phpbb.com links

This fix the HTTPS breaking issue on the BBCode FAQ.

PHPBB3-13967
---
 phpBB/language/en/help_bbcode.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index 0a8d30581a..989e5fc26e 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -90,7 +90,7 @@ $help = array(
 	),
 	array(
 		0 => 'Linking to another site',
-		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
+		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=https://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="https://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>https://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="https://www.phpbb.com/">https://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading https://. For example typing www.phpbb.com into your message will automatically lead to <a href="https://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=https://www.phpbb.com/][img]</strong>https://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
 	),
 	array(
 		0 => '--',
@@ -98,7 +98,7 @@ $help = array(
 	),
 	array(
 		0 => 'Adding an image to a post',
-		1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br /><br /><strong>[img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img]</strong><br /><br />As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br /><br /><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="http://www.phpbb.com/"><img src="http://www.phpbb.com/theme/images/logos/blue/160x52.png" alt="" /></a>'
+		1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br /><br /><strong>[img]</strong>https://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img]</strong><br /><br />As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br /><br /><strong>[url=https://www.phpbb.com/][img]</strong>https://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="https://www.phpbb.com/"><img src="https://www.phpbb.com/theme/images/logos/blue/160x52.png" alt="" /></a>'
 	),
 	array(
 		0 => 'Adding attachments into a post',
-- 
cgit v1.2.1


From 13851f308f57e0cda4c24f9a9a186aac912213d1 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 23 Aug 2015 15:14:08 -0700
Subject: [ticket/14123] Add descriptive help to the CLI help output

PHPBB3-14123
---
 phpBB/language/en/cli.php | 82 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 81 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index 0e7dc39b95..11d45646f8 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -54,7 +54,7 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_DELETE_CONFIG'				=> 'Deletes a configuration option',
 	'CLI_DESCRIPTION_DISABLE_EXTENSION'			=> 'Disables the specified extension.',
 	'CLI_DESCRIPTION_ENABLE_EXTENSION'			=> 'Enables the specified extension.',
-	'CLI_DESCRIPTION_FIND_MIGRATIONS'			=> 'Finds migrations that are not depended on.',
+	'CLI_DESCRIPTION_FIND_MIGRATIONS'			=> 'Finds migrations that are not depended upon.',
 	'CLI_DESCRIPTION_GET_CONFIG'				=> 'Gets a configuration option’s value',
 	'CLI_DESCRIPTION_INCREMENT_CONFIG'			=> 'Increments a configuration option’s value',
 	'CLI_DESCRIPTION_LIST_EXTENSIONS'			=> 'Lists all extensions in the database and on the filesystem.',
@@ -65,6 +65,86 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_SET_ATOMIC_CONFIG'			=> 'Sets a configuration option’s value only if the old matches the current value',
 	'CLI_DESCRIPTION_SET_CONFIG'				=> 'Sets a configuration option’s value',
 
+	'CLI_HELP_PURGE_CACHE'				=> 'The <info>%command.name%</info> command allows you to purge the board’s cache.
+
+ <info>php %command.full_name%</info>
+',
+	'CLI_HELP_DELETE_CONFIG'			=> 'The <info>%command.name%</info> command deletes a configuration option. The key name is required.
+
+ <info>php %command.full_name% config_key</info>
+',
+	'CLI_HELP_GET_CONFIG'				=> 'The <info>%command.name%</info> command gets a configuration option’s value. The key name is required.
+
+ <info>php %command.full_name% config_key</info>
+',
+	'CLI_HELP_INCREMENT_CONFIG'			=> 'The <info>%command.name%</info> command increments an integer configuration option’s value. The key name and increment amount are required.
+
+ <info>php %command.full_name% config_key 1</info>
+
+If the configuration option changes too frequently to be efficiently cached, use the <info>--dynamic</info> or <info>-d</info> option:
+
+ <info>php %command.full_name% config_key 1 --dynamic</info>
+ <info>php %command.full_name% config_key 1 -d</info>
+',
+	'CLI_HELP_SET_CONFIG'				=> 'The <info>%command.name%</info> sets a configuration option’s value. The key name and value are required.
+
+ <info>php %command.full_name% config_key foo</info>
+
+If the configuration option changes too frequently to be efficiently cached, use the <info>--dynamic</info> or <info>-d</info> option:
+
+ <info>php %command.full_name% config_key foo --dynamic</info>
+ <info>php %command.full_name% config_key foo -d</info>
+',
+	'CLI_HELP_SET_ATOMIC_CONFIG'		=> 'The <info>%command.name%</info> command sets a configuration option’s value only if the old value matches the current value or the configuration value does not exist yet. The key name, old and new values are required.
+
+ <info>php %command.full_name% config_name foo bar</info>
+
+If the configuration option changes too frequently to be efficiently cached, use the <info>--dynamic</info> or <info>-d</info> option:
+
+ <info>php %command.full_name% config_key foo bar --dynamic</info>
+ <info>php %command.full_name% config_key foo bar -d</info>
+',
+	'CLI_HELP_CRON_LIST'				=> 'The <info>%command.name%</info> command prints a list of ready and unready cron jobs.
+
+ <info>php %command.full_name%</info>
+',
+	'CLI_HELP_CRON_RUN'					=> 'The <info>%command.name%</info> command runs all ready cron tasks.
+
+ <info>php %command.full_name%</info>
+
+Optionally you can specify a cron task name to run only the specified cron task:
+
+ <info>php %command.full_name% task_name</info>
+',
+	'CLI_HELP_DB_MIGRATE'				=> 'The <info>%command.name%</info> command updates the database by applying available migrations.
+
+ <info>php %command.full_name%</info>
+',
+	'CLI_HELP_FIND_MIGRATIONS'			=> 'The <info>%command.name%</info> command finds migrations that are not depended upon.
+
+ <info>php %command.full_name%</info>
+',
+	'CLI_HELP_DISABLE_EXTENSION'		=> 'The <info>%command.name%</info> command disables the specified extension. The extension name is required.
+
+ <info>php %command.full_name% vendor_name/package_name</info>
+',
+	'CLI_HELP_ENABLE_EXTENSION'			=> 'The <info>%command.name%</info> command enables the specified extension. The extension name is required.
+
+ <info>php %command.full_name% vendor_name/package_name</info>
+',
+	'CLI_HELP_PURGE_EXTENSION'			=> 'The <info>%command.name%</info> command purges the specified extension. The extension name is required.
+
+ <info>php %command.full_name% vendor_name/package_name</info>
+',
+	'CLI_HELP_LIST_EXTENSIONS'			=> 'The <info>%command.name%</info> command lists all extensions in the database and on the filesystem.
+
+ <info>php %command.full_name%</info>
+',
+	'CLI_HELP_RECALCULATE_EMAIL_HASH'	=> 'The <info>%command.name%</info> command recalculates the user_email_hash column of the users table.
+
+ <info>php %command.full_name%</info>
+',
+
 	'CLI_EXTENSION_DISABLE_FAILURE'		=> 'Could not disable extension %s',
 	'CLI_EXTENSION_DISABLE_SUCCESS'		=> 'Successfully disabled extension %s',
 	'CLI_EXTENSION_ENABLE_FAILURE'		=> 'Could not enable extension %s',
-- 
cgit v1.2.1


From 2b01772fa9e07c030f69e7553b0eef567e318781 Mon Sep 17 00:00:00 2001
From: Zoddo <zoddo.ino@gmail.com>
Date: Tue, 25 Aug 2015 12:40:57 +0200
Subject: [ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocol

This error was accidentally introduced in the patch
for PHPBB3-13967 (PR #3729)

PHPBB3-14127
---
 phpBB/language/en/help_bbcode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index 989e5fc26e..c674d5cf3d 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -90,7 +90,7 @@ $help = array(
 	),
 	array(
 		0 => 'Linking to another site',
-		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=https://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="https://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>https://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="https://www.phpbb.com/">https://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading https://. For example typing www.phpbb.com into your message will automatically lead to <a href="https://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=https://www.phpbb.com/][img]</strong>https://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
+		1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=https://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="https://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>https://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="https://www.phpbb.com/">https://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=https://www.phpbb.com/][img]</strong>https://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.'
 	),
 	array(
 		0 => '--',
-- 
cgit v1.2.1


From 6c36f56b12afcb97dbaa7cc248435df3e7a3fdc9 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 28 Aug 2015 07:49:07 -0700
Subject: [ticket/14123] Remove redundant help messages

PHPBB3-14123
---
 phpBB/language/en/cli.php | 87 ++++-------------------------------------------
 1 file changed, 6 insertions(+), 81 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index 11d45646f8..0b73f95b60 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -55,7 +55,7 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_DISABLE_EXTENSION'			=> 'Disables the specified extension.',
 	'CLI_DESCRIPTION_ENABLE_EXTENSION'			=> 'Enables the specified extension.',
 	'CLI_DESCRIPTION_FIND_MIGRATIONS'			=> 'Finds migrations that are not depended upon.',
-	'CLI_DESCRIPTION_GET_CONFIG'				=> 'Gets a configuration option’s value',
+	'CLI_DESCRIPTION_GET_CONFIG'				=> 'Gets a configuration option’s integer value',
 	'CLI_DESCRIPTION_INCREMENT_CONFIG'			=> 'Increments a configuration option’s value',
 	'CLI_DESCRIPTION_LIST_EXTENSIONS'			=> 'Lists all extensions in the database and on the filesystem.',
 	'CLI_DESCRIPTION_OPTION_SAFE_MODE'			=> 'Run in Safe Mode (without extensions).',
@@ -65,86 +65,6 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_SET_ATOMIC_CONFIG'			=> 'Sets a configuration option’s value only if the old matches the current value',
 	'CLI_DESCRIPTION_SET_CONFIG'				=> 'Sets a configuration option’s value',
 
-	'CLI_HELP_PURGE_CACHE'				=> 'The <info>%command.name%</info> command allows you to purge the board’s cache.
-
- <info>php %command.full_name%</info>
-',
-	'CLI_HELP_DELETE_CONFIG'			=> 'The <info>%command.name%</info> command deletes a configuration option. The key name is required.
-
- <info>php %command.full_name% config_key</info>
-',
-	'CLI_HELP_GET_CONFIG'				=> 'The <info>%command.name%</info> command gets a configuration option’s value. The key name is required.
-
- <info>php %command.full_name% config_key</info>
-',
-	'CLI_HELP_INCREMENT_CONFIG'			=> 'The <info>%command.name%</info> command increments an integer configuration option’s value. The key name and increment amount are required.
-
- <info>php %command.full_name% config_key 1</info>
-
-If the configuration option changes too frequently to be efficiently cached, use the <info>--dynamic</info> or <info>-d</info> option:
-
- <info>php %command.full_name% config_key 1 --dynamic</info>
- <info>php %command.full_name% config_key 1 -d</info>
-',
-	'CLI_HELP_SET_CONFIG'				=> 'The <info>%command.name%</info> sets a configuration option’s value. The key name and value are required.
-
- <info>php %command.full_name% config_key foo</info>
-
-If the configuration option changes too frequently to be efficiently cached, use the <info>--dynamic</info> or <info>-d</info> option:
-
- <info>php %command.full_name% config_key foo --dynamic</info>
- <info>php %command.full_name% config_key foo -d</info>
-',
-	'CLI_HELP_SET_ATOMIC_CONFIG'		=> 'The <info>%command.name%</info> command sets a configuration option’s value only if the old value matches the current value or the configuration value does not exist yet. The key name, old and new values are required.
-
- <info>php %command.full_name% config_name foo bar</info>
-
-If the configuration option changes too frequently to be efficiently cached, use the <info>--dynamic</info> or <info>-d</info> option:
-
- <info>php %command.full_name% config_key foo bar --dynamic</info>
- <info>php %command.full_name% config_key foo bar -d</info>
-',
-	'CLI_HELP_CRON_LIST'				=> 'The <info>%command.name%</info> command prints a list of ready and unready cron jobs.
-
- <info>php %command.full_name%</info>
-',
-	'CLI_HELP_CRON_RUN'					=> 'The <info>%command.name%</info> command runs all ready cron tasks.
-
- <info>php %command.full_name%</info>
-
-Optionally you can specify a cron task name to run only the specified cron task:
-
- <info>php %command.full_name% task_name</info>
-',
-	'CLI_HELP_DB_MIGRATE'				=> 'The <info>%command.name%</info> command updates the database by applying available migrations.
-
- <info>php %command.full_name%</info>
-',
-	'CLI_HELP_FIND_MIGRATIONS'			=> 'The <info>%command.name%</info> command finds migrations that are not depended upon.
-
- <info>php %command.full_name%</info>
-',
-	'CLI_HELP_DISABLE_EXTENSION'		=> 'The <info>%command.name%</info> command disables the specified extension. The extension name is required.
-
- <info>php %command.full_name% vendor_name/package_name</info>
-',
-	'CLI_HELP_ENABLE_EXTENSION'			=> 'The <info>%command.name%</info> command enables the specified extension. The extension name is required.
-
- <info>php %command.full_name% vendor_name/package_name</info>
-',
-	'CLI_HELP_PURGE_EXTENSION'			=> 'The <info>%command.name%</info> command purges the specified extension. The extension name is required.
-
- <info>php %command.full_name% vendor_name/package_name</info>
-',
-	'CLI_HELP_LIST_EXTENSIONS'			=> 'The <info>%command.name%</info> command lists all extensions in the database and on the filesystem.
-
- <info>php %command.full_name%</info>
-',
-	'CLI_HELP_RECALCULATE_EMAIL_HASH'	=> 'The <info>%command.name%</info> command recalculates the user_email_hash column of the users table.
-
- <info>php %command.full_name%</info>
-',
-
 	'CLI_EXTENSION_DISABLE_FAILURE'		=> 'Could not disable extension %s',
 	'CLI_EXTENSION_DISABLE_SUCCESS'		=> 'Successfully disabled extension %s',
 	'CLI_EXTENSION_ENABLE_FAILURE'		=> 'Could not enable extension %s',
@@ -159,3 +79,8 @@ Optionally you can specify a cron task name to run only the specified cron task:
 
 	'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS'	=> 'Successfully recalculated all email hashes.',
 ));
+
+// Additional help for commands.
+$lang = array_merge($lang, array(
+	'CLI_HELP_CRON_RUN'			=> $lang['CLI_DESCRIPTION_CRON_RUN'] . ' Optionally you can specify a cron task name to run only the specified cron task.',
+));
-- 
cgit v1.2.1


From 76158e429b10ce09a5f5b27a2d12a6f57bfa154f Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 28 Aug 2015 07:54:50 -0700
Subject: [ticket/14123] Fix typo

PHPBB3-14123
---
 phpBB/language/en/cli.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index 0b73f95b60..6989f26f72 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -55,8 +55,8 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_DISABLE_EXTENSION'			=> 'Disables the specified extension.',
 	'CLI_DESCRIPTION_ENABLE_EXTENSION'			=> 'Enables the specified extension.',
 	'CLI_DESCRIPTION_FIND_MIGRATIONS'			=> 'Finds migrations that are not depended upon.',
-	'CLI_DESCRIPTION_GET_CONFIG'				=> 'Gets a configuration option’s integer value',
-	'CLI_DESCRIPTION_INCREMENT_CONFIG'			=> 'Increments a configuration option’s value',
+	'CLI_DESCRIPTION_GET_CONFIG'				=> 'Gets a configuration option’s value',
+	'CLI_DESCRIPTION_INCREMENT_CONFIG'			=> 'Increments a configuration option’s integer value',
 	'CLI_DESCRIPTION_LIST_EXTENSIONS'			=> 'Lists all extensions in the database and on the filesystem.',
 	'CLI_DESCRIPTION_OPTION_SAFE_MODE'			=> 'Run in Safe Mode (without extensions).',
 	'CLI_DESCRIPTION_OPTION_SHELL'				=> 'Launch the shell.',
-- 
cgit v1.2.1


From e9e199bc378ee09f05d3497be57441b79cbd17d9 Mon Sep 17 00:00:00 2001
From: Zoddo <zoddo.ino@gmail.com>
Date: Sun, 30 Aug 2015 12:14:35 +0200
Subject: [ticket/8920] Add a MCP PM reports view permission

Anybody who has the permission to read reports in one forum
can read PM reports.

Solving this problem by adding a new permission to read PM reports.

PHPBB3-8920
---
 phpBB/language/en/acp/permissions_phpbb.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index b9aeed8fcb..2e80e61adc 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -155,9 +155,10 @@ $lang = array_merge($lang, array(
 	'ACL_M_SPLIT'	=> 'Can split topics',
 	'ACL_M_MERGE'	=> 'Can merge topics',
 
-	'ACL_M_INFO'	=> 'Can view post details',
-	'ACL_M_WARN'	=> 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
-	'ACL_M_BAN'		=> 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
+	'ACL_M_INFO'		=> 'Can view post details',
+	'ACL_M_WARN'		=> 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
+	'ACL_M_PM_REPORT'	=> 'Can close and delete reports of private messages<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
+	'ACL_M_BAN'			=> 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
 ));
 
 // Admin Permissions
-- 
cgit v1.2.1


From c7d7967a91babfcae1132a9c7b98d51e2a99395b Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 15 Oct 2015 22:24:21 -0700
Subject: [ticket/13945] Send reactivation requests to admins using
 notifications system.

PHPBB3-13945
---
 phpBB/language/en/common.php | 2 +-
 phpBB/language/en/ucp.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 79d504a67d..966135ad6f 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -467,7 +467,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TOPIC_DISAPPROVED'	=> '<strong>Topic disapproved</strong>:',
 	'NOTIFICATION_TOPIC_IN_QUEUE'		=> '<strong>Topic approval</strong> request by %1$s:',
 	'NOTIFICATION_TYPE_NOT_EXIST'		=> 'The notification type "%s" is missing from the file system.',
-	'NOTIFICATION_ADMIN_ACTIVATE_USER'	=> '<strong>Activation required</strong> for newly registered user: “%1$s”',
+	'NOTIFICATION_ADMIN_ACTIVATE_USER'	=> '<strong>Activation required</strong> for deactivated or newly registered user: “%1$s”',
 	// Used in conjuction with NOTIFICATION_BOOKMARK and NOTIFICATION_POST.
 	'NOTIFICATION_MANY_OTHERS'			=> 'others',
 	'NOTIFICATION_X_OTHERS'				=> array(
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 07751d1f7f..1faa623b44 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -339,7 +339,7 @@ $lang = array_merge($lang, array(
 	'NOTIFICATION_TYPE_QUOTE'							=> 'Someone quotes you in a post',
 	'NOTIFICATION_TYPE_REPORT'							=> 'Someone reports a post',
 	'NOTIFICATION_TYPE_TOPIC'							=> 'Someone creates a topic in a forum to which you are subscribed',
-	'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER'				=> 'Newly registered user requiring activation',
+	'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER'				=> 'User requiring activation',
 
 	'NOTIFY_METHOD'					=> 'Notification method',
 	'NOTIFY_METHOD_BOTH'			=> 'Both',
-- 
cgit v1.2.1


From 9a8393c912fafb8982593e10de792e3d134ca2fe Mon Sep 17 00:00:00 2001
From: DavidIQ <david@davidiq.com>
Date: Sat, 17 Oct 2015 18:06:03 -0400
Subject: [ticket/10343] Show clearer indication an account is inactive in
 memberlist

PHPBB3-10343
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 966135ad6f..47e04d9360 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -329,6 +329,7 @@ $lang = array_merge($lang, array(
 	'IMAGE_FILETYPE_INVALID'	=> 'Image file type %d for mimetype %s not supported.',
 	'IMAGE_FILETYPE_MISMATCH'	=> 'Image file type mismatch: expected extension %1$s but extension %2$s given.',
 	'IN'						=> 'in',
+	'INACTIVE'					=> 'Inactive',
 	'INDEX'						=> 'Index page',
 	'INFORMATION'				=> 'Information',
 	'INSECURE_REDIRECT'			=> 'Tried to redirect to potentially insecure url.',
-- 
cgit v1.2.1


From 03662d5a895e9c097d89d281093d125c9c0ed942 Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Sat, 14 Nov 2015 06:10:41 -0500
Subject: [ticket/14283] Add a Manage Group link on a group page

PHPBB3-14283
---
 phpBB/language/en/memberlist.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 5605f8f4b5..c7b2bf55d1 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -101,6 +101,7 @@ $lang = array_merge($lang, array(
 	'LOGIN_EXPLAIN_SEARCHUSER'	=> 'The board requires you to be registered and logged in to search users.',
 	'LOGIN_EXPLAIN_VIEWPROFILE'	=> 'The board requires you to be registered and logged in to view profiles.',
 
+	'MANAGE_GROUP'			=> 'Manage Group',
 	'MORE_THAN'				=> 'More than',
 
 	'NO_CONTACT_FORM'		=> 'The board administrator contact form has been disabled.',
-- 
cgit v1.2.1


From 627488da5b273e36038a82e2689c35b599bbb8e5 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 11 Dec 2015 17:14:22 -0800
Subject: [ticket/14353] Complete [list] bbcode documentation/examples

PHPBB3-14353
---
 phpBB/language/en/help_bbcode.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php
index c674d5cf3d..800ce3dfb7 100644
--- a/phpBB/language/en/help_bbcode.php
+++ b/phpBB/language/en/help_bbcode.php
@@ -73,11 +73,11 @@ $help = array(
 	),
 	array(
 		0 => 'Creating an Unordered list',
-		1 => 'BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list outputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use <strong>[list][/list]</strong> and define each item within the list using <strong>[*]</strong>. For example to list your favourite colours you could use:<br /><br /><strong>[list]</strong><br /><strong>[*]</strong>Red<br /><strong>[*]</strong>Blue<br /><strong>[*]</strong>Yellow<br /><strong>[/list]</strong><br /><br />This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul>'
+		1 => 'BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list outputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use <strong>[list][/list]</strong> and define each item within the list using <strong>[*]</strong>. For example to list your favourite colours you could use:<br /><br /><strong>[list]</strong><br /><strong>[*]</strong>Red<br /><strong>[*]</strong>Blue<br /><strong>[*]</strong>Yellow<br /><strong>[/list]</strong><br /><br />This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul><br />Alternatively you can specify the list’s bullet style using <strong>[list=disc][/list]</strong>, <strong>[list=circle][/list]</strong>, or <strong>[list=square][/list]</strong>.'
 	),
 	array(
 		0 => 'Creating an Ordered list',
-		1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>'
+		1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol><br /><strong>[list=A]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: upper-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol><br /><strong>[list=i]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-roman"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol><br /><strong>[list=I]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: upper-roman"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>'
 	),
 	// This block will switch the FAQ-Questions to the second template column
 	array(
-- 
cgit v1.2.1


From bb5a1716744e79d2f36e49d5dd1cc0a0fac2a0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?phpBB=20Espa=C3=B1a?= <thekuka@gmail.com>
Date: Sun, 22 Nov 2015 12:41:03 +0100
Subject: [ticket/14303] Use UTF8 quotes in app.php lang file

PHPBB3-14303
---
 phpBB/language/en/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/app.php b/phpBB/language/en/app.php
index 2da0f098c1..39c4065ebd 100644
--- a/phpBB/language/en/app.php
+++ b/phpBB/language/en/app.php
@@ -44,5 +44,5 @@ $lang = array_merge($lang, array(
 	'CONTROLLER_ARGUMENT_VALUE_MISSING'	=> 'Missing value for argument #%1$s: <strong>%3$s</strong> in class <strong>%2$s</strong>',
 	'CONTROLLER_NOT_SPECIFIED'			=> 'No controller has been specified.',
 	'CONTROLLER_METHOD_NOT_SPECIFIED'	=> 'No method was specified for the controller.',
-	'CONTROLLER_SERVICE_UNDEFINED'		=> 'The service for controller "<strong>%s</strong>" is not defined in ./config/services.yml.',
+	'CONTROLLER_SERVICE_UNDEFINED'		=> 'The service for controller “<strong>%s</strong>” is not defined in ./config/services.yml.',
 ));
-- 
cgit v1.2.1


From 65ce507ddac83cdcddf6898d1ffea6c0512c393b Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Wed, 2 Mar 2016 07:05:37 -0500
Subject: [ticket/14508] Change language notice on account activation

PHPBB3-14508
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 1faa623b44..1290f2a7e1 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -66,7 +66,7 @@ $lang = array_merge($lang, array(
 	'ACCOUNT_COPPA'					=> 'Your account has been created but has to be approved, please check your email for details.',
 	'ACCOUNT_EMAIL_CHANGED'			=> 'Your account has been updated. However, this board requires account reactivation on email changes. An activation key has been sent to the new email address you provided. Please check your email for further information.',
 	'ACCOUNT_EMAIL_CHANGED_ADMIN'	=> 'Your account has been updated. However, this board requires account reactivation by the administrators on email changes. An email has been sent to them and you will be informed when your account has been reactivated.',
-	'ACCOUNT_INACTIVE'				=> 'Your account has been created. However, this board requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information.',
+	'ACCOUNT_INACTIVE'				=> 'Your account has been created. However, this board requires account activation. An activation key has been sent to the email address you provided. Please check your email for further information and also be sure to check your junk mail box. It may take a while to get the email depending on your email providers server loads so please be patient.',
 	'ACCOUNT_INACTIVE_ADMIN'		=> 'Your account has been created. However, this board requires account activation by the administrator group. An email has been sent to them and you will be informed when your account has been activated.',
 	'ACTIVATION_EMAIL_SENT'			=> 'The activation email has been sent to your email address.',
 	'ACTIVATION_EMAIL_SENT_ADMIN'	=> 'The activation email has been sent to the administrators email addresses.',
-- 
cgit v1.2.1


From 83fd8e88d601bb388d7afa4c9e17e09a9c8bc820 Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Thu, 3 Mar 2016 06:55:36 -0500
Subject: [ticket/14508] Adjust account inactive language

PHPBB3-14508
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 1290f2a7e1..59525c6b16 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -66,7 +66,7 @@ $lang = array_merge($lang, array(
 	'ACCOUNT_COPPA'					=> 'Your account has been created but has to be approved, please check your email for details.',
 	'ACCOUNT_EMAIL_CHANGED'			=> 'Your account has been updated. However, this board requires account reactivation on email changes. An activation key has been sent to the new email address you provided. Please check your email for further information.',
 	'ACCOUNT_EMAIL_CHANGED_ADMIN'	=> 'Your account has been updated. However, this board requires account reactivation by the administrators on email changes. An email has been sent to them and you will be informed when your account has been reactivated.',
-	'ACCOUNT_INACTIVE'				=> 'Your account has been created. However, this board requires account activation. An activation key has been sent to the email address you provided. Please check your email for further information and also be sure to check your junk mail box. It may take a while to get the email depending on your email providers server loads so please be patient.',
+	'ACCOUNT_INACTIVE'				=> 'Your account has been created. However, this board requires account activation. An activation key has been sent to the email address you provided. Please check your email for further information and also be sure to check your junk mail box. It may take a while to get the email depending on your email provider.',
 	'ACCOUNT_INACTIVE_ADMIN'		=> 'Your account has been created. However, this board requires account activation by the administrator group. An email has been sent to them and you will be informed when your account has been activated.',
 	'ACTIVATION_EMAIL_SENT'			=> 'The activation email has been sent to your email address.',
 	'ACTIVATION_EMAIL_SENT_ADMIN'	=> 'The activation email has been sent to the administrators email addresses.',
-- 
cgit v1.2.1


From 4c5c289f75c267e1f3e789c0304054ed4e3e2564 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 11 Mar 2016 10:51:07 +0100
Subject: [ticket/14241] Prevent empty q&a as a result of improper settings

Improper setup of the q&a captcha in combination with the admin choosing a
default language that does not have any questions and answers set might
result in the user being presented empty questions and answers. This
change will try to fall back to any question in case the admin incorrectly
set the default language and has no questions & answers set. If that does
not work, the captcha will not allow passing it and suggest to contact the
board admin to resolve this issue.

PHPBB3-14241
---
 phpBB/language/en/captcha_qa.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php
index f764a83f24..28011eb636 100644
--- a/phpBB/language/en/captcha_qa.php
+++ b/phpBB/language/en/captcha_qa.php
@@ -40,6 +40,7 @@ $lang = array_merge($lang, array(
 	'CAPTCHA_QA'				=> 'Q&amp;A',
 	'CONFIRM_QUESTION_EXPLAIN'	=> 'This question is a means of preventing automated form submissions by spambots.',
 	'CONFIRM_QUESTION_WRONG'	=> 'You have provided an invalid answer to the question.',
+	'CONFIRM_QUESTION_MISSING'	=> 'Questions for the captcha could not be retrieved. Please contact a board administrator.',
 
 	'QUESTION_ANSWERS'			=> 'Answers',
 	'ANSWERS_EXPLAIN'			=> 'Please enter valid answers to the question, one per line.',
@@ -60,5 +61,4 @@ $lang = array_merge($lang, array(
 
 	'QA_ERROR_MSG'				=> 'Please fill in all fields and enter at least one answer.',
 	'QA_LAST_QUESTION'			=> 'You cannot delete all questions while the plugin is active.',
-
 ));
-- 
cgit v1.2.1


From 215fad420f20ba48cda00c7ceedfa31e035ee76f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 12 Mar 2016 10:24:07 +0100
Subject: [ticket/14241] Log fatal captcha error to error log

PHPBB3-14241
---
 phpBB/language/en/acp/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index fdbc4aebd0..88e60d00a3 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -594,6 +594,7 @@ $lang = array_merge($lang, array(
 
 	'LOG_ERROR_JABBER'		=> '<strong>Jabber error</strong><br />» %s',
 	'LOG_ERROR_EMAIL'		=> '<strong>Email error</strong><br />» %s',
+	'LOG_ERROR_CAPTCHA'		=> '<strong>CAPTCHA error</strong><br />» %s',
 
 	'LOG_FORUM_ADD'							=> '<strong>Created new forum</strong><br />» %s',
 	'LOG_FORUM_COPIED_PERMISSIONS'			=> '<strong>Copied forum permissions</strong> from %1$s<br />» %2$s',
-- 
cgit v1.2.1


From 4dc8841e33eb1db242a5f5936660ae569b1873ab Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Fri, 18 Mar 2016 11:54:46 +0100
Subject: [ticket/13028] Rename unanswered search label

PHPBB3-13028
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 47e04d9360..2860c34f48 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -673,7 +673,7 @@ $lang = array_merge($lang, array(
 	'SEARCH_POSTS_BY'			=> 'Search posts by',
 	'SEARCH_SELF'				=> 'Your posts',
 	'SEARCH_TOPIC'				=> 'Search this topic…',
-	'SEARCH_UNANSWERED'			=> 'Unanswered posts',
+	'SEARCH_UNANSWERED'			=> 'Unanswered topics',
 	'SEARCH_UNREAD'				=> 'Unread posts',
 	'SEARCH_USER_POSTS'			=> 'Search user’s posts',
 	'SECONDS'					=> 'Seconds',
-- 
cgit v1.2.1


From 9ef5b126ecc38e9941e9223f92c91b3ac13e585c Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Fri, 18 Mar 2016 11:22:00 +0100
Subject: [ticket/13013] Explain to user explicitl what "participate more"
 means

PHPBB3-13013
---
 phpBB/language/en/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 47e04d9360..4c47b97138 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -815,7 +815,7 @@ $lang = array_merge($lang, array(
 	'USERS'					=> 'Users',
 	'USE_PERMISSIONS'		=> 'Test out user’s permissions',
 
-	'USER_NEW_PERMISSION_DISALLOWED'	=> 'We are sorry, but you are not authorised to use this feature. You may have just registered here and may need to participate more to be able to use this feature.',
+	'USER_NEW_PERMISSION_DISALLOWED'	=> 'We are sorry, but you are not authorised to use this feature. You may have just registered here and may need to participate more in discussions to be able to use this feature.',
 
 	'VARIANT_DATE_SEPARATOR'	=> ' / ',	// Used in date format dropdown, eg: "Today, 13:37 / 01 Jan 2007, 13:37" ... to join a relative date with calendar date
 	'VIEWED'					=> 'Viewed',
-- 
cgit v1.2.1


From 04f320cb011f386d11672547c17965a7bd16ef35 Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Tue, 5 Apr 2016 06:57:32 -0400
Subject: [ticket/13716] Check phpBB version against config version

Display a warning in the ACP if the version constant (files)
does not match the phpbb_config version
(often indicating that the database updates hasn't been run)

PHPBB3-13716
---
 phpBB/language/en/install.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index dd22e84fcb..a14489b80f 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -400,6 +400,7 @@ $lang = array_merge($lang, array(
 	'DATABASE_UPDATE_CONTINUE'			=> 'Continue database update',
 	'DATABASE_UPDATE_INFO_OLD'			=> 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.',
 	'DATABASE_UPDATE_NOT_COMPLETED'		=> 'The database update has not yet completed.',
+	'DATABASE_VERSION'					=> 'Database version',
 	'DELETE_USER_REMOVE'				=> 'Delete user and remove posts',
 	'DELETE_USER_RETAIN'				=> 'Delete user but keep posts',
 	'DESTINATION'						=> 'Destination file',
@@ -439,6 +440,7 @@ $lang = array_merge($lang, array(
 	'FILES_NOT_MODIFIED_EXPLAIN'	=> 'The following files are not modified and represent the original phpBB files from the version you want to update from.',
 	'FILES_UP_TO_DATE'				=> 'Already updated files',
 	'FILES_UP_TO_DATE_EXPLAIN'		=> 'The following files are already up to date and do not need to be updated.',
+	'FILES_VERSION'					=> 'Files Version',
 	'FTP_SETTINGS'					=> 'FTP settings',
 	'FTP_UPDATE_METHOD'				=> 'FTP upload',
 
@@ -486,6 +488,7 @@ $lang = array_merge($lang, array(
 	'OLD_UPDATE_FILES'		=> 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
 
 	'PACKAGE_UPDATES_TO'				=> 'Current package updates to version',
+	'PACKAGE_VERSION'					=> 'Package version installed',
 	'PERFORM_DATABASE_UPDATE'			=> 'Perform database update',
 	'PERFORM_DATABASE_UPDATE_EXPLAIN'	=> 'Below you will find a button to the database update script. The database update can take a while, so please do not stop the execution if it seems to hang. After the database update has been performed just follow the instructions to continue the update process.',
 	'PREVIOUS_VERSION'					=> 'Previous version',
@@ -530,6 +533,28 @@ $lang = array_merge($lang, array(
 	'UPDATE_DATABASE_SCHEMA'		=> 'Updating database schema',
 	'UPDATE_FILES'					=> 'Update files',
 	'UPDATE_FILES_NOTICE'			=> 'Please make sure you have updated your board files too, this file is only updating your database.',
+	'UPDATE_INCOMPLETE'				=> 'Your phpBB installation has not been correctly updated.',
+	'UPDATE_INCOMPLETE_MORE'		=> 'Please see the information below to know how to fix that.',
+	'UPDATE_INCOMPLETE_EXPLAIN'		=> '<h1>Incomplete update</h1>
+
+		<p>We noticed that the last update of your phpBB installation hasn’t been correctly completed. Have you updated your files and forget to update your database? In this case, phpBB can’t work correctly and you may notice some strange behaviour.</p>
+
+		<br>
+
+		<h1>How to complete the update of phpBB?</h1>
+
+		<p>If you have updated phpBB using the Automatic Update Package, please restart the update process to be sure that all steps are correctly completed.</p>
+
+		<ul style="margin-left: 20px; font-size: 1.1em;">
+			<li>Retrieve the Automatic Update Package that you’ve used to update phpBB. The latest package can be found <a href="https://www.phpbb.com/downloads/" title="https://www.phpbb.com/downloads/">on phpBB.com</a>. For previous version, the package can be found <a href="https://download.phpbb.com/pub/release/" title="https://download.phpbb.com/pub/release/">on the phpBB download servers</a>.<br /><br /></li>
+			<li>Unpack the archive.<br /><br /></li>
+			<li>Upload the complete uncompressed "install" and "vendor" folders to your phpBB root directory (where your config.php file is).<br /><br /></li>
+			<li>Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.<br /><br /></li>
+			<li><strong><a href="%1$s" title="%1$s">Now restart the update process by pointing your browser to the install folder</a>.</strong><br /><br /></li>
+		</ul>
+
+		<p>If you have updated phpBB using any other method, please <a href="https://www.phpbb.com/downloads/" title="https://www.phpbb.com/downloads/">download the latest package</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%2$s" title="%2$s">run the database update script</a>.</p>',
+
 	'UPDATE_INSTALLATION'			=> 'Update phpBB installation',
 	'UPDATE_INSTALLATION_EXPLAIN'	=> 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />',
 	'UPDATE_INSTRUCTIONS'			=> '
-- 
cgit v1.2.1


From e80f79fc9a5aedfadf3892a546e4fbcf2371ce39 Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Wed, 6 Apr 2016 06:18:26 -0400
Subject: [ticket/13716] Fix grammar and href title tags

PHPBB3-13716
---
 phpBB/language/en/install.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index a14489b80f..f50e908da0 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -534,7 +534,7 @@ $lang = array_merge($lang, array(
 	'UPDATE_FILES'					=> 'Update files',
 	'UPDATE_FILES_NOTICE'			=> 'Please make sure you have updated your board files too, this file is only updating your database.',
 	'UPDATE_INCOMPLETE'				=> 'Your phpBB installation has not been correctly updated.',
-	'UPDATE_INCOMPLETE_MORE'		=> 'Please see the information below to know how to fix that.',
+	'UPDATE_INCOMPLETE_MORE'		=> 'Please read the information below in order to fix this error.',
 	'UPDATE_INCOMPLETE_EXPLAIN'		=> '<h1>Incomplete update</h1>
 
 		<p>We noticed that the last update of your phpBB installation hasn’t been correctly completed. Have you updated your files and forget to update your database? In this case, phpBB can’t work correctly and you may notice some strange behaviour.</p>
@@ -546,14 +546,14 @@ $lang = array_merge($lang, array(
 		<p>If you have updated phpBB using the Automatic Update Package, please restart the update process to be sure that all steps are correctly completed.</p>
 
 		<ul style="margin-left: 20px; font-size: 1.1em;">
-			<li>Retrieve the Automatic Update Package that you’ve used to update phpBB. The latest package can be found <a href="https://www.phpbb.com/downloads/" title="https://www.phpbb.com/downloads/">on phpBB.com</a>. For previous version, the package can be found <a href="https://download.phpbb.com/pub/release/" title="https://download.phpbb.com/pub/release/">on the phpBB download servers</a>.<br /><br /></li>
-			<li>Unpack the archive.<br /><br /></li>
-			<li>Upload the complete uncompressed "install" and "vendor" folders to your phpBB root directory (where your config.php file is).<br /><br /></li>
-			<li>Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.<br /><br /></li>
-			<li><strong><a href="%1$s" title="%1$s">Now restart the update process by pointing your browser to the install folder</a>.</strong><br /><br /></li>
+			<li>Retrieve the Automatic Update Package that you’ve used to update phpBB. The latest package can be found <a href="https://www.phpbb.com/downloads/" title="phpBB update package">on phpBB.com</a>. For a previous version, the package can be found <a href="https://download.phpbb.com/pub/release/" title="phpBB releases">on the phpBB download servers</a>.<br /><br /></li>
+			<li>Unpack the archive.<br><br></li>
+			<li>Upload the complete uncompressed "install" and "vendor" folders to your phpBB root directory (where your config.php file is).<br><br></li>
+			<li>Once uploaded your board will be offline for normal users due to the install directory you uploaded now being present.<br><br></li>
+			<li><strong><a href="%1$s" title="%1$s">Now restart the update process by pointing your browser to the install folder</a>.</strong><br><br></li>
 		</ul>
 
-		<p>If you have updated phpBB using any other method, please <a href="https://www.phpbb.com/downloads/" title="https://www.phpbb.com/downloads/">download the latest package</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%2$s" title="%2$s">run the database update script</a>.</p>',
+		<p>If you have updated phpBB using any other method, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download the latest package</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%2$s" title="%2$s">run the database update script</a>.</p>',
 
 	'UPDATE_INSTALLATION'			=> 'Update phpBB installation',
 	'UPDATE_INSTALLATION_EXPLAIN'	=> 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />',
-- 
cgit v1.2.1


From c93807717251464dd56dfc5b0bc0789bc78a6155 Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Mon, 11 Apr 2016 06:04:56 -0400
Subject: [ticket/13716] Fix verboseness

PHPBB3-13716
---
 phpBB/language/en/install.php | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index f50e908da0..414ab34755 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -537,23 +537,7 @@ $lang = array_merge($lang, array(
 	'UPDATE_INCOMPLETE_MORE'		=> 'Please read the information below in order to fix this error.',
 	'UPDATE_INCOMPLETE_EXPLAIN'		=> '<h1>Incomplete update</h1>
 
-		<p>We noticed that the last update of your phpBB installation hasn’t been correctly completed. Have you updated your files and forget to update your database? In this case, phpBB can’t work correctly and you may notice some strange behaviour.</p>
-
-		<br>
-
-		<h1>How to complete the update of phpBB?</h1>
-
-		<p>If you have updated phpBB using the Automatic Update Package, please restart the update process to be sure that all steps are correctly completed.</p>
-
-		<ul style="margin-left: 20px; font-size: 1.1em;">
-			<li>Retrieve the Automatic Update Package that you’ve used to update phpBB. The latest package can be found <a href="https://www.phpbb.com/downloads/" title="phpBB update package">on phpBB.com</a>. For a previous version, the package can be found <a href="https://download.phpbb.com/pub/release/" title="phpBB releases">on the phpBB download servers</a>.<br /><br /></li>
-			<li>Unpack the archive.<br><br></li>
-			<li>Upload the complete uncompressed "install" and "vendor" folders to your phpBB root directory (where your config.php file is).<br><br></li>
-			<li>Once uploaded your board will be offline for normal users due to the install directory you uploaded now being present.<br><br></li>
-			<li><strong><a href="%1$s" title="%1$s">Now restart the update process by pointing your browser to the install folder</a>.</strong><br><br></li>
-		</ul>
-
-		<p>If you have updated phpBB using any other method, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download the latest package</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%2$s" title="%2$s">run the database update script</a>.</p>',
+		<p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">database_update script</a> and run it. If it is missing, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download your package version</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%1$s" title="%1$s">run the database update script.</p>',
 
 	'UPDATE_INSTALLATION'			=> 'Update phpBB installation',
 	'UPDATE_INSTALLATION_EXPLAIN'	=> 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />',
-- 
cgit v1.2.1


From 269e2535242d5967dc4a293bddf0383a2b8c3b9e Mon Sep 17 00:00:00 2001
From: 3Di <three3di@hotmail.it>
Date: Sat, 23 Apr 2016 07:10:59 +0200
Subject: [ticket/14596] Deny installation of Ascraeus under PHP 7

PHPBB3-14596
---
 phpBB/language/en/install.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index dd22e84fcb..215cab07a0 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -300,11 +300,11 @@ $lang = array_merge($lang, array(
 	'PHP_REGISTER_GLOBALS'			=> 'PHP setting <var>register_globals</var> is disabled',
 	'PHP_REGISTER_GLOBALS_EXPLAIN'	=> 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.',
 	'PHP_SAFE_MODE'					=> 'Safe mode',
-	'PHP_SETTINGS'					=> 'PHP version and settings',
-	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.3.3 of PHP in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
+	'PHP_SETTINGS'					=> 'PHP versions and settings',
+	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.3.3 of PHP (PHP 7 is not supported) in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
 	'PHP_URL_FOPEN_SUPPORT'			=> 'PHP setting <var>allow_url_fopen</var> is enabled',
 	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it.',
-	'PHP_VERSION_REQD'				=> 'PHP version >= 5.3.3',
+	'PHP_VERSION_REQD'				=> 'PHP versions: >= 5.3.3, < 7.0.0-dev',
 	'POST_ID'						=> 'Post ID',
 	'PREFIX_FOUND'					=> 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
 	'PREPROCESS_STEP'				=> 'Executing pre-processing functions/queries',
-- 
cgit v1.2.1


From 0d7625c534b87b5d27977c2baa5e5ada132f7280 Mon Sep 17 00:00:00 2001
From: Richard McGirr <rmcgirr83@gmail.com>
Date: Mon, 16 May 2016 18:01:55 -0400
Subject: [ticket/13716] Remove extra br tag and correct missing closing a html
 tag

PHPBB3-13716
---
 phpBB/language/en/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 414ab34755..5a799ed548 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -537,7 +537,7 @@ $lang = array_merge($lang, array(
 	'UPDATE_INCOMPLETE_MORE'		=> 'Please read the information below in order to fix this error.',
 	'UPDATE_INCOMPLETE_EXPLAIN'		=> '<h1>Incomplete update</h1>
 
-		<p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">database_update script</a> and run it. If it is missing, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download your package version</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%1$s" title="%1$s">run the database update script.</p>',
+		<p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">database_update script</a> and run it. If it is missing, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download your package version</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%1$s" title="%1$s">run the database update script</a>.</p>',
 
 	'UPDATE_INSTALLATION'			=> 'Update phpBB installation',
 	'UPDATE_INSTALLATION_EXPLAIN'	=> 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />',
-- 
cgit v1.2.1


From 7dc1af25bc2dc0ba59990d53cb7dcdb9c0d48480 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Sun, 29 May 2016 17:16:02 +0200
Subject: [ticket/14654] Change Imagemagick to ImageMagick

PHPBB3-14654
---
 phpBB/language/en/acp/attachments.php | 4 ++--
 phpBB/language/en/install.php         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index cf2f0a45d2..7d3d93d693 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -117,7 +117,7 @@ $lang = array_merge($lang, array(
 
 	'IMAGE_LINK_SIZE'			=> 'Image link dimensions',
 	'IMAGE_LINK_SIZE_EXPLAIN'	=> 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.',
-	'IMAGICK_PATH'				=> 'Imagemagick path',
+	'IMAGICK_PATH'				=> 'ImageMagick path',
 	'IMAGICK_PATH_EXPLAIN'		=> 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>.',
 
 	'MAX_ATTACHMENTS'				=> 'Maximum number of attachments per post',
@@ -153,7 +153,7 @@ $lang = array_merge($lang, array(
 	'REMOVE_DISALLOWED_IPS'			=> 'Remove or un-exclude <em>disallowed</em> IPs/hostnames',
 	'RESYNC_FILES_STATS_CONFIRM'	=> 'Are you sure you wish to resynchronise file statistics?',
 
-	'SEARCH_IMAGICK'				=> 'Search for Imagemagick',
+	'SEARCH_IMAGICK'				=> 'Search for ImageMagick',
 	'SECURE_ALLOW_DENY'				=> 'Allow/Deny list',
 	'SECURE_ALLOW_DENY_EXPLAIN'		=> 'Change the default behaviour when secure downloads are enabled of the Allow/Deny list to that of a <strong>whitelist</strong> (Allow) or a <strong>blacklist</strong> (Deny).',
 	'SECURE_DOWNLOADS'				=> 'Enable secure downloads',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index dd22e84fcb..4d5fbb300d 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -44,7 +44,7 @@ $lang = array_merge($lang, array(
 	'ADMIN_TEST'				=> 'Check administrator settings',
 	'ADMIN_USERNAME'			=> 'Administrator username',
 	'ADMIN_USERNAME_EXPLAIN'	=> 'Please enter a username between 3 and 20 characters in length.',
-	'APP_MAGICK'				=> 'Imagemagick support [ Attachments ]',
+	'APP_MAGICK'				=> 'ImageMagick support [ Attachments ]',
 	'AUTHOR_NOTES'				=> 'Author notes<br />» %s',
 	'AVAILABLE'					=> 'Available',
 	'AVAILABLE_CONVERTORS'		=> 'Available convertors',
@@ -282,7 +282,7 @@ $lang = array_merge($lang, array(
 	'NOT_UNDERSTAND'			=> 'Could not understand %s #%d, table %s (“%s”)',
 	'NO_CONVERTORS'				=> 'No convertors are available for use.',
 	'NO_CONVERT_SPECIFIED'		=> 'No convertor specified.',
-	'NO_LOCATION'				=> 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel',
+	'NO_LOCATION'				=> 'Cannot determine location. If you know ImageMagick is installed, you may specify the location later within your administration control panel',
 	'NO_TABLES_FOUND'			=> 'No tables found.',
 
 	'OVERVIEW_BODY'				=> 'Welcome to phpBB3!<br /><br />phpBB® is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a package line started in 2000. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.<br /><br />This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read <a href="../docs/INSTALL.html">the installation guide</a>.<br /><br />To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.',
-- 
cgit v1.2.1


From 3708770eb91b65eae3f9fa8c2d647b13d17b5c8a Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Wed, 15 Jun 2016 23:31:17 +0200
Subject: [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server
 option

This should help users trying to figure out why their
mail config is not working when they forgot to use a protocol prefix.

PHPBB3-14184
---
 phpBB/language/en/acp/board.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 8d6c1c141d..8b4db6a061 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -570,6 +570,7 @@ $lang = array_merge($lang, array(
 	'SMTP_PORT'						=> 'SMTP server port',
 	'SMTP_PORT_EXPLAIN'				=> 'Only change this if you know your SMTP server is on a different port.',
 	'SMTP_SERVER'					=> 'SMTP server address',
+	'SMTP_SERVER_EXPLAIN'			=> 'Note that you have to provide the protocol that your server uses. If you are using SSL, this has to be "ssl://your.mailserver.com"',
 	'SMTP_SETTINGS'					=> 'SMTP settings',
 	'SMTP_USERNAME'					=> 'SMTP username',
 	'SMTP_USERNAME_EXPLAIN'			=> 'Only enter a username if your SMTP server requires it.',
-- 
cgit v1.2.1


From 773a701d62c8d0d3951b323880b13e89b95d2f3b Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 20 Jun 2016 00:11:10 +0700
Subject: [ticket/14683] Fix typos in email templates.

PHPBB3-14683
---
 phpBB/language/en/email/forum_notify.txt          | 2 +-
 phpBB/language/en/email/newtopic_notify.txt       | 2 +-
 phpBB/language/en/email/short/newtopic_notify.txt | 2 +-
 phpBB/language/en/email/short/topic_notify.txt    | 2 +-
 phpBB/language/en/email/topic_notify.txt          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt
index a05be5fd96..ccae82c862 100644
--- a/phpBB/language/en/email/forum_notify.txt
+++ b/phpBB/language/en/email/forum_notify.txt
@@ -2,7 +2,7 @@ Subject: Forum post notification - "{FORUM_NAME}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
 
 {U_NEWEST_POST}
 
diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt
index 5089e7dcb8..b9416d8e40 100644
--- a/phpBB/language/en/email/newtopic_notify.txt
+++ b/phpBB/language/en/email/newtopic_notify.txt
@@ -2,7 +2,7 @@ Subject: New topic notification - "{FORUM_NAME}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
+You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
 
 {U_FORUM}
 
diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt
index 5089e7dcb8..b9416d8e40 100644
--- a/phpBB/language/en/email/short/newtopic_notify.txt
+++ b/phpBB/language/en/email/short/newtopic_notify.txt
@@ -2,7 +2,7 @@ Subject: New topic notification - "{FORUM_NAME}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
+You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum.
 
 {U_FORUM}
 
diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt
index 529478eae2..b1ed65727c 100644
--- a/phpBB/language/en/email/short/topic_notify.txt
+++ b/phpBB/language/en/email/short/topic_notify.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic.
 
 If you want to view the newest post made since your last visit, click the following link:
 {U_NEWEST_POST}
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
index d5272d7416..20b86ee729 100644
--- a/phpBB/language/en/email/topic_notify.txt
+++ b/phpBB/language/en/email/topic_notify.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. No more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. No more notifications will be sent until you visit the topic.
 
 If you want to view the newest post made since your last visit, click the following link:
 {U_NEWEST_POST}
-- 
cgit v1.2.1


From 53b9216c784e0d9688d565f85ef2a97c308fdaa2 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sun, 3 Jul 2016 14:22:08 +0200
Subject: [ticket/14704] Removes unused function and language files in base.php

PHPBB3-14704
---
 phpBB/language/en/search_ignore_words.php | 271 ------------------------------
 phpBB/language/en/search_synonyms.php     | 191 ---------------------
 2 files changed, 462 deletions(-)
 delete mode 100644 phpBB/language/en/search_ignore_words.php
 delete mode 100644 phpBB/language/en/search_synonyms.php

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php
deleted file mode 100644
index 3db209d120..0000000000
--- a/phpBB/language/en/search_ignore_words.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-$words = array(
-	'a',
-	'about',
-	'after',
-	'ago',
-	'all',
-	'almost',
-	'along',
-	'alot',
-	'also',
-	'am',
-	'an',
-	'and',
-	'answer',
-	'any',
-	'anybody',
-	'anybodys',
-	'anywhere',
-	'are',
-	'arent',
-	'around',
-	'as',
-	'ask',
-	'askd',
-	'at',
-	'bad',
-	'be',
-	'because',
-	'been',
-	'before',
-	'being',
-	'best',
-	'better',
-	'between',
-	'big',
-	'btw',
-	'but',
-	'by',
-	'can',
-	'cant',
-	'come',
-	'could',
-	'couldnt',
-	'day',
-	'days',
-	'days',
-	'did',
-	'didnt',
-	'do',
-	'does',
-	'doesnt',
-	'dont',
-	'down',
-	'each',
-	'etc',
-	'either',
-	'else',
-	'even',
-	'ever',
-	'every',
-	'everybody',
-	'everybodys',
-	'everyone',
-	'far',
-	'find',
-	'for',
-	'found',
-	'from',
-	'get',
-	'go',
-	'going',
-	'gone',
-	'good',
-	'got',
-	'gotten',
-	'had',
-	'has',
-	'have',
-	'havent',
-	'having',
-	'her',
-	'here',
-	'hers',
-	'him',
-	'his',
-	'home',
-	'how',
-	'hows',
-	'href',
-	'I',
-	'Ive',
-	'if',
-	'in',
-	'ini',
-	'into',
-	'is',
-	'isnt',
-	'it',
-	'its',
-	'its',
-	'just',
-	'know',
-	'large',
-	'less',
-	'like',
-	'liked',
-	'little',
-	'looking',
-	'look',
-	'looked',
-	'looking',
-	'lot',
-	'maybe',
-	'many',
-	'me',
-	'more',
-	'most',
-	'much',
-	'must',
-	'mustnt',
-	'my',
-	'near',
-	'need',
-	'never',
-	'new',
-	'news',
-	'no',
-	'none',
-	'not',
-	'nothing',
-	'now',
-	'of',
-	'off',
-	'often',
-	'old',
-	'on',
-	'once',
-	'only',
-	'oops',
-	'or',
-	'other',
-	'our',
-	'ours',
-	'out',
-	'over',
-	'page',
-	'please',
-	'put',
-	'question',
-	'questions',
-	'questioned',
-	'quote',
-	'rather',
-	'really',
-	'recent',
-	'said',
-	'saw',
-	'say',
-	'says',
-	'she',
-	'see',
-	'sees',
-	'should',
-	'sites',
-	'small',
-	'so',
-	'some',
-	'something',
-	'sometime',
-	'somewhere',
-	'soon',
-	'take',
-	'than',
-	'true',
-	'thank',
-	'that',
-	'thatd',
-	'thats',
-	'the',
-	'their',
-	'theirs',
-	'theres',
-	'theirs',
-	'them',
-	'then',
-	'there',
-	'these',
-	'they',
-	'theyll',
-	'theyd',
-	'theyre',
-	'this',
-	'those',
-	'though',
-	'through',
-	'thus',
-	'time',
-	'times',
-	'to',
-	'too',
-	'under',
-	'until',
-	'untrue',
-	'up',
-	'upon',
-	'use',
-	'users',
-	'version',
-	'very',
-	'via',
-	'want',
-	'was',
-	'way',
-	'we',
-	'well',
-	'went',
-	'were',
-	'werent',
-	'what',
-	'when',
-	'where',
-	'which',
-	'who',
-	'whom',
-	'whose',
-	'why',
-	'wide',
-	'will',
-	'with',
-	'within',
-	'without',
-	'wont',
-	'world',
-	'worse',
-	'worst',
-	'would',
-	'wrote',
-	'www',
-	'yes',
-	'yet',
-	'you',
-	'youd',
-	'youll',
-	'your',
-	'youre',
-	'yours',
-	'AFAIK',
-	'IIRC',
-	'LOL',
-	'ROTF',
-	'ROTFLMAO',
-	'YMMV',
-);
diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php
deleted file mode 100644
index 6a8c257f0b..0000000000
--- a/phpBB/language/en/search_synonyms.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-$synonyms = array(
-	'abcense'			=> 'absence',
-	'abridgement'		=> 'abridgment',
-	'accomodate'		=> 'accommodate',
-	'acknowledgment'	=> 'acknowledgement',
-	'airplane'			=> 'aeroplane',
-	'allright'			=> 'alright ',
-	'andy'				=> 'andrew',
-	'anemia'			=> 'anaemia',
-	'anemic'			=> 'anaemic',
-	'anesthesia'		=> 'anaesthesia',
-	'apologize'			=> 'apologise',
-	'archean'			=> 'archaean',
-	'archeology'		=> 'archaeology',
-	'archeozoic'		=> 'archaeozoic',
-	'armor'				=> 'armour',
-	'artic'				=> 'arctic',
-	'attachment'		=> 'attachement',
-	'attendence'		=> 'attendance',
-
-	'barbecue'	=> 'barbeque',
-	'behavior'	=> 'behaviour',
-	'biassed'	=> 'biased',
-	'biol'		=> 'biology',
-	'buletin'	=> 'bulletin',
-
-	'calender'	=> 'calendar',
-	'canceled'	=> 'cancelled',
-	'car'		=> 'automobile',
-	'catalog'	=> 'catalogue',
-	'cenozoic'	=> 'caenozoic',
-	'center'	=> 'centre',
-	'check'		=> 'cheque',
-	'color'		=> 'colour',
-	'comission'	=> 'commission',
-	'comittee'	=> 'committee',
-	'commitee'	=> 'committee',
-	'conceed'	=> 'concede',
-	'creating'	=> 'createing',
-	'curiculum'	=> 'curriculum',
-
-	'defense'		=> 'defence',
-	'develope'		=> 'develop',
-	'discription'	=> 'description',
-	'dulness'		=> 'dullness',
-
-	'encyclopedia'	=> 'encyclopaedia',
-	'enroll'		=> 'enrol',
-	'esthetic'		=> 'aesthetic',
-	'etiology'		=> 'aetiology',
-	'exhorbitant'	=> 'exorbitant',
-	'exhuberant'	=> 'exuberant',
-	'existance'		=> 'existence',
-
-	'favorite'		=> 'favourite',
-	'fetus'			=> 'foetus',
-	'ficticious'	=> 'fictitious',
-	'flavor'		=> 'flavour',
-	'flourescent'	=> 'fluorescent',
-	'foriegn'		=> 'foreign',
-	'fourty'		=> 'forty',
-
-	'gage'			=> 'gauge',
-	'geneology'		=> 'genealogy',
-	'grammer'		=> 'grammar',
-	'gray'			=> 'grey',
-	'guerilla'		=> 'guerrilla',
-	'gynecology'	=> 'gynaecology',
-
-	'harbor'		=> 'harbour',
-	'heighth'		=> 'height',
-	'hemaglobin'	=> 'haemaglobin',
-	'hematin'		=> 'haematin',
-	'hematite'		=> 'haematite',
-	'hematology'	=> 'haematology',
-	'honor'			=> 'honour',
-
-	'innoculate'	=> 'inoculate',
-	'installment'	=> 'instalment',
-	'irrelevent'	=> 'irrelevant',
-	'irrevelant'	=> 'irrelevant',
-
-	'jeweler'	=> 'jeweller',
-	'judgment'	=> 'judgement',
-
-	'labeled'	=> 'labelled',
-	'labor'		=> 'labour',
-	'laborer'	=> 'labourer',
-	'laborers'	=> 'labourers',
-	'laboring'	=> 'labouring',
-	'licence'	=> 'license',
-	'liesure'	=> 'leisure',
-	'liquify'	=> 'liquefy',
-
-	'maintainance'	=> 'maintenance',
-	'maintenence'	=> 'maintenance',
-	'medieval'		=> 'mediaeval',
-	'meter'			=> 'metre',
-	'milage'		=> 'mileage',
-	'millipede'		=> 'millepede',
-	'miscelaneous'	=> 'miscellaneous',
-	'morgage'		=> 'mortgage',
-
-	'noticable'	=> 'noticeable',
-
-	'occurence'	=> 'occurrence',
-	'offense'	=> 'offence',
-	'ommision'	=> 'omission',
-	'ommission'	=> 'omission',
-	'optimize'	=> 'optimise',
-	'organize'	=> 'organise',
-
-	'pajamas'			=> 'pyjamas',
-	'paleography'		=> 'palaeography',
-	'paleolithic'		=> 'palaeolithic',
-	'paleontological'	=> 'palaeontological',
-	'paleontologist'	=> 'palaeontologist',
-	'paleontology'		=> 'palaeontology',
-	'paleozoic'			=> 'palaeozoic',
-	'pamplet'			=> 'pamphlet',
-	'paralell'			=> 'parallel',
-	'parl'				=> 'parliament',
-	'parlt'				=> 'parliament',
-	'pediatric'			=> 'paediatric',
-	'pediatrician'		=> 'paediatrician',
-	'pediatrics'		=> 'paediatrics',
-	'pedodontia'		=> 'paedodontia',
-	'pedodontics'		=> 'paedodontics',
-	'personel'			=> 'personnel',
-	'practise'			=> 'practice',
-	'program'			=> 'programme',
-	'psych'				=> 'psychology',
-
-	'questionaire'	=> 'questionnaire',
-
-	'rarify'		=> 'rarefy',
-	'reccomend'		=> 'recommend',
-	'recieve'		=> 'receive',
-	'resistence'	=> 'resistance',
-	'restaraunt'	=> 'restaurant',
-
-	'savior'			=> 'saviour',
-	'sep'				=> 'september',
-	'seperate'			=> 'separate',
-	'sept'				=> 'september',
-	'sieze'				=> 'seize',
-	'summarize'			=> 'summarise',
-	'summerize'			=> 'summarise',
-	'superceed'			=> 'supercede',
-	'superintendant'	=> 'superintendent',
-	'supersede'			=> 'supercede',
-	'suprise'			=> 'surprise',
-	'surprize'			=> 'surprise',
-	'synchronise'		=> 'synchronize',
-
-	'temperary'		=> 'temporary',
-	'theater'		=> 'theatre',
-	'threshhold'	=> 'threshold',
-	'transfered'	=> 'transferred',
-	'truely'		=> 'truly',
-	'truley'		=> 'truly',
-
-	'useable'	=> 'usable',
-
-	'valor'	=> 'valour',
-	'vigor'	=> 'vigour',
-	'vol'	=> 'volume',
-
-	'whack'		=> 'wack',
-	'withold'	=> 'withhold',
-
-	'yeild'	=> 'yield',
-);
-- 
cgit v1.2.1


From 652e3da28d11157fe281c1252c74575798cf852f Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 3 Jul 2016 17:29:15 +0700
Subject: [ticket/14703] Refine the parent module selection for custom
 extension modules

PHPBB3-14703
---
 phpBB/language/en/migrator.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index 244a5faadf..f3f19f63c0 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -60,6 +60,8 @@ $lang = array_merge($lang, array(
 	'MIGRATION_INVALID_DATA_UNDEFINED_METHOD'		=> 'A migration is invalid. An undefined migration tool method was encountered.',
 
 	'MODULE_ERROR'						=> 'An error occurred while creating a module: %s',
+	'MODULE_EXISTS'						=> 'A module already exists: %s',
+	'MODULE_EXIST_MULTIPLE'				=> 'Several modules with the given parent module langname already exist: %s. Try using before/after keys to clarify the module placement.',
 	'MODULE_INFO_FILE_NOT_EXIST'		=> 'A required module info file is missing: %2$s',
 	'MODULE_NOT_EXIST'					=> 'A required module does not exist: %s',
 
-- 
cgit v1.2.1


From 0026ed02aec0f670a67a495c52f52255e4d685be Mon Sep 17 00:00:00 2001
From: 3Di <three3di@hotmail.it>
Date: Mon, 18 Jul 2016 01:14:59 +0200
Subject: [ticket/14596] Deny installation of Ascraeus under PHP 7

PHPBB3-14596
---
 phpBB/language/en/install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 215cab07a0..3f3cae4117 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -300,11 +300,11 @@ $lang = array_merge($lang, array(
 	'PHP_REGISTER_GLOBALS'			=> 'PHP setting <var>register_globals</var> is disabled',
 	'PHP_REGISTER_GLOBALS_EXPLAIN'	=> 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.',
 	'PHP_SAFE_MODE'					=> 'Safe mode',
-	'PHP_SETTINGS'					=> 'PHP versions and settings',
+	'PHP_SETTINGS'					=> 'PHP version and settings',
 	'PHP_SETTINGS_EXPLAIN'			=> '<strong>Required</strong> - You must be running at least version 5.3.3 of PHP (PHP 7 is not supported) in order to install phpBB. If <var>safe mode</var> is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.',
 	'PHP_URL_FOPEN_SUPPORT'			=> 'PHP setting <var>allow_url_fopen</var> is enabled',
 	'PHP_URL_FOPEN_SUPPORT_EXPLAIN'	=> '<strong>Optional</strong> - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it.',
-	'PHP_VERSION_REQD'				=> 'PHP versions: >= 5.3.3, < 7.0.0-dev',
+	'PHP_VERSION_REQD'				=> 'PHP version: >= 5.3.3, < 7.0.0-dev',
 	'POST_ID'						=> 'Post ID',
 	'PREFIX_FOUND'					=> 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
 	'PREPROCESS_STEP'				=> 'Executing pre-processing functions/queries',
-- 
cgit v1.2.1


From eaafb758ce5be55dd762c039fd7a746aa6c64b58 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sat, 23 Jul 2016 20:54:16 +0700
Subject: [ticket/14703] Select the parent module id from the several found

PHPBB3-14703
---
 phpBB/language/en/migrator.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index f3f19f63c0..4b6a0241e5 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -65,6 +65,7 @@ $lang = array_merge($lang, array(
 	'MODULE_INFO_FILE_NOT_EXIST'		=> 'A required module info file is missing: %2$s',
 	'MODULE_NOT_EXIST'					=> 'A required module does not exist: %s',
 
+	'PARENT_MODULE_FIND_ERROR'			=> 'Unable to determine the parent module identifier: %s',
 	'PERMISSION_NOT_EXIST'				=> 'The permission setting "%s" unexpectedly does not exist.',
 
 	'ROLE_NOT_EXIST'					=> 'The permission role "%s" unexpectedly does not exist.',
-- 
cgit v1.2.1


From 9fb649793de65a598615c542861281ff15a60439 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Wed, 10 Aug 2016 14:32:00 +0200
Subject: [ticket/14742] Pause after each schema change

It is certainly better than running them all at once

PHPBB3-14742
---
 phpBB/language/en/migrator.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php
index 244a5faadf..7623636941 100644
--- a/phpBB/language/en/migrator.php
+++ b/phpBB/language/en/migrator.php
@@ -50,6 +50,7 @@ $lang = array_merge($lang, array(
 	'MIGRATION_NOT_FULFILLABLE'			=> 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
 	'MIGRATION_NOT_VALID'				=> '%s is not a valid migration.',
 	'MIGRATION_SCHEMA_DONE'				=> 'Installed Schema: %1$s; Time: %2$.2f seconds',
+	'MIGRATION_SCHEMA_IN_PROGRESS'		=> 'Installing Schema: %1$s; Time: %2$.2f seconds',
 	'MIGRATION_SCHEMA_RUNNING'			=> 'Installing Schema: %s.',
 
 	'MIGRATION_INVALID_DATA_MISSING_CONDITION'		=> 'A migration is invalid. An if statement helper is missing a condition.',
-- 
cgit v1.2.1


From c016e09ca4d7ebe9488619f899c766a9969d28d1 Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Thu, 11 Aug 2016 14:54:36 +0200
Subject: [ticket/12925] Pluralize permanent delete checkbox label

PHPBB3-12925
---
 phpBB/language/en/posting.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 924395ed44..ef52f59753 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -90,14 +90,20 @@ $lang = array_merge($lang, array(
 	'DELETE_PERMANENTLY'		=> 'Delete permanently',
 	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
 	'DELETE_POST_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete this post?',
-	'DELETE_POST_PERMANENTLY'	=> 'Permanently delete this post so it can not be recovered',
+	'DELETE_POST_PERMANENTLY'	=> array(
+		1	=> 'Permanently delete this post so it can not be recovered',
+		2	=> 'Permanently delete %1$d posts so they can not be recovered',
+	),
 	'DELETE_POSTS_CONFIRM'		=> 'Are you sure you want to delete these posts?',
 	'DELETE_POSTS_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete these posts?',
 	'DELETE_REASON'				=> 'Reason for deletion',
 	'DELETE_REASON_EXPLAIN'		=> 'The specified reason for deletion will be visible to moderators.',
 	'DELETE_POST_WARN'			=> 'Delete this post',
 	'DELETE_TOPIC_CONFIRM'		=> 'Are you sure you want to delete this topic?',
-	'DELETE_TOPIC_PERMANENTLY'	=> 'Permanently delete this topic so it can not be recovered',
+	'DELETE_TOPIC_PERMANENTLY'	=> array(
+		1	=> 'Permanently delete this topic so it can not be recovered',
+		2	=> 'Permanently delete %1$d topics so they can not be recovered',
+	),
 	'DELETE_TOPIC_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete this topic?',
 	'DELETE_TOPICS_CONFIRM'		=> 'Are you sure you want to delete these topics?',
 	'DELETE_TOPICS_PERMANENTLY_CONFIRM'	=> 'Are you sure you want to <strong>permanently</strong> delete these topics?',
-- 
cgit v1.2.1


From 3ee5472a8ca197b411c6b9f116ce73e9bf20e13b Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 28 Aug 2016 20:40:10 +0100
Subject: [ticket/14109] Increase MySQL Version for InnoDB FULLTEXT Index to
 5.6.8.

This is required for proper overall database operation. In previous versions,
InnoDB might error on ALTER statements when multiple FULLTEXT Indexes are
 defined.

PHPBB3-14109
---
 phpBB/language/en/acp/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index bda965b615..c52b71c121 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -54,7 +54,7 @@ $lang = array_merge($lang, array(
 	'DELETING_INDEX_IN_PROGRESS_EXPLAIN'	=> 'The search backend is currently cleaning its index. This can take a few minutes.',
 
 	'FULLTEXT_MYSQL_INCOMPATIBLE_DATABASE'	=> 'The MySQL fulltext backend can only be used with MySQL4 and above.',
-	'FULLTEXT_MYSQL_NOT_SUPPORTED'			=> 'MySQL fulltext indexes can only be used with MyISAM or InnoDB tables. MySQL 5.6.4 or later is required for fulltext indexes on InnoDB tables.',
+	'FULLTEXT_MYSQL_NOT_SUPPORTED'			=> 'MySQL fulltext indexes can only be used with MyISAM or InnoDB tables. MySQL 5.6.8 or later is required for fulltext indexes on InnoDB tables.',
 	'FULLTEXT_MYSQL_TOTAL_POSTS'			=> 'Total number of indexed posts',
 	'FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN'	=> 'Words with at least this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
 	'FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'	=> 'Words with no more than this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.',
-- 
cgit v1.2.1


From ba5243ba7652049aa2c311a96bfdc94994ddaf4b Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Sun, 13 Nov 2016 15:47:54 +0100
Subject: [ticket/14842] Don't display filesize limit if there is none

PHPBB3-14842
---
 phpBB/language/en/ucp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 59525c6b16..93ee07b1cf 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -100,6 +100,7 @@ $lang = array_merge($lang, array(
 	'AVATAR_DRIVER_UPLOAD_TITLE'	=> 'Upload avatar',
 	'AVATAR_DRIVER_UPLOAD_EXPLAIN'	=> 'Upload your own custom avatar.',
 	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$s, height: %2$s, file size: %3$.2f KiB.',
+	'AVATAR_EXPLAIN_NO_FILESIZE'	=> 'Maximum dimensions; width: %1$s, height: %2$s.',
 	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
 	'AVATAR_GALLERY'				=> 'Local gallery',
 	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',
-- 
cgit v1.2.1


From 658820654f5789a786a5537c1b43991744b83d2c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 26 Dec 2016 22:01:51 +0100
Subject: [ticket/security-203] Fully validate version check data in version
 helper

This will also take care of SECURITY-204 as it's the same underlying issue.
Admins still need to ensure they don't visit malicious sites for URLs
provided by extensions.

SECURITY-203
---
 phpBB/language/en/acp/common.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 88e60d00a3..9d2723ceb3 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -417,11 +417,14 @@ $lang = array_merge($lang, array(
 	'UPLOAD_DIR_SIZE'	=> 'Size of posted attachments',
 	'USERS_PER_DAY'		=> 'Users per day',
 
-	'VALUE'						=> 'Value',
-	'VERSIONCHECK_FAIL'			=> 'Failed to obtain latest version information.',
-	'VERSIONCHECK_FORCE_UPDATE'	=> 'Re-Check version',
-	'VIEW_ADMIN_LOG'			=> 'View administrator log',
-	'VIEW_INACTIVE_USERS'		=> 'View inactive users',
+	'VALUE'							=> 'Value',
+	'VERSIONCHECK_FAIL'				=> 'Failed to obtain latest version information.',
+	'VERSIONCHECK_FORCE_UPDATE'		=> 'Re-Check version',
+	'VERSIONCHECK_INVALID_ENTRY'	=> 'Latest version information contains an unsupported entry.',
+	'VERSIONCHECK_INVALID_URL'		=> 'Latest version information contains invalid URL.',
+	'VERSIONCHECK_INVALID_VERSION'	=> 'Latest version information contains an invalid version.',
+	'VIEW_ADMIN_LOG'				=> 'View administrator log',
+	'VIEW_INACTIVE_USERS'			=> 'View inactive users',
 
 	'WELCOME_PHPBB'			=> 'Welcome to phpBB',
 	'WRITABLE_CONFIG'		=> 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
-- 
cgit v1.2.1


From 7cad25e4cbed2efbf891001cd2664f825674d5a7 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Dec 2016 17:54:11 +0100
Subject: [ticket/14838] Do not query full attachments table in feeds

The fetch_attachments() will also now throw a runtime exception if a feed
tries to do this nonetheless.

PHPBB3-14838
---
 phpBB/language/en/common.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index a2cfd958aa..b4b328e90d 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -336,6 +336,7 @@ $lang = array_merge($lang, array(
 	'INTERESTS'					=> 'Interests',
 	'INVALID_DIGEST_CHALLENGE'	=> 'Invalid digest challenge.',
 	'INVALID_EMAIL_LOG'			=> '<strong>%s</strong> possibly an invalid email address?',
+	'INVALID_FEED_ATTACHMENTS'	=> 'The selected feed tried fetching attachments with invalid constraints.',
 	'INVALID_PLURAL_RULE'		=> 'The chosen plural rule is invalid. Valid values are integers between 0 and 15.',
 	'IP'						=> 'IP',
 	'IP_BLACKLISTED'			=> 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.',
-- 
cgit v1.2.1


From cb44dbc8cb428132df072cd1d9c36dbb5bad68be Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 15 Jan 2017 15:32:55 +0100
Subject: [ticket/11076] State current and minimum required versions in old PHP
 notice

PHPBB3-11076
---
 phpBB/language/en/acp/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 88e60d00a3..562b446f8a 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -373,7 +373,7 @@ $lang = array_merge($lang, array(
 	'NUMBER_USERS'		=> 'Number of users',
 	'NUMBER_ORPHAN'		=> 'Orphan attachments',
 
-	'PHP_VERSION_OLD'	=> 'The version of PHP on this server will no longer be supported by future versions of phpBB. %sDetails%s',
+	'PHP_VERSION_OLD'	=> 'The version of PHP on this server (%1$s) will no longer be supported by future versions of phpBB. The minimum required version will be PHP %2$s. %3$sDetails%4$s',
 
 	'POSTS_PER_DAY'		=> 'Posts per day',
 
-- 
cgit v1.2.1


From a620ce0713f42daea8c5b0c4fdb70c63748af1f8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 22 Jan 2017 16:37:20 +0100
Subject: [ticket/14968] Display possible upgrade on acp index and update page

PHPBB3-14968
---
 phpBB/language/en/install.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 6477a929e9..0460c0613e 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -574,6 +574,7 @@ $lang = array_merge($lang, array(
 	'UPDATING_DATA'					=> 'Updating data',
 	'UPDATING_TO_LATEST_STABLE'		=> 'Updating database to latest stable release',
 	'UPDATED_VERSION'				=> 'Updated version',
+	'UPGRADE_INSTRUCTIONS'			=> 'A new feature release <strong>%1$s</strong> is available. Please read <a href="%2$s" title="%2$s"><strong>the release announcement</strong></a> to learn about what it has to offer, and how to upgrade.',
 	'UPLOAD_METHOD'					=> 'Upload method',
 
 	'UPDATE_DB_SUCCESS'				=> 'Database update was successful.',
-- 
cgit v1.2.1


From d10a5b67a1d508b2c48924678650b8d03c8f129d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= <rubencm@gmail.com>
Date: Thu, 16 Mar 2017 00:00:50 +0100
Subject: [ticket/14820] Add style version in ACP

PHPBB3-14820
---
 phpBB/language/en/acp/styles.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 0d91eb3704..9293d67ecc 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -81,6 +81,7 @@ $lang = array_merge($lang, array(
 	'STYLE_UNINSTALL_DEPENDENT'	=> 'Style "%s" cannot be uninstalled because it has one or more child styles.',
 	'STYLE_UNINSTALLED'			=> 'Style "%s" uninstalled successfully.',
 	'STYLE_USED_BY'				=> 'Used by (including robots)',
+	'STYLE_VERSION'				=> 'Style version',
 
 	'UNINSTALL_DEFAULT'		=> 'You cannot uninstall the default style.',
 
-- 
cgit v1.2.1


From ac87784a113035416e137ffb588d18a5da7650ac Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Fri, 17 Mar 2017 01:21:57 +0700
Subject: [ticket/13558] Add smtp SSL context configuration options

PHPBB3-13558
---
 phpBB/language/en/acp/board.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 8b4db6a061..3c9a1cc050 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -574,6 +574,14 @@ $lang = array_merge($lang, array(
 	'SMTP_SETTINGS'					=> 'SMTP settings',
 	'SMTP_USERNAME'					=> 'SMTP username',
 	'SMTP_USERNAME_EXPLAIN'			=> 'Only enter a username if your SMTP server requires it.',
+
+	'SSL_ALLOW_SELF_SIGNED'			=> 'Allow self-signed certificates',
+	'SSL_ALLOW_SELF_SIGNED_EXPLAIN'	=> 'Allow self-signed certificates for SSL / TLS connections.',
+	'SSL_VERIFY_PEER'				=> 'Verify peer',
+	'SSL_VERIFY_PEER_EXPLAIN'		=> 'Require verification of SSL certificate used.',
+	'SSL_VERIFY_PEER_NAME'			=> 'Verify peer name',
+	'SSL_VERIFY_PEER_NAME_EXPLAIN'	=> 'Require verification of peer name for SSL / TLS connections.',
+
 	'USE_SMTP'						=> 'Use SMTP server for email',
 	'USE_SMTP_EXPLAIN'				=> 'Select “Yes” if you want or have to send email via a named server instead of the local mail function.',
 ));
-- 
cgit v1.2.1


From 22b86324260dffe4907aac8e6cc9bb848568bcb9 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 19 Mar 2017 14:32:53 +0700
Subject: [ticket/13558] Change options prefix and add settings precautions.

PHPBB3-13558
---
 phpBB/language/en/acp/board.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 3c9a1cc050..8b5e113b16 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -558,6 +558,8 @@ $lang = array_merge($lang, array(
 	'EMAIL_SIG_EXPLAIN'				=> 'This text will be attached to all emails the board sends.',
 	'ENABLE_EMAIL'					=> 'Enable board-wide emails',
 	'ENABLE_EMAIL_EXPLAIN'			=> 'If this is set to disabled no emails will be sent by the board at all. <em>Note the user and admin account activation settings require this setting to be enabled. If currently using “user” or “admin” activation in the activation settings, disabling this setting will disable registration.</em>',
+	'SMTP_ALLOW_SELF_SIGNED'		=> 'Allow self-signed SSL certificates',
+	'SMTP_ALLOW_SELF_SIGNED_EXPLAIN'=> 'Allow connections to SMTP server with self-signed SSL certificate.<em><strong>Warning:</strong> Allowing self-signed SSL certificates may cause security implications.</em>',
 	'SMTP_AUTH_METHOD'				=> 'Authentication method for SMTP',
 	'SMTP_AUTH_METHOD_EXPLAIN'		=> 'Only used if a username/password is set, ask your provider if you are unsure which method to use.',
 	'SMTP_CRAM_MD5'					=> 'CRAM-MD5',
@@ -574,13 +576,10 @@ $lang = array_merge($lang, array(
 	'SMTP_SETTINGS'					=> 'SMTP settings',
 	'SMTP_USERNAME'					=> 'SMTP username',
 	'SMTP_USERNAME_EXPLAIN'			=> 'Only enter a username if your SMTP server requires it.',
-
-	'SSL_ALLOW_SELF_SIGNED'			=> 'Allow self-signed certificates',
-	'SSL_ALLOW_SELF_SIGNED_EXPLAIN'	=> 'Allow self-signed certificates for SSL / TLS connections.',
-	'SSL_VERIFY_PEER'				=> 'Verify peer',
-	'SSL_VERIFY_PEER_EXPLAIN'		=> 'Require verification of SSL certificate used.',
-	'SSL_VERIFY_PEER_NAME'			=> 'Verify peer name',
-	'SSL_VERIFY_PEER_NAME_EXPLAIN'	=> 'Require verification of peer name for SSL / TLS connections.',
+	'SMTP_VERIFY_PEER'				=> 'Verify SSL certificate',
+	'SMTP_VERIFY_PEER_EXPLAIN'		=> 'Require verification of SSL certificate used by SMTP server.<em><strong>Warning:</strong> Connecting peers with unverified SSL certificates may cause security implications.</em>',
+	'SMTP_VERIFY_PEER_NAME'			=> 'Verify SMTP peer name',
+	'SMTP_VERIFY_PEER_NAME_EXPLAIN'	=> 'Require verification of peer name for SMTP servers using SSL / TLS connections.<em><strong>Warning:</strong> Connecting to unverified peers may cause security implications.</em>',
 
 	'USE_SMTP'						=> 'Use SMTP server for email',
 	'USE_SMTP_EXPLAIN'				=> 'Select “Yes” if you want or have to send email via a named server instead of the local mail function.',
-- 
cgit v1.2.1


From dcdb0dcd23dd009f79016e2b97a21016b9847f0a Mon Sep 17 00:00:00 2001
From: Mukesh Kumar Kharita <mukeshnithcse@gmail.com>
Date: Wed, 8 Mar 2017 15:59:17 +0530
Subject: [ticket/14758] Improve the ACP Parameter wording

PHPBB3-14758
---
 phpBB/language/en/acp/attachments.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 7d3d93d693..750f2f8d61 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -125,7 +125,7 @@ $lang = array_merge($lang, array(
 	'MAX_EXTGROUP_FILESIZE'			=> 'Maximum file size',
 	'MAX_IMAGE_SIZE'				=> 'Maximum image dimensions',
 	'MAX_IMAGE_SIZE_EXPLAIN'		=> 'Maximum size of image attachments. Set both values to 0px by 0px to disable dimension checking.',
-	'MAX_THUMB_WIDTH'				=> 'Maximum thumbnail width in pixel',
+	'MAX_THUMB_WIDTH'				=> 'Maximum thumbnail width/height in pixel',
 	'MAX_THUMB_WIDTH_EXPLAIN'		=> 'A generated thumbnail will not exceed the width set here.',
 	'MIN_THUMB_FILESIZE'			=> 'Minimum thumbnail file size',
 	'MIN_THUMB_FILESIZE_EXPLAIN'	=> 'Do not create a thumbnail for images smaller than this.',
-- 
cgit v1.2.1


From 5bf3e4b3c64e7b61153ce1613f61f34f02f6d584 Mon Sep 17 00:00:00 2001
From: nomind60s <nomind60s@users.noreply.github.com>
Date: Wed, 29 Mar 2017 12:24:35 -0600
Subject: [ticket/15151] ACP Cookie settings add explanatory text where it was
 missing

Improve the lead section to include a link to the phpBB.com Knowledge Base and
add explanation text for the Cookie domain, Cookie name and Cookie path fields.

PHPBB3-15151
---
 phpBB/language/en/acp/board.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 8b4db6a061..d8adf8041a 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -345,11 +345,14 @@ $lang = array_merge($lang, array(
 
 // Cookie Settings
 $lang = array_merge($lang, array(
-	'ACP_COOKIE_SETTINGS_EXPLAIN'		=> 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in.',
+	'ACP_COOKIE_SETTINGS_EXPLAIN'		=> 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in. If you have problems with users staying logging in to your board, visit the <b><a href="https://www.phpbb.com/support/docs/en/3.1/kb/article/fixing-incorrect-cookie-settings/">phpBB.com Knowledge Base - Fixing incorrect cookie settings</a></b>.',
 
 	'COOKIE_DOMAIN'				=> 'Cookie domain',
+	'COOKIE_DOMAIN_EXPLAIN'		=> 'In most cases the cookie domain is optional. Leave it blank if you are unsure.<br /><br /> In the case where you have a board integrated with other software or have multiple domains, then to determine the cookie domain you need to do the following. If you have something like <i>example.com</i> and <i>forums.example.com</i>, or perhaps <i>forums.example.com</i> and <i>blog.example.com</i>. Remove the subdomains until you find the common domain, <i>example.com</i>. Now add a dot in front of the common domain and you would enter .example.com (note the dot at the beginning).', 
 	'COOKIE_NAME'				=> 'Cookie name',
+	'COOKIE_NAME_EXPLAIN'		=> 'This can be anything what you want, make it original. Whenever the cookie settings are changed the name of the cookie should be changed.',
 	'COOKIE_PATH'				=> 'Cookie path',
+	'COOKIE_PATH_EXPLAIN'		=> 'Note that this is always a slash, it does not matter what your board URL is.',
 	'COOKIE_SECURE'				=> 'Cookie secure',
 	'COOKIE_SECURE_EXPLAIN'		=> 'If your server is running via SSL set this to enabled else leave as disabled. Having this enabled and not running via SSL will result in server errors during redirects.',
 	'ONLINE_LENGTH'				=> 'View online time span',
-- 
cgit v1.2.1


From d4ecb910d82e2373805a2b3b34d1a297402fc6c0 Mon Sep 17 00:00:00 2001
From: nomind60s <nomind60s@users.noreply.github.com>
Date: Wed, 29 Mar 2017 14:42:02 -0600
Subject: [ticket/15151] ACP Cookie settings explanatory text

Fixed extraneous whitespace at end of line.

PHPBB3-15151
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index d8adf8041a..0f3b3f2dc8 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -348,7 +348,7 @@ $lang = array_merge($lang, array(
 	'ACP_COOKIE_SETTINGS_EXPLAIN'		=> 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in. If you have problems with users staying logging in to your board, visit the <b><a href="https://www.phpbb.com/support/docs/en/3.1/kb/article/fixing-incorrect-cookie-settings/">phpBB.com Knowledge Base - Fixing incorrect cookie settings</a></b>.',
 
 	'COOKIE_DOMAIN'				=> 'Cookie domain',
-	'COOKIE_DOMAIN_EXPLAIN'		=> 'In most cases the cookie domain is optional. Leave it blank if you are unsure.<br /><br /> In the case where you have a board integrated with other software or have multiple domains, then to determine the cookie domain you need to do the following. If you have something like <i>example.com</i> and <i>forums.example.com</i>, or perhaps <i>forums.example.com</i> and <i>blog.example.com</i>. Remove the subdomains until you find the common domain, <i>example.com</i>. Now add a dot in front of the common domain and you would enter .example.com (note the dot at the beginning).', 
+	'COOKIE_DOMAIN_EXPLAIN'		=> 'In most cases the cookie domain is optional. Leave it blank if you are unsure.<br /><br /> In the case where you have a board integrated with other software or have multiple domains, then to determine the cookie domain you need to do the following. If you have something like <i>example.com</i> and <i>forums.example.com</i>, or perhaps <i>forums.example.com</i> and <i>blog.example.com</i>. Remove the subdomains until you find the common domain, <i>example.com</i>. Now add a dot in front of the common domain and you would enter .example.com (note the dot at the beginning).',
 	'COOKIE_NAME'				=> 'Cookie name',
 	'COOKIE_NAME_EXPLAIN'		=> 'This can be anything what you want, make it original. Whenever the cookie settings are changed the name of the cookie should be changed.',
 	'COOKIE_PATH'				=> 'Cookie path',
-- 
cgit v1.2.1


From 32f3ddca7061c7584508dd09e4b1226b8aae1aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= <rubencm@gmail.com>
Date: Thu, 30 Mar 2017 08:33:04 +0200
Subject: [ticket/15150] Add Jabber SSL context configuration options

PHPBB3-15150
---
 phpBB/language/en/acp/board.php | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 8b5e113b16..0cf0371889 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -589,20 +589,26 @@ $lang = array_merge($lang, array(
 $lang = array_merge($lang, array(
 	'ACP_JABBER_SETTINGS_EXPLAIN'	=> 'Here you can enable and control the use of Jabber for instant messaging and board notifications. Jabber is an open source protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Please be sure to enter already registered account details - phpBB will use the details you enter here as is.',
 
-	'JAB_ENABLE'				=> 'Enable Jabber',
-	'JAB_ENABLE_EXPLAIN'		=> 'Enables use of Jabber messaging and notifications.',
-	'JAB_GTALK_NOTE'			=> 'Please note that GTalk will not work because the <samp>dns_get_record</samp> function could not be found. This function is not available in PHP4, and is not implemented on Windows platforms. It currently does not work on BSD-based systems, including Mac OS.',
-	'JAB_PACKAGE_SIZE'			=> 'Jabber package size',
-	'JAB_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.',
-	'JAB_PASSWORD'				=> 'Jabber password',
-	'JAB_PASSWORD_EXPLAIN'		=> '<em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
-	'JAB_PORT'					=> 'Jabber port',
-	'JAB_PORT_EXPLAIN'			=> 'Leave blank unless you know it is not port 5222.',
-	'JAB_SERVER'				=> 'Jabber server',
-	'JAB_SERVER_EXPLAIN'		=> 'See %sjabber.org%s for a list of servers.',
-	'JAB_SETTINGS_CHANGED'		=> 'Jabber settings changed successfully.',
-	'JAB_USE_SSL'				=> 'Use SSL to connect',
-	'JAB_USE_SSL_EXPLAIN'		=> 'If enabled a secure connection is tried to be established. The Jabber port will be modified to 5223 if port 5222 is specified.',
-	'JAB_USERNAME'				=> 'Jabber username or JID',
-	'JAB_USERNAME_EXPLAIN'		=> 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.',
+	'JAB_ALLOW_SELF_SIGNED'			=> 'Allow self-signed SSL certificates',
+	'JAB_ALLOW_SELF_SIGNED_EXPLAIN'	=> 'Allow connections to Jabber server with self-signed SSL certificate.<em><strong>Warning:</strong> Allowing self-signed SSL certificates may cause security implications.</em>',
+	'JAB_ENABLE'					=> 'Enable Jabber',
+	'JAB_ENABLE_EXPLAIN'			=> 'Enables use of Jabber messaging and notifications.',
+	'JAB_GTALK_NOTE'				=> 'Please note that GTalk will not work because the <samp>dns_get_record</samp> function could not be found. This function is not available in PHP4, and is not implemented on Windows platforms. It currently does not work on BSD-based systems, including Mac OS.',
+	'JAB_PACKAGE_SIZE'				=> 'Jabber package size',
+	'JAB_PACKAGE_SIZE_EXPLAIN'		=> 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.',
+	'JAB_PASSWORD'					=> 'Jabber password',
+	'JAB_PASSWORD_EXPLAIN'			=> '<em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
+	'JAB_PORT'						=> 'Jabber port',
+	'JAB_PORT_EXPLAIN'				=> 'Leave blank unless you know it is not port 5222.',
+	'JAB_SERVER'					=> 'Jabber server',
+	'JAB_SERVER_EXPLAIN'			=> 'See %sjabber.org%s for a list of servers.',
+	'JAB_SETTINGS_CHANGED'			=> 'Jabber settings changed successfully.',
+	'JAB_USE_SSL'					=> 'Use SSL to connect',
+	'JAB_USE_SSL_EXPLAIN'			=> 'If enabled a secure connection is tried to be established. The Jabber port will be modified to 5223 if port 5222 is specified.',
+	'JAB_USERNAME'					=> 'Jabber username or JID',
+	'JAB_USERNAME_EXPLAIN'			=> 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.',
+	'JAB_VERIFY_PEER'				=> 'Verify SSL certificate',
+	'JAB_VERIFY_PEER_EXPLAIN'		=> 'Require verification of SSL certificate used by Jabber server.<em><strong>Warning:</strong> Connecting peers with unverified SSL certificates may cause security implications.</em>',
+	'JAB_VERIFY_PEER_NAME'			=> 'Verify Jabber peer name',
+	'JAB_VERIFY_PEER_NAME_EXPLAIN'	=> 'Require verification of peer name for Jabber servers using SSL / TLS connections.<em><strong>Warning:</strong> Connecting to unverified peers may cause security implications.</em>',
 ));
-- 
cgit v1.2.1


From d0486964cec51ef28c713080fa8f55d231e9582b Mon Sep 17 00:00:00 2001
From: nomind60s <nomind60s@users.noreply.github.com>
Date: Wed, 19 Apr 2017 06:34:16 -0600
Subject: [ticket/15151] Use redirected link for consistency

Other phpbb.com links used in the core use a redirect rather than a direct link
so change to make the Cookie settings link a redirect also.

PHPBB3-15151
---
 phpBB/language/en/acp/board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 0f3b3f2dc8..7bd5fa903a 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -345,7 +345,7 @@ $lang = array_merge($lang, array(
 
 // Cookie Settings
 $lang = array_merge($lang, array(
-	'ACP_COOKIE_SETTINGS_EXPLAIN'		=> 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in. If you have problems with users staying logging in to your board, visit the <b><a href="https://www.phpbb.com/support/docs/en/3.1/kb/article/fixing-incorrect-cookie-settings/">phpBB.com Knowledge Base - Fixing incorrect cookie settings</a></b>.',
+	'ACP_COOKIE_SETTINGS_EXPLAIN'		=> 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in. If you have problems with users staying logging in to your board, visit the <b><a href="https://www.phpbb.com/support/go/cookie-settings/">phpBB.com Knowledge Base - Fixing incorrect cookie settings</a></b>.',
 
 	'COOKIE_DOMAIN'				=> 'Cookie domain',
 	'COOKIE_DOMAIN_EXPLAIN'		=> 'In most cases the cookie domain is optional. Leave it blank if you are unsure.<br /><br /> In the case where you have a board integrated with other software or have multiple domains, then to determine the cookie domain you need to do the following. If you have something like <i>example.com</i> and <i>forums.example.com</i>, or perhaps <i>forums.example.com</i> and <i>blog.example.com</i>. Remove the subdomains until you find the common domain, <i>example.com</i>. Now add a dot in front of the common domain and you would enter .example.com (note the dot at the beginning).',
-- 
cgit v1.2.1


From 170613848ad86cea1f140ed1cfdb55d581324ffb Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 3 Jun 2017 11:07:34 +0200
Subject: [ticket/15219] Add console command for updating hashes to bcrypt

PHPBB3-15219
---
 phpBB/language/en/cli.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index 6989f26f72..27e72d5ccd 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -64,6 +64,7 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_RECALCULATE_EMAIL_HASH'	=> 'Recalculates the user_email_hash column of the users table.',
 	'CLI_DESCRIPTION_SET_ATOMIC_CONFIG'			=> 'Sets a configuration option’s value only if the old matches the current value',
 	'CLI_DESCRIPTION_SET_CONFIG'				=> 'Sets a configuration option’s value',
+	'CLI_DESCRIPTION_UPDATE_HASH_BCRYPT'		=> 'Updates outdated password hashes to be hashed with bcrypt.',
 
 	'CLI_EXTENSION_DISABLE_FAILURE'		=> 'Could not disable extension %s',
 	'CLI_EXTENSION_DISABLE_SUCCESS'		=> 'Successfully disabled extension %s',
@@ -78,6 +79,7 @@ $lang = array_merge($lang, array(
 	'CLI_EXTENSIONS_ENABLED'			=> 'Enabled',
 
 	'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS'	=> 'Successfully recalculated all email hashes.',
+	'CLI_FIXUP_UPDATE_HASH_BCRYPT_SUCCESS'		=> 'Successfully updated outdated password hashes to bcrypt.'
 ));
 
 // Additional help for commands.
-- 
cgit v1.2.1


From fd822ade20a1407af6a464ffec71c4da0d330a3c Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Fri, 26 May 2017 20:27:30 +0700
Subject: [ticket/15238] Add console command to fix forums/modules left/right
 IDs

PHPBB3-15238
---
 phpBB/language/en/cli.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/language/en')

diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php
index 27e72d5ccd..4e27be48cc 100644
--- a/phpBB/language/en/cli.php
+++ b/phpBB/language/en/cli.php
@@ -55,6 +55,7 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_DISABLE_EXTENSION'			=> 'Disables the specified extension.',
 	'CLI_DESCRIPTION_ENABLE_EXTENSION'			=> 'Enables the specified extension.',
 	'CLI_DESCRIPTION_FIND_MIGRATIONS'			=> 'Finds migrations that are not depended upon.',
+	'CLI_DESCRIPTION_FIX_LEFT_RIGHT_IDS'		=> 'Repairs the tree structure of the forums and modules.',
 	'CLI_DESCRIPTION_GET_CONFIG'				=> 'Gets a configuration option’s value',
 	'CLI_DESCRIPTION_INCREMENT_CONFIG'			=> 'Increments a configuration option’s integer value',
 	'CLI_DESCRIPTION_LIST_EXTENSIONS'			=> 'Lists all extensions in the database and on the filesystem.',
@@ -78,6 +79,7 @@ $lang = array_merge($lang, array(
 	'CLI_EXTENSIONS_DISABLED'			=> 'Disabled',
 	'CLI_EXTENSIONS_ENABLED'			=> 'Enabled',
 
+	'CLI_FIXUP_FIX_LEFT_RIGHT_IDS_SUCCESS'		=> 'Successfully repaired the tree structure of the forums and modules.',
 	'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS'	=> 'Successfully recalculated all email hashes.',
 	'CLI_FIXUP_UPDATE_HASH_BCRYPT_SUCCESS'		=> 'Successfully updated outdated password hashes to bcrypt.'
 ));
-- 
cgit v1.2.1