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: [PATCH] [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 +++++
 phpBB/styles/prosilver/template/plupload.html | 45 +++++++++++++------
 3 files changed, 44 insertions(+), 14 deletions(-)

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',
diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html
index 9b1911f708..bf0863d2a7 100644
--- a/phpBB/styles/prosilver/template/plupload.html
+++ b/phpBB/styles/prosilver/template/plupload.html
@@ -4,27 +4,44 @@
 //<![CDATA[
 phpbb.plupload = {
 	i18n: {
-		'Select files': '{LA_PLUPLOAD_SELECT_FILES}',
+		'b': '{LA_B}',
+		'kb': '{LA_KB}',
+		'mb': '{LA_MB}',
+		'gb': '{LA_GB}',
+		'tb': '{LA_TB}',
+		'Add Files': '{LA_PLUPLOAD_ADD_FILES}',
 		'Add files to the upload queue and click the start button.': '{LA_PLUPLOAD_ADD_FILES_TO_QUEUE}',
-		'Filename': '{LA_PLUPLOAD_FILENAME}',
-		'Status': '{LA_PLUPLOAD_STATUS}',
-		'Size': '{LA_PLUPLOAD_SIZE}',
-		'Add files': '{LA_PLUPLOAD_ADD_FILES}',
-		'Stop current upload': '{LA_PLUPLOAD_STOP_CURRENT_UPLOAD}',
-		'Start uploading queue': '{LA_PLUPLOAD_START_CURRENT_UPLOAD}',
-		'Uploaded %d/%d files': '{LA_PLUPLOAD_UPLOADED}',
-		'N/A': '{LA_PLUPLOAD_NOT_APPLICABLE}',
+		'Close': '{LA_PLUPLOAD_CLOSE}',
 		'Drag files here.': '{LA_PLUPLOAD_DRAG}',
+		'Duplicate file error.': '{LA_PLUPLOAD_DUPLICATE_ERROR}',
+		'Error: File too large:': '{LA_PLUPLOAD_ERR_FILE_TOO_LARGE}',
+		'Error: Invalid file extension:': '{LA_PLUPLOAD_ERR_FILE_INVALID_EXT}',
+		'File: %s': '{LA_PLUPLOAD_FILE}',
+		'File: %s, size: %d, max file size: %d': '{LA_PLUPLOAD_FILE_DETAILS}',
+		'File count error.': '{LA_PLUPLOAD_ERR_FILE_COUNT}',
 		'File extension error.': '{LA_PLUPLOAD_EXTENSION_ERROR}',
 		'File size error.': '{LA_PLUPLOAD_SIZE_ERROR}',
-		'Init error.': '{LA_PLUPLOAD_INIT_ERROR}',
-		'HTTP Error.': '{LA_PLUPLOAD_HTTP_ERROR}',
-		'Security error.': '{LA_PLUPLOAD_SECURITY_ERROR}',
+		'Filename': '{LA_PLUPLOAD_FILENAME}',
 		'Generic error.': '{LA_PLUPLOAD_GENERIC_ERROR}',
+		'HTTP Error.': '{LA_PLUPLOAD_HTTP_ERROR}',
+		'Image format either wrong or not supported.': '{LA_PLUPLOAD_IMAGE_FORMAT}',
+		'Init error.': '{LA_PLUPLOAD_INIT_ERROR}',
 		'IO error.': '{LA_PLUPLOAD_IO_ERROR}',
+		'N/A': '{LA_PLUPLOAD_NOT_APPLICABLE}',
+		'Runtime ran out of available memory.': '{LA_PLUPLOAD_ERR_RUNTIME_MEMORY}',
+		'Security error.': '{LA_PLUPLOAD_SECURITY_ERROR}',
+		'Select files': '{LA_PLUPLOAD_SELECT_FILES}',
+		'Size': '{LA_PLUPLOAD_SIZE}',
+		'Start Upload': '{LA_PLUPLOAD_START_UPLOAD}',
+		'Start uploading queue': '{LA_PLUPLOAD_START_CURRENT_UPLOAD}',
+		'Status': '{LA_PLUPLOAD_STATUS}',
 		'Stop Upload': '{LA_PLUPLOAD_STOP_UPLOAD}',
-		'Start upload': '{LA_PLUPLOAD_START_UPLOAD}',
-		'%d files queued': '{LA_PLUPLOAD_FILES_QUEUED}'
+		'Stop current upload': '{LA_PLUPLOAD_STOP_CURRENT_UPLOAD}',
+		'Upload element accepts only %d file(s) at a time. Extra files were stripped.': '{LA_PLUPLOAD_ERR_UPLOAD_LIMIT}',
+		"Upload URL might be wrong or doesn't exist.": '{LA_PLUPLOAD_ERR_UPLOAD_URL}',
+		'Uploaded %d/%d files': '{LA_PLUPLOAD_UPLOADED}',
+		'%d files queued': '{LA_PLUPLOAD_FILES_QUEUED}',
+		'%s already present in the queue.': '{LA_PLUPLOAD_ALREADY_QUEUED}'
 	},
 	config: {
 		runtimes: 'html5',