Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation

Conflicts:
	phpBB/styles/subsilver2/template/ucp_attachments.html

phpBB/includes/ucp/ucp_attachments.php

@@ -182,6 +182,7 @@ class ucp_attachments
 
 		$template->assign_vars(array(
 			'TOTAL_ATTACHMENTS'		=> $num_attachments,
+			'NUM_ATTACHMENTS'		=> $user->lang('NUM_ATTACHMENTS', $num_attachments),
 
 			'L_TITLE'				=> $user->lang['UCP_ATTACHMENTS'],
 

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

phpBB/styles/prosilver/template/ucp_attachments.html

@@ -12,7 +12,7 @@
 	<!-- IF .attachrow -->
 		<div class="action-bar top">
 			<div class="pagination">
-				{TOTAL_ATTACHMENTS} {L_TITLE}
+				{NUM_ATTACHMENTS}
 				<!-- IF .pagination --> 
 					<!-- INCLUDE pagination.html -->
 				<!-- ELSE -->