Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12456] Add , after the last array element
  [ticket/12456] Fix duplicated empty lines in language files
  [ticket/12456] Fix missing new lines at the end of email templates

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',

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',

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.',

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
@@ -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',

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

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}

phpBB/language/en/email/admin_send_email.txt

@@ -10,5 +10,4 @@ Message sent to you follows:
 
 {MESSAGE}
 
-
 {EMAIL_SIG}

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}

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}

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.'
-	)
+	),
 );

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.'
-	)
+	),
 );

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.',
-		)
+		),
 	),
 ));

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,10 +626,9 @@ $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.',
 	'GROUP_LEADER'		=> 'Leaderships',
 	'GROUP_MEMBER'		=> 'Memberships',