8 files changed, 55 insertions, 30 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index d451bdd515..24cfe4556b 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -298,6 +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 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',
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index ddacb9df25..0d47e37d09 100644
--- a/phpBB/language/en/acp/email.php
+++ b/phpBB/language/en/acp/email.php
@@ -38,7 +38,7 @@ if (empty($lang) || !is_array($lang))
 
 // Email settings
 $lang = array_merge($lang, array(
-	'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.',
+	'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 20 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',
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 67813bcba4..5972f8a18e 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',
@@ -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/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.',
 ));
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 783faa8fad..79d504a67d 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
@@ -864,6 +868,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',
@@ -929,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',
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?',
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',
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.',