Merge branch 'master' into encryption_improved_error_messages_4617

94 files changed, 656 insertions, 398 deletions

diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index d224e79d01b..76c03c87a51 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -79,7 +79,7 @@ if($source) {
 	$success = false;
 	if (!$content) {
 		$templateManager = OC_Helper::getFileTemplateManager();
-		$mimeType = OC_Helper::getMimeType($target);
+		$mimeType = OC_Helper::getMimetypeDetector()->detectPath($target);
 		$content = $templateManager->getTemplate($mimeType);
 	}
 
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index a9b93dc2dee..02a73ba83e5 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -19,10 +19,13 @@
 	background:#f8f8f8; border:1px solid #ddd; border-radius:10px; border-top-left-radius:0;
 	box-shadow:0 2px 7px rgba(170,170,170,.4);
 }
-#new>ul>li { height:20px; margin:.3em; padding-left:2em; padding-bottom:0.1em;
+#new>ul>li { height:36px; margin:.3em; padding-left:3em; padding-bottom:0.1em;
 		background-repeat:no-repeat; cursor:pointer; }
-#new>ul>li>p { cursor:pointer; }
-#new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
+#new>ul>li>p { cursor:pointer; padding-top: 7px; padding-bottom: 7px;}
+#new>ul>li>form>input {
+	padding: 5px;
+	margin: 2px 0;
+}
 
 #trash { margin: 0 1em; z-index:1010; float: right; }
 
@@ -65,12 +68,6 @@
 
 /* FILE TABLE */
 
-#emptyfolder {
-	position:absolute;
-	margin:10em 0 0 10em;
-	font-size:1.5em; font-weight:bold;
-	color:#888; text-shadow:#fff 0 1px 0;
-}
 #filestable { position: relative; top:37px; width:100%; }
 tbody tr { background-color:#fff; height:2.5em; }
 tbody tr:hover, tbody tr:active {
@@ -85,54 +82,153 @@ span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.M
 tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; }
 table tr.mouseOver td { background-color:#eee; }
 table th { height:2em; padding:0 .5em; color:#999; }
-table th .name { float:left; margin-left:.5em; }
+table th .name {
+	position: absolute;
+	left: 55px;
+	top: 15px;
+}
 table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
-table td { border-bottom:1px solid #eee; font-style:normal; background-position:1em .5em; background-repeat:no-repeat; }
-table th#headerName { width:100em; /* not really sure why this works better than 100% … table styling */ }
-table th#headerSize, table td.filesize { min-width:3em; padding:0 1em; text-align:right; }
-table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-align:left; }
+table td {
+	border-bottom: 1px solid #eee;
+	font-style: normal;
+	background-position: 8px center;
+	background-repeat: no-repeat;
+}
+table th#headerName {
+	position: relative;
+	width: 100em; /* not really sure why this works better than 100% … table styling */
+	padding: 0;
+}
+#headerName-container {
+	position: relative;
+	height: 50px;
+}
+table th#headerSize, table td.filesize {
+	min-width: 3em;
+	padding: 0 1em;
+	text-align: right;
+}
+table th#headerDate, table td.date {
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	position: relative;
+	min-width: 11em;
+	display: block;
+	height: 51px;
+}
 
 /* Multiselect bar */
-#filestable.multiselect { top:63px; }
+#filestable.multiselect {
+	top: 88px;
+}
 table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 80px; width:100%; }
+
 table.multiselect thead th {
 	background-color: rgba(210,210,210,.7);
 	color: #000;
 	font-weight: bold;
 	border-bottom: 0;
 }
-table.multiselect #headerName { width: 100%; }
+table.multiselect #headerName {
+	position: relative;
+	width: 100%;
+}
 table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
-table td.filename a.name { display:block; height:1.5em; vertical-align:middle; margin-left:3em; }
+table td.filename a.name {
+	position:relative; /* Firefox needs to explicitly have this default set … */
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	display: block;
+	height: 50px;
+	vertical-align: middle;
+	padding: 0;
+}
 table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
-table td.filename input.filename { width:100%; cursor:text; }
-table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; }
+table td.filename input.filename {
+	width: 80%;
+	font-size: 14px;
+	margin-top: 8px;
+	margin-left: 2px;
+	cursor: text;
+}
+table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em .3em; }
 table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; }
+
+#modified {
+	position: absolute;
+	top: 15px;
+}
+.modified {
+	position: relative;
+	top: 11px;
+	left: 5px;
+}
+
 /* TODO fix usability bug (accidental file/folder selection) */
-table td.filename .nametext { overflow:hidden; text-overflow:ellipsis; max-width:800px; }
+table td.filename .nametext {
+	position: absolute;
+	top: 16px;
+	left: 55px;
+	padding: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	max-width: 800px;
+}
 table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
 table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 
+
 /* File checkboxes */
-#fileList tr td.filename>input[type="checkbox"]:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
-#fileList tr td.filename>input[type="checkbox"]:hover:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-/* Always show checkbox when selected */
-#fileList tr td.filename>input[type="checkbox"]:checked:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
-#fileList tr.selected td.filename>input[type="checkbox"]:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+#fileList tr td.filename>input[type="checkbox"]:first-child {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+	filter: alpha(opacity=0);
+	opacity: 0;
+	float: left;
+	margin: 32px 0 4px 32px; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/
+}
+/* Show checkbox when hovering, checked, or selected */
+#fileList tr:hover td.filename>input[type="checkbox"]:first-child,
+#fileList tr td.filename>input[type="checkbox"]:checked:first-child,
+#fileList tr.selected td.filename>input[type="checkbox"]:first-child {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter: alpha(opacity=100);
+	opacity: 1;
+}
+/* Use label to have bigger clickable size for checkbox */
+#fileList tr td.filename>input[type="checkbox"] + label,
+#select_all + label {
+	height: 50px;
+	position: absolute;
+	width: 50px;
+	z-index: 5;
+}
+#fileList tr td.filename>input[type="checkbox"] + label {
+	left: 0;
+}
+#select_all + label {
+	top: 0;
+}
+#select_all {
+	position: absolute;
+	top: 18px;
+	left: 18px;
+}
+
 
 #fileList tr td.filename {
 	position:relative; width:100%;
 	-webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms;
 }
-#select_all { float:left; margin:.4em 0.6em 0 .5em; }
+
 #uploadsize-message,#delete-confirm { display:none; }
 
 /* File actions */
 .fileactions {
-	position:absolute; top:.6em; right:0;
-	font-size:.8em;
+	position: absolute;
+	top: 16px;
+	right: 0;
+	font-size: 11px;
 }
-#fileList .name { position:relative; /* Firefox needs to explicitly have this default set … */ }
 #fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */
 	background-color: rgba(240,240,240,0.898);
 	box-shadow: -5px 0 7px rgba(240,240,240,0.898);
@@ -142,15 +238,39 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 	box-shadow: -5px 0 7px rgba(230,230,230,.9);
 }
 #fileList .fileactions a.action img { position:relative; top:.2em; }
-#fileList a.action { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; }
+
 #fileList img.move2trash { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; float:right; }
-a.action.delete { float:right; }
+#fileList a.action.delete {
+	position: absolute;
+	right: 0;
+	top: 0;
+	margin: 0;
+	padding: 15px 14px 19px !important;
+}
 a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
-.selectedActions { display:none; float:right; }
-.selectedActions a { display:inline; margin:-.5em 0; padding:.5em !important; }
-.selectedActions a img { position:relative; top:.3em; }
+
+/* Actions for selected files */
+.selectedActions {
+	display: none;
+	position: absolute;
+	top: -1px;
+	right: 0;
+	padding: 15px 8px;
+}
+.selectedActions a {
+	display: inline;
+	padding: 17px 5px;
+}
+.selectedActions a img {
+	position:relative;
+	top:.3em;
+}
+
 
 #fileList a.action {
+	display: inline;
+	margin: -.5em 0;
+	padding: 18px 8px !important;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
 	filter: alpha(opacity=0);
 	opacity: 0;
@@ -185,9 +305,8 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 	padding-bottom: 8px;
 	border-bottom: none;
 }
-
 .summary .info {
-	margin-left: 3em;
+	margin-left: 55px;
 }
 
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
diff --git a/apps/files/index.php b/apps/files/index.php
index e4d8e353858..f1e120c872c 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -74,6 +74,7 @@ foreach ($content as $i) {
 		}
 	}
 	$i['directory'] = $dir;
+	$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']);
 	$files[] = $i;
 }
 
@@ -95,6 +96,7 @@ $list->assign('files', $files);
 $list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
 $list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
 $list->assign('disableSharing', false);
+$list->assign('isPublic', false);
 $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
 $breadcrumbNav->assign('breadcrumb', $breadcrumb);
 $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 1e6ab74fb6d..3d620c5640b 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -227,7 +227,7 @@ $(document).ready(function() {
 		$(this).data('text',text);
 		$(this).children('p').remove();
 		var form=$('<form></form>');
-		var input=$('<input>');
+		var input=$('<input type="text">');
 		form.append(input);
 		$(this).append(form);
 		input.focus();
@@ -268,8 +268,9 @@ $(document).ready(function() {
 								tr.attr('data-mime',result.data.mime);
 								tr.attr('data-id', result.data.id);
 								tr.find('.filesize').text(humanFileSize(result.data.size));
-								getMimeIcon(result.data.mime,function(path){
-									tr.find('td.filename').attr('style','background-image:url('+path+')');
+								var path = getPathForPreview(name);
+								lazyLoadPreview(path, result.data.mime, function(previewpath){
+									tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
 								});
 							} else {
 								OC.dialogs.alert(result.data.message, t('core', 'Error'));
@@ -330,8 +331,9 @@ $(document).ready(function() {
 						var tr=$('tr').filterAttr('data-file',localName);
 						tr.data('mime',mime).data('id',id);
 						tr.attr('data-id', id);
-						getMimeIcon(mime,function(path){
-							tr.find('td.filename').attr('style','background-image:url('+path+')');
+						var path = $('#dir').val()+'/'+localName;
+						lazyLoadPreview(path, mime, function(previewpath){
+							tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
 						});
 					});
 					eventSource.listen('error',function(error){
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e11cc70802b..29be5e0d362 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -15,9 +15,10 @@ var FileList={
 		// filename td
 		td = $('<td></td>').attr({
 			"class": "filename",
-			"style": 'background-image:url('+iconurl+'); background-size: 16px;'
+			"style": 'background-image:url('+iconurl+'); background-size: 32px;'
 		});
-		td.append('<input type="checkbox" />');
+		var rand = Math.random().toString(16).slice(2);
+		td.append('<input id="select-'+rand+'" type="checkbox" /><label for="select-'+rand+'"></label>');
 		var link_elem = $('<a></a>').attr({
 			"class": "name",
 			"href": linktarget
@@ -146,7 +147,7 @@ var FileList={
 		$('tr').filterAttr('data-file',name).remove();
 		FileList.updateFileSummary();
 		if($('tr[data-file]').length==0){
-			$('#emptyfolder').show();
+			$('#emptycontent').show();
 		}
 	},
 	insertElement:function(name,type,element){
@@ -176,7 +177,7 @@ var FileList={
 		}else{
 			$('#fileList').append(element);
 		}
-		$('#emptyfolder').hide();
+		$('#emptycontent').hide();
 		FileList.updateFileSummary();
 	},
 	loadingDone:function(name, id){
@@ -187,8 +188,9 @@ var FileList={
 		if (id != null) {
 			tr.attr('data-id', id);
 		}
-		getMimeIcon(mime,function(path){
-			tr.find('td.filename').attr('style','background-image:url('+path+')');
+		var path = getPathForPreview(name);
+		lazyLoadPreview(path, mime, function(previewpath){
+			tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
 		});
 		tr.find('td.filename').draggable(dragOptions);
 	},
@@ -200,7 +202,7 @@ var FileList={
 		tr=$('tr').filterAttr('data-file',name);
 		tr.data('renaming',true);
 		td=tr.children('td.filename');
-		input=$('<input class="filename"/>').val(name);
+		input=$('<input type="text" class="filename"/>').val(name);
 		form=$('<form></form>');
 		form.append(input);
 		td.children('a.name').hide();
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 87311237e36..d729077ea72 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -454,8 +454,9 @@ var createDragShadow = function(event){
 		if (elem.type === 'dir') {
 			newtr.find('td.filename').attr('style','background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')');
 		} else {
-			getMimeIcon(elem.mime,function(path){
-				newtr.find('td.filename').attr('style','background-image:url('+path+')');
+			var path = getPathForPreview(elem.name);
+			lazyLoadPreview(path, elem.mime, function(previewpath){
+				newtr.find('td.filename').attr('style','background-image:url('+previewpath+')');
 			});
 		}
 	});
@@ -631,6 +632,23 @@ function getMimeIcon(mime, ready){
 }
 getMimeIcon.cache={};
 
+function getPathForPreview(name) {
+	var path = $('#dir').val() + '/' + name;
+	return path;
+}
+
+function lazyLoadPreview(path, mime, ready) {
+	getMimeIcon(mime,ready);
+	var x = $('#filestable').data('preview-x');
+	var y = $('#filestable').data('preview-y');
+	var previewURL = OC.Router.generate('core_ajax_preview', {file: encodeURIComponent(path), x:x, y:y});
+	$.get(previewURL, function() {
+		previewURL = previewURL.replace('(','%28');
+		previewURL = previewURL.replace(')','%29');
+		ready(previewURL + '&reload=true');
+	});
+}
+
 function getUniqueName(name){
 	if($('tr').filterAttr('data-file',name).length>0){
 		var parts=name.split('.');
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index a6c4e65530c..99eb409a369 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -2,6 +2,8 @@
 $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
 "Could not move %s" => "فشل في نقل %s",
+"Unable to set upload directory." => "غير قادر على تحميل المجلد",
+"Invalid Token" => "علامة غير صالحة",
 "No file was uploaded. Unknown error" => "لم يتم رفع أي ملف , خطأ غير معروف",
 "There is no error, the file uploaded with success" => "تم ترفيع الملفات بنجاح.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "حجم الملف المرفوع تجاوز قيمة  upload_max_filesize الموجودة في ملف php.ini ",
@@ -11,12 +13,15 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "المجلد المؤقت غير موجود",
 "Failed to write to disk" => "خطأ في الكتابة على القرص الصلب",
 "Not enough storage available" => "لا يوجد مساحة تخزينية كافية",
+"Upload failed" => "عملية الرفع فشلت",
 "Invalid directory." => "مسار غير صحيح.",
 "Files" => "الملفات",
 "Unable to upload your file as it is a directory or has 0 bytes" => "فشل في رفع ملفاتك , إما أنها مجلد أو حجمها 0 بايت",
+"Not enough space available" => "لا توجد مساحة كافية",
 "Upload cancelled." => "تم إلغاء عملية رفع الملفات .",
 "File upload is in progress. Leaving the page now will cancel the upload." => "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
 "URL cannot be empty." => "عنوان ال URL  لا يجوز أن يكون فارغا.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "تسمية ملف غير صالحة. استخدام الاسم \"shared\" محجوز بواسطة ownCloud",
 "Error" => "خطأ",
 "Share" => "شارك",
 "Delete permanently" => "حذف بشكل دائم",
@@ -28,18 +33,21 @@ $TRANSLATIONS = array(
 "cancel" => "إلغاء",
 "replaced {new_name} with {old_name}" => "استبدل {new_name}  بـ  {old_name}",
 "undo" => "تراجع",
+"_%n folder_::_%n folders_" => array("","","","","",""),
+"_%n file_::_%n files_" => array("","","","","",""),
+"{dirs} and {files}" => "{dirs} و {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("","","","","",""),
+"files uploading" => "يتم تحميل الملفات",
 "'.' is an invalid file name." => "\".\" اسم ملف غير صحيح.",
 "File name cannot be empty." => "اسم الملف لا يجوز أن يكون فارغا",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "اسم غير صحيح , الرموز  '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها",
 "Your storage is full, files can not be updated or synced anymore!" => "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
 "Your storage is almost full ({usedSpacePercent}%)" => "مساحتك التخزينية امتلأت تقريبا ",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك.",
 "Your download is being prepared. This might take some time if the files are big." => "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير.",
 "Name" => "اسم",
 "Size" => "حجم",
 "Modified" => "معدل",
-"_%n folder_::_%n folders_" => array("","","","","",""),
-"_%n file_::_%n files_" => array("","","","","",""),
 "Upload" => "رفع",
 "File handling" => "التعامل مع الملف",
 "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 1e2104370ba..913875e863a 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
 "No file was uploaded" => "Фахлът не бе качен",
 "Missing a temporary folder" => "Липсва временна папка",
 "Failed to write to disk" => "Възникна проблем при запис в диска",
+"Upload failed" => "Качването е неуспешно",
 "Invalid directory." => "Невалидна директория.",
 "Files" => "Файлове",
 "Upload cancelled." => "Качването е спряно.",
@@ -17,12 +18,12 @@ $TRANSLATIONS = array(
 "replace" => "препокриване",
 "cancel" => "отказ",
 "undo" => "възтановяване",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "Име",
 "Size" => "Размер",
 "Modified" => "Променено",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Качване",
 "Maximum upload size" => "Максимален размер за качване",
 "0 is unlimited" => "Ползвайте 0 за без ограничения",
@@ -36,7 +37,6 @@ $TRANSLATIONS = array(
 "Delete" => "Изтриване",
 "Upload too large" => "Файлът който сте избрали за качване е прекалено голям",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",
-"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте.",
-"file" => "файл"
+"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 9efde85f0ce..2265c232a14 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -27,6 +27,8 @@ $TRANSLATIONS = array(
 "cancel" => "বাতিল",
 "replaced {new_name} with {old_name}" => "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে",
 "undo" => "ক্রিয়া প্রত্যাহার",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "'.' is an invalid file name." => "টি একটি অননুমোদিত নাম।",
 "File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
@@ -34,8 +36,6 @@ $TRANSLATIONS = array(
 "Name" => "রাম",
 "Size" => "আকার",
 "Modified" => "পরিবর্তিত",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "আপলোড",
 "File handling" => "ফাইল হ্যার্ডলিং",
 "Maximum upload size" => "আপলোডের সর্বোচ্চ আকার",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index f7d00692177..648ffce79d6 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Falta un fitxer temporal",
 "Failed to write to disk" => "Ha fallat en escriure al disc",
 "Not enough storage available" => "No hi ha prou espai disponible",
+"Upload failed" => "La pujada ha fallat",
 "Invalid directory." => "Directori no vàlid.",
 "Files" => "Fitxers",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "cancel·la",
 "replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}",
 "undo" => "desfés",
+"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
+"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
 "_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"),
 "files uploading" => "fitxers pujant",
 "'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.",
@@ -44,8 +47,6 @@ $TRANSLATIONS = array(
 "Name" => "Nom",
 "Size" => "Mida",
 "Modified" => "Modificat",
-"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
-"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
 "%s could not be renamed" => "%s no es pot canviar el nom",
 "Upload" => "Puja",
 "File handling" => "Gestió de fitxers",
@@ -71,10 +72,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
 "Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu",
 "Current scanning" => "Actualment escanejant",
-"directory" => "directori",
-"directories" => "directoris",
-"file" => "fitxer",
-"files" => "fitxers",
 "Upgrading filesystem cache..." => "Actualitzant la memòria de cau del sistema de fitxers..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index dd243eb5761..691cc92f1ad 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Chybí adresář pro dočasné soubory",
 "Failed to write to disk" => "Zápis na disk selhal",
 "Not enough storage available" => "Nedostatek dostupného úložného prostoru",
+"Upload failed" => "Odesílání selhalo",
 "Invalid directory." => "Neplatný adresář",
 "Files" => "Soubory",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo jeho velikost je 0 bajtů",
@@ -32,6 +33,9 @@ $TRANSLATIONS = array(
 "cancel" => "zrušit",
 "replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
 "undo" => "vrátit zpět",
+"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
+"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
+"{dirs} and {files}" => "{dirs} a {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"),
 "files uploading" => "soubory se odesílají",
 "'.' is an invalid file name." => "'.' je neplatným názvem souboru.",
@@ -39,13 +43,11 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
 "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo zrušeno, soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde si složky odšifrujete.",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete.",
 "Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.",
 "Name" => "Název",
 "Size" => "Velikost",
 "Modified" => "Upraveno",
-"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
-"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
 "%s could not be renamed" => "%s nemůže být přejmenován",
 "Upload" => "Odeslat",
 "File handling" => "Zacházení se soubory",
@@ -71,10 +73,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
 "Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
 "Current scanning" => "Aktuální prohledávání",
-"directory" => "adresář",
-"directories" => "adresáře",
-"file" => "soubor",
-"files" => "soubory",
 "Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
index f614fbee47c..157f4f89a23 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Plygell dros dro yn eisiau",
 "Failed to write to disk" => "Methwyd ysgrifennu i'r ddisg",
 "Not enough storage available" => "Dim digon o le storio ar gael",
+"Upload failed" => "Methwyd llwytho i fyny",
 "Invalid directory." => "Cyfeiriadur annilys.",
 "Files" => "Ffeiliau",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit",
@@ -29,6 +30,8 @@ $TRANSLATIONS = array(
 "cancel" => "diddymu",
 "replaced {new_name} with {old_name}" => "newidiwyd {new_name} yn lle {old_name}",
 "undo" => "dadwneud",
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","","",""),
 "files uploading" => "ffeiliau'n llwytho i fyny",
 "'.' is an invalid file name." => "Mae '.' yn enw ffeil annilys.",
@@ -40,8 +43,6 @@ $TRANSLATIONS = array(
 "Name" => "Enw",
 "Size" => "Maint",
 "Modified" => "Addaswyd",
-"_%n folder_::_%n folders_" => array("","","",""),
-"_%n file_::_%n files_" => array("","","",""),
 "Upload" => "Llwytho i fyny",
 "File handling" => "Trafod ffeiliau",
 "Maximum upload size" => "Maint mwyaf llwytho i fyny",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index a891bcfb378..aab12986ec1 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Manglende midlertidig mappe.",
 "Failed to write to disk" => "Fejl ved skrivning til disk.",
 "Not enough storage available" => "Der er ikke nok plads til rådlighed",
+"Upload failed" => "Upload fejlede",
 "Invalid directory." => "Ugyldig mappe.",
 "Files" => "Filer",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes.",
@@ -32,6 +33,9 @@ $TRANSLATIONS = array(
 "cancel" => "fortryd",
 "replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}",
 "undo" => "fortryd",
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
+"{dirs} and {files}" => "{dirs} og {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Uploader %n fil","Uploader %n filer"),
 "files uploading" => "uploader filer",
 "'.' is an invalid file name." => "'.' er et ugyldigt filnavn.",
@@ -44,8 +48,6 @@ $TRANSLATIONS = array(
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Ændret",
-"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "%s could not be renamed" => "%s kunne ikke omdøbes",
 "Upload" => "Upload",
 "File handling" => "Filhåndtering",
@@ -71,10 +73,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
 "Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
 "Current scanning" => "Indlæser",
-"directory" => "mappe",
-"directories" => "Mapper",
-"file" => "fil",
-"files" => "filer",
 "Upgrading filesystem cache..." => "Opgraderer filsystems cachen..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 53f9b1a2364..947d4f07461 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
 "Not enough storage available" => "Nicht genug Speicher vorhanden.",
+"Upload failed" => "Hochladen fehlgeschlagen",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
@@ -32,6 +33,9 @@ $TRANSLATIONS = array(
 "cancel" => "abbrechen",
 "replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
 "undo" => "rückgängig machen",
+"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
+"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
+"{dirs} and {files}" => "{dirs} und {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"),
 "files uploading" => "Dateien werden hoch geladen",
 "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
@@ -44,8 +48,6 @@ $TRANSLATIONS = array(
 "Name" => "Name",
 "Size" => "Größe",
 "Modified" => "Geändert",
-"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
-"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
 "%s could not be renamed" => "%s konnte nicht umbenannt werden",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
@@ -71,10 +73,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
 "Current scanning" => "Scanne",
-"directory" => "Verzeichnis",
-"directories" => "Verzeichnisse",
-"file" => "Datei",
-"files" => "Dateien",
 "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 8ea824c9c1a..db07ed7fadd 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
 "Not enough storage available" => "Nicht genug Speicher vorhanden.",
+"Upload failed" => "Hochladen fehlgeschlagen",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
@@ -32,6 +33,9 @@ $TRANSLATIONS = array(
 "cancel" => "abbrechen",
 "replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
 "undo" => "rückgängig machen",
+"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
+"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
+"{dirs} and {files}" => "{dirs} und {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"),
 "files uploading" => "Dateien werden hoch geladen",
 "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
@@ -44,8 +48,6 @@ $TRANSLATIONS = array(
 "Name" => "Name",
 "Size" => "Größe",
 "Modified" => "Geändert",
-"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
-"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
 "%s could not be renamed" => "%s konnte nicht umbenannt werden",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
@@ -71,10 +73,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
 "Current scanning" => "Scanne",
-"directory" => "Verzeichnis",
-"directories" => "Verzeichnisse",
-"file" => "Datei",
-"files" => "Dateien",
 "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 41645acb522..8c89e5e1feb 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
 "Failed to write to disk" => "Αποτυχία εγγραφής στο δίσκο",
 "Not enough storage available" => "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος",
+"Upload failed" => "Η μεταφόρτωση απέτυχε",
 "Invalid directory." => "Μη έγκυρος φάκελος.",
 "Files" => "Αρχεία",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes",
@@ -32,19 +33,20 @@ $TRANSLATIONS = array(
 "cancel" => "ακύρωση",
 "replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}",
 "undo" => "αναίρεση",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n φάκελος","%n φάκελοι"),
+"_%n file_::_%n files_" => array("%n αρχείο","%n αρχεία"),
+"_Uploading %n file_::_Uploading %n files_" => array("Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"),
 "files uploading" => "αρχεία ανεβαίνουν",
 "'.' is an invalid file name." => "'.' είναι μη έγκυρο όνομα αρχείου.",
 "File name cannot be empty." => "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις",
 "Your download is being prepared. This might take some time if the files are big." => "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος.",
 "Name" => "Όνομα",
 "Size" => "Μέγεθος",
 "Modified" => "Τροποποιήθηκε",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "Αδυναμία μετονομασίας του %s",
 "Upload" => "Μεταφόρτωση",
 "File handling" => "Διαχείριση αρχείων",
@@ -70,10 +72,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
 "Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
 "Current scanning" => "Τρέχουσα ανίχνευση",
-"directory" => "κατάλογος",
-"directories" => "κατάλογοι",
-"file" => "αρχείο",
-"files" => "αρχεία",
 "Upgrading filesystem cache..." => "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/en@pirate.php b/apps/files/l10n/en@pirate.php
index 83351f265f0..128f527aef1 100644
--- a/apps/files/l10n/en@pirate.php
+++ b/apps/files/l10n/en@pirate.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Download" => "Download"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 59ac4e1c398..ad538f2f2a9 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
 "Not enough storage available" => "Ne haveblas sufiĉa memoro",
+"Upload failed" => "Alŝuto malsukcesis",
 "Invalid directory." => "Nevalida dosierujo.",
 "Files" => "Dosieroj",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
@@ -30,6 +31,8 @@ $TRANSLATIONS = array(
 "cancel" => "nuligi",
 "replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
 "undo" => "malfari",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "dosieroj estas alŝutataj",
 "'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
@@ -41,8 +44,6 @@ $TRANSLATIONS = array(
 "Name" => "Nomo",
 "Size" => "Grando",
 "Modified" => "Modifita",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Alŝuti",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alŝutogrando",
@@ -67,8 +68,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
 "Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
 "Current scanning" => "Nuna skano",
-"file" => "dosiero",
-"files" => "dosieroj",
 "Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 415d23ae890..7a5785577af 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Falta la carpeta temporal",
 "Failed to write to disk" => "Falló al escribir al disco",
 "Not enough storage available" => "No hay suficiente espacio disponible",
+"Upload failed" => "Error en la subida",
 "Invalid directory." => "Directorio inválido.",
 "Files" => "Archivos",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Incapaz de subir su archivo, es un directorio o tiene 0 bytes",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "cancelar",
 "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
 "undo" => "deshacer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "subiendo archivos",
 "'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
@@ -43,8 +46,6 @@ $TRANSLATIONS = array(
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s no se pudo renombrar",
 "Upload" => "Subir",
 "File handling" => "Manejo de archivos",
@@ -70,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
 "Files are being scanned, please wait." => "Los archivos están siendo escaneados,  por favor espere.",
 "Current scanning" => "Escaneo actual",
-"directory" => "carpeta",
-"directories" => "carpetas",
-"file" => "archivo",
-"files" => "archivos",
 "Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 4c0eb691f67..1c26c10028d 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "Error al escribir en el disco",
 "Not enough storage available" => "No hay suficiente almacenamiento",
+"Upload failed" => "Error al subir el archivo",
 "Invalid directory." => "Directorio inválido.",
 "Files" => "Archivos",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "cancelar",
 "replaced {new_name} with {old_name}" => "se reemplazó {new_name} con {old_name}",
 "undo" => "deshacer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "Subiendo archivos",
 "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
@@ -39,12 +42,11 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
 "Your storage is full, files can not be updated or synced anymore!" => "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
 "Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento está casi lleno ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos.",
 "Your download is being prepared. This might take some time if the files are big." => "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes.",
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "No se pudo renombrar %s",
 "Upload" => "Subir",
 "File handling" => "Tratamiento de archivos",
@@ -70,10 +72,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
 "Current scanning" => "Escaneo actual",
-"directory" => "directorio",
-"directories" => "directorios",
-"file" => "archivo",
-"files" => "archivos",
 "Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 13198a9f881..5a2bb437d39 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
 "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
 "Not enough storage available" => "Saadaval pole piisavalt ruumi",
+"Upload failed" => "Üleslaadimine ebaõnnestus",
 "Invalid directory." => "Vigane kaust.",
 "Files" => "Failid",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "loobu",
 "replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
 "undo" => "tagasi",
+"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"),
+"_%n file_::_%n files_" => array("%n fail","%n faili"),
 "_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"),
 "files uploading" => "faili üleslaadimisel",
 "'.' is an invalid file name." => "'.' on vigane failinimi.",
@@ -44,8 +47,6 @@ $TRANSLATIONS = array(
 "Name" => "Nimi",
 "Size" => "Suurus",
 "Modified" => "Muudetud",
-"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"),
-"_%n file_::_%n files_" => array("%n fail","%n faili"),
 "%s could not be renamed" => "%s ümbernimetamine ebaõnnestus",
 "Upload" => "Lae üles",
 "File handling" => "Failide käsitlemine",
@@ -71,10 +72,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
 "Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
 "Current scanning" => "Praegune skannimine",
-"directory" => "kaust",
-"directories" => "kaustad",
-"file" => "fail",
-"files" => "faili",
 "Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 359b40ddefd..524be56af02 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Aldi bateko karpeta falta da",
 "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
 "Not enough storage available" => "Ez dago behar aina leku erabilgarri,",
+"Upload failed" => "igotzeak huts egin du",
 "Invalid directory." => "Baliogabeko karpeta.",
 "Files" => "Fitxategiak",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "ezeztatu",
 "replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
 "undo" => "desegin",
+"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"),
+"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
 "_Uploading %n file_::_Uploading %n files_" => array("Fitxategi %n igotzen","%n fitxategi igotzen"),
 "files uploading" => "fitxategiak igotzen",
 "'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
@@ -44,8 +47,6 @@ $TRANSLATIONS = array(
 "Name" => "Izena",
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
-"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"),
-"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
 "%s could not be renamed" => "%s ezin da berrizendatu",
 "Upload" => "Igo",
 "File handling" => "Fitxategien kudeaketa",
@@ -71,10 +72,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
 "Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
 "Current scanning" => "Orain eskaneatzen ari da",
-"directory" => "direktorioa",
-"directories" => "direktorioak",
-"file" => "fitxategia",
-"files" => "fitxategiak",
 "Upgrading filesystem cache..." => "Fitxategi sistemaren katxea eguneratzen..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index e0b9fe02816..24584f715b5 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "یک پوشه موقت گم شده",
 "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
 "Not enough storage available" => "فضای کافی در دسترس نیست",
+"Upload failed" => "بارگزاری ناموفق بود",
 "Invalid directory." => "فهرست راهنما نامعتبر می باشد.",
 "Files" => "پرونده‌ها",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "لغو",
 "replaced {new_name} with {old_name}" => "{نام_جدید} با { نام_قدیمی} جایگزین شد.",
 "undo" => "بازگشت",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "بارگذاری فایل ها",
 "'.' is an invalid file name." => "'.'   یک نام پرونده نامعتبر است.",
@@ -43,8 +46,6 @@ $TRANSLATIONS = array(
 "Name" => "نام",
 "Size" => "اندازه",
 "Modified" => "تاریخ",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "%s could not be renamed" => "%s نمیتواند تغییر نام دهد.",
 "Upload" => "بارگزاری",
 "File handling" => "اداره پرونده ها",
@@ -70,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
 "Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
 "Current scanning" => "بازرسی کنونی",
-"directory" => "پوشه",
-"directories" => "پوشه ها",
-"file" => "پرونده",
-"files" => "پرونده ها",
 "Upgrading filesystem cache..." => "بهبود فایل سیستمی ذخیره گاه..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index b48f44665bc..1d29dbf79d2 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Tilapäiskansio puuttuu",
 "Failed to write to disk" => "Levylle kirjoitus epäonnistui",
 "Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä",
+"Upload failed" => "Lähetys epäonnistui",
 "Invalid directory." => "Virheellinen kansio.",
 "Files" => "Tiedostot",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio.",
@@ -28,6 +29,9 @@ $TRANSLATIONS = array(
 "suggest name" => "ehdota nimeä",
 "cancel" => "peru",
 "undo" => "kumoa",
+"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
+"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
+"{dirs} and {files}" => "{dirs} ja {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Lähetetään %n tiedosto","Lähetetään %n tiedostoa"),
 "'.' is an invalid file name." => "'.' on virheellinen nimi tiedostolle.",
 "File name cannot be empty." => "Tiedoston nimi ei voi olla tyhjä.",
@@ -38,8 +42,6 @@ $TRANSLATIONS = array(
 "Name" => "Nimi",
 "Size" => "Koko",
 "Modified" => "Muokattu",
-"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
-"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
 "Upload" => "Lähetä",
 "File handling" => "Tiedostonhallinta",
 "Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
@@ -64,10 +66,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
 "Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.",
 "Current scanning" => "Tämänhetkinen tutkinta",
-"directory" => "kansio",
-"directories" => "kansiota",
-"file" => "tiedosto",
-"files" => "tiedostoa",
 "Upgrading filesystem cache..." => "Päivitetään tiedostojärjestelmän välimuistia..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 44895eab28e..4e3b0de112a 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Absence de dossier temporaire.",
 "Failed to write to disk" => "Erreur d'écriture sur le disque",
 "Not enough storage available" => "Plus assez d'espace de stockage disponible",
+"Upload failed" => "Échec de l'envoi",
 "Invalid directory." => "Dossier invalide.",
 "Files" => "Fichiers",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "annuler",
 "replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
 "undo" => "annuler",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "fichiers en cours d'envoi",
 "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.",
@@ -43,8 +46,6 @@ $TRANSLATIONS = array(
 "Name" => "Nom",
 "Size" => "Taille",
 "Modified" => "Modifié",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s ne peut être renommé",
 "Upload" => "Envoyer",
 "File handling" => "Gestion des fichiers",
@@ -70,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
 "Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
 "Current scanning" => "Analyse en cours",
-"directory" => "dossier",
-"directories" => "dossiers",
-"file" => "fichier",
-"files" => "fichiers",
 "Upgrading filesystem cache..." => "Mise à niveau du cache du système de fichier"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index c98263c08ff..6ec1816308a 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Falta o cartafol temporal",
 "Failed to write to disk" => "Produciuse un erro ao escribir no disco",
 "Not enough storage available" => "Non hai espazo de almacenamento abondo",
+"Upload failed" => "Produciuse un fallou no envío",
 "Invalid directory." => "O directorio é incorrecto.",
 "Files" => "Ficheiros",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "cancelar",
 "replaced {new_name} with {old_name}" => "substituír {new_name} por {old_name}",
 "undo" => "desfacer",
+"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
+"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
 "_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"),
 "files uploading" => "ficheiros enviándose",
 "'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto",
@@ -44,8 +47,6 @@ $TRANSLATIONS = array(
 "Name" => "Nome",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
-"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
 "%s could not be renamed" => "%s non pode cambiar de nome",
 "Upload" => "Enviar",
 "File handling" => "Manexo de ficheiro",
@@ -71,10 +72,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
 "Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarde.",
 "Current scanning" => "Análise actual",
-"directory" => "directorio",
-"directories" => "directorios",
-"file" => "ficheiro",
-"files" => "ficheiros",
 "Upgrading filesystem cache..." => "Anovando a caché do sistema de ficheiros..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index ef98e2d2188..40d7cc9c552 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "תקיה זמנית חסרה",
 "Failed to write to disk" => "הכתיבה לכונן נכשלה",
 "Not enough storage available" => "אין די שטח פנוי באחסון",
+"Upload failed" => "ההעלאה נכשלה",
 "Invalid directory." => "תיקייה שגויה.",
 "Files" => "קבצים",
 "Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
@@ -28,14 +29,14 @@ $TRANSLATIONS = array(
 "cancel" => "ביטול",
 "replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}",
 "undo" => "ביטול",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "קבצים בהעלאה",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
 "Name" => "שם",
 "Size" => "גודל",
 "Modified" => "זמן שינוי",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "העלאה",
 "File handling" => "טיפול בקבצים",
 "Maximum upload size" => "גודל העלאה מקסימלי",
@@ -57,8 +58,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "העלאה גדולה מידי",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
 "Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין.",
-"Current scanning" => "הסריקה הנוכחית",
-"file" => "קובץ",
-"files" => "קבצים"
+"Current scanning" => "הסריקה הנוכחית"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php
index 7fb5a5b09d3..7d2baab607d 100644
--- a/apps/files/l10n/hi.php
+++ b/apps/files/l10n/hi.php
@@ -2,9 +2,9 @@
 $TRANSLATIONS = array(
 "Error" => "त्रुटि",
 "Share" => "साझा करें",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Save" => "सहेजें"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 8f74dea092f..57f1ad9700b 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -18,13 +18,13 @@ $TRANSLATIONS = array(
 "suggest name" => "predloži ime",
 "cancel" => "odustani",
 "undo" => "vrati",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "datoteke se učitavaju",
 "Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja promjena",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Učitaj",
 "File handling" => "datoteka za rukovanje",
 "Maximum upload size" => "Maksimalna veličina prijenosa",
@@ -45,8 +45,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Prijenos je preobiman",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",
 "Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.",
-"Current scanning" => "Trenutno skeniranje",
-"file" => "datoteka",
-"files" => "datoteke"
+"Current scanning" => "Trenutno skeniranje"
 );
 $PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index e8d3b8c8676..66edbefbca5 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Hiányzik egy ideiglenes mappa",
 "Failed to write to disk" => "Nem sikerült a lemezre történő írás",
 "Not enough storage available" => "Nincs elég szabad hely.",
+"Upload failed" => "A feltöltés nem sikerült",
 "Invalid directory." => "Érvénytelen mappa.",
 "Files" => "Fájlok",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "mégse",
 "replaced {new_name} with {old_name}" => "{new_name} fájlt kicseréltük ezzel:  {old_name}",
 "undo" => "visszavonás",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "fájl töltődik föl",
 "'.' is an invalid file name." => "'.' fájlnév érvénytelen.",
@@ -43,8 +46,6 @@ $TRANSLATIONS = array(
 "Name" => "Név",
 "Size" => "Méret",
 "Modified" => "Módosítva",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s átnevezése nem sikerült",
 "Upload" => "Feltöltés",
 "File handling" => "Fájlkezelés",
@@ -70,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
 "Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
 "Current scanning" => "Ellenőrzés alatt",
-"directory" => "mappa",
-"directories" => "mappa",
-"file" => "fájl",
-"files" => "fájlok",
 "Upgrading filesystem cache..." => "A fájlrendszer gyorsítótárának frissítése zajlik..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hy.php b/apps/files/l10n/hy.php
index a419a74cc97..9a5ebb862a9 100644
--- a/apps/files/l10n/hy.php
+++ b/apps/files/l10n/hy.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Save" => "Պահպանել",
 "Download" => "Բեռնել",
 "Delete" => "Ջնջել"
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 202375636a1..1560687f6c4 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -6,12 +6,12 @@ $TRANSLATIONS = array(
 "Files" => "Files",
 "Error" => "Error",
 "Share" => "Compartir",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Incargar",
 "Maximum upload size" => "Dimension maxime de incargamento",
 "Save" => "Salveguardar",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 84d9ba2020f..ce7cfe5ef4c 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -29,6 +29,8 @@ $TRANSLATIONS = array(
 "cancel" => "batalkan",
 "replaced {new_name} with {old_name}" => "mengganti {new_name} dengan {old_name}",
 "undo" => "urungkan",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "berkas diunggah",
 "'.' is an invalid file name." => "'.' bukan nama berkas yang valid.",
@@ -40,8 +42,6 @@ $TRANSLATIONS = array(
 "Name" => "Nama",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "Unggah",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran pengunggahan maksimum",
@@ -66,8 +66,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
 "Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
 "Current scanning" => "Yang sedang dipindai",
-"file" => "berkas",
-"files" => "berkas-berkas",
 "Upgrading filesystem cache..." => "Meningkatkan tembolok sistem berkas..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index 36116001bce..2cf195d0a11 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -27,6 +27,8 @@ $TRANSLATIONS = array(
 "cancel" => "hætta við",
 "replaced {new_name} with {old_name}" => "yfirskrifaði {new_name} með {old_name}",
 "undo" => "afturkalla",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "'.' is an invalid file name." => "'.' er ekki leyfilegt nafn.",
 "File name cannot be empty." => "Nafn skráar má ekki vera tómt",
@@ -34,8 +36,6 @@ $TRANSLATIONS = array(
 "Name" => "Nafn",
 "Size" => "Stærð",
 "Modified" => "Breytt",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Senda inn",
 "File handling" => "Meðhöndlun skrár",
 "Maximum upload size" => "Hámarks stærð innsendingar",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 9be317fba99..b0ec954d907 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Manca una cartella temporanea",
 "Failed to write to disk" => "Scrittura su disco non riuscita",
 "Not enough storage available" => "Spazio di archiviazione insufficiente",
+"Upload failed" => "Caricamento non riuscito",
 "Invalid directory." => "Cartella non valida.",
 "Files" => "File",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte",
@@ -32,6 +33,9 @@ $TRANSLATIONS = array(
 "cancel" => "annulla",
 "replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}",
 "undo" => "annulla",
+"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"),
+"_%n file_::_%n files_" => array("%n file","%n file"),
+"{dirs} and {files}" => "{dirs} e {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Caricamento di %n file in corso","Caricamento di %n file in corso"),
 "files uploading" => "caricamento file",
 "'.' is an invalid file name." => "'.' non è un nome file valido.",
@@ -44,8 +48,6 @@ $TRANSLATIONS = array(
 "Name" => "Nome",
 "Size" => "Dimensione",
 "Modified" => "Modificato",
-"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"),
-"_%n file_::_%n files_" => array("%n file","%n file"),
 "%s could not be renamed" => "%s non può essere rinominato",
 "Upload" => "Carica",
 "File handling" => "Gestione file",
@@ -71,10 +73,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
 "Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
 "Current scanning" => "Scansione corrente",
-"directory" => "cartella",
-"directories" => "cartelle",
-"file" => "file",
-"files" => "file",
 "Upgrading filesystem cache..." => "Aggiornamento della cache del filesystem in corso..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 902cc82e036..5438cbb4976 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "一時保存フォルダが見つかりません",
 "Failed to write to disk" => "ディスクへの書き込みに失敗しました",
 "Not enough storage available" => "ストレージに十分な空き容量がありません",
+"Upload failed" => "アップロードに失敗",
 "Invalid directory." => "無効なディレクトリです。",
 "Files" => "ファイル",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのファイルはアップロードできません",
@@ -32,6 +33,9 @@ $TRANSLATIONS = array(
 "cancel" => "キャンセル",
 "replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
 "undo" => "元に戻す",
+"_%n folder_::_%n folders_" => array("%n個のフォルダ"),
+"_%n file_::_%n files_" => array("%n個のファイル"),
+"{dirs} and {files}" => "{dirs} と {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"),
 "files uploading" => "ファイルをアップロード中",
 "'.' is an invalid file name." => "'.' は無効なファイル名です。",
@@ -44,8 +48,6 @@ $TRANSLATIONS = array(
 "Name" => "名前",
 "Size" => "サイズ",
 "Modified" => "変更",
-"_%n folder_::_%n folders_" => array("%n個のフォルダ"),
-"_%n file_::_%n files_" => array("%n個のファイル"),
 "%s could not be renamed" => "%sの名前を変更できませんでした",
 "Upload" => "アップロード",
 "File handling" => "ファイル操作",
@@ -71,10 +73,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
 "Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
 "Current scanning" => "スキャン中",
-"directory" => "ディレクトリ",
-"directories" => "ディレクトリ",
-"file" => "ファイル",
-"files" => "ファイル",
 "Upgrading filesystem cache..." => "ファイルシステムキャッシュを更新中..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ka.php b/apps/files/l10n/ka.php
index 527a2c49b1c..544e8168c54 100644
--- a/apps/files/l10n/ka.php
+++ b/apps/files/l10n/ka.php
@@ -1,9 +1,9 @@
 <?php
 $TRANSLATIONS = array(
 "Files" => "ფაილები",
-"_Uploading %n file_::_Uploading %n files_" => array(""),
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "Download" => "გადმოწერა"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index 3e70d3294c1..455e3211a55 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "დროებითი საქაღალდე არ არსებობს",
 "Failed to write to disk" => "შეცდომა დისკზე ჩაწერისას",
 "Not enough storage available" => "საცავში საკმარისი ადგილი არ არის",
+"Upload failed" => "ატვირთვა ვერ განხორციელდა",
 "Invalid directory." => "დაუშვებელი დირექტორია.",
 "Files" => "ფაილები",
 "Unable to upload your file as it is a directory or has 0 bytes" => "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს",
@@ -29,6 +30,8 @@ $TRANSLATIONS = array(
 "cancel" => "უარყოფა",
 "replaced {new_name} with {old_name}" => "{new_name} შეცვლილია {old_name}–ით",
 "undo" => "დაბრუნება",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "ფაილები იტვირთება",
 "'.' is an invalid file name." => "'.' არის დაუშვებელი ფაილის სახელი.",
@@ -40,8 +43,6 @@ $TRANSLATIONS = array(
 "Name" => "სახელი",
 "Size" => "ზომა",
 "Modified" => "შეცვლილია",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "ატვირთვა",
 "File handling" => "ფაილის დამუშავება",
 "Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index f53c9e8e38e..e2b787e7f91 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "임시 폴더가 없음",
 "Failed to write to disk" => "디스크에 쓰지 못했습니다",
 "Not enough storage available" => "저장소가 용량이 충분하지 않습니다.",
+"Upload failed" => "업로드 실패",
 "Invalid directory." => "올바르지 않은 디렉터리입니다.",
 "Files" => "파일",
 "Unable to upload your file as it is a directory or has 0 bytes" => "디렉터리 및 빈 파일은 업로드할 수 없습니다",
@@ -29,6 +30,8 @@ $TRANSLATIONS = array(
 "cancel" => "취소",
 "replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨",
 "undo" => "되돌리기",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "파일 업로드중",
 "'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.",
@@ -40,8 +43,6 @@ $TRANSLATIONS = array(
 "Name" => "이름",
 "Size" => "크기",
 "Modified" => "수정됨",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "업로드",
 "File handling" => "파일 처리",
 "Maximum upload size" => "최대 업로드 크기",
@@ -66,8 +67,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
 "Files are being scanned, please wait." => "파일을 검색하고 있습니다. 기다려 주십시오.",
 "Current scanning" => "현재 검색",
-"file" => "파일",
-"files" => "파일",
 "Upgrading filesystem cache..." => "파일 시스템 캐시 업그레이드 중..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
index 81177f9bea0..9ec565da441 100644
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@@ -2,10 +2,10 @@
 $TRANSLATIONS = array(
 "URL cannot be empty." => "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت.",
 "Error" => "هه‌ڵه",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Name" => "ناو",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Name" => "ناو",
 "Upload" => "بارکردن",
 "Save" => "پاشکه‌وتکردن",
 "Folder" => "بوخچه",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index c57eebd9e76..deefe9caa15 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -15,12 +15,12 @@ $TRANSLATIONS = array(
 "replace" => "ersetzen",
 "cancel" => "ofbriechen",
 "undo" => "réckgängeg man",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "Numm",
 "Size" => "Gréisst",
 "Modified" => "Geännert",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Eroplueden",
 "File handling" => "Fichier handling",
 "Maximum upload size" => "Maximum Upload Gréisst ",
@@ -41,8 +41,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Upload ze grouss",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
 "Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.",
-"Current scanning" => "Momentane Scan",
-"file" => "Datei",
-"files" => "Dateien"
+"Current scanning" => "Momentane Scan"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index a4dd5008afb..0530adc2ae2 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Nėra laikinojo katalogo",
 "Failed to write to disk" => "Nepavyko įrašyti į diską",
 "Not enough storage available" => "Nepakanka vietos serveryje",
+"Upload failed" => "Nusiuntimas nepavyko",
 "Invalid directory." => "Neteisingas aplankas",
 "Files" => "Failai",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas",
@@ -30,6 +31,8 @@ $TRANSLATIONS = array(
 "cancel" => "atšaukti",
 "replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}",
 "undo" => "anuliuoti",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "įkeliami failai",
 "'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.",
@@ -41,8 +44,6 @@ $TRANSLATIONS = array(
 "Name" => "Pavadinimas",
 "Size" => "Dydis",
 "Modified" => "Pakeista",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Įkelti",
 "File handling" => "Failų tvarkymas",
 "Maximum upload size" => "Maksimalus įkeliamo failo dydis",
@@ -67,8 +68,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
 "Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
 "Current scanning" => "Šiuo metu skenuojama",
-"file" => "failas",
-"files" => "failai",
 "Upgrading filesystem cache..." => "Atnaujinamas sistemos kešavimas..."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index b1435b46096..d24aaca9e4c 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Trūkst pagaidu mapes",
 "Failed to write to disk" => "Neizdevās saglabāt diskā",
 "Not enough storage available" => "Nav pietiekami daudz vietas",
+"Upload failed" => "Neizdevās augšupielādēt",
 "Invalid directory." => "Nederīga direktorija.",
 "Files" => "Datnes",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "atcelt",
 "replaced {new_name} with {old_name}" => "aizvietoja {new_name} ar {old_name}",
 "undo" => "atsaukt",
+"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"),
+"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"),
 "_Uploading %n file_::_Uploading %n files_" => array("%n","Augšupielāde %n failu","Augšupielāde %n failus"),
 "files uploading" => "fails augšupielādējas",
 "'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.",
@@ -44,8 +47,6 @@ $TRANSLATIONS = array(
 "Name" => "Nosaukums",
 "Size" => "Izmērs",
 "Modified" => "Mainīts",
-"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"),
-"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"),
 "%s could not be renamed" => "%s nevar tikt pārsaukts",
 "Upload" => "Augšupielādēt",
 "File handling" => "Datņu pārvaldība",
@@ -71,10 +72,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",
 "Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
 "Current scanning" => "Šobrīd tiek caurskatīts",
-"directory" => "direktorija",
-"directories" => "direktorijas",
-"file" => "fails",
-"files" => "faili",
 "Upgrading filesystem cache..." => "Uzlabo datņu sistēmas kešatmiņu..."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 20fed43ab20..7a9a8641f80 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -23,13 +23,13 @@ $TRANSLATIONS = array(
 "cancel" => "откажи",
 "replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}",
 "undo" => "врати",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
 "Name" => "Име",
 "Size" => "Големина",
 "Modified" => "Променето",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Подигни",
 "File handling" => "Ракување со датотеки",
 "Maximum upload size" => "Максимална големина за подигање",
@@ -51,8 +51,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Фајлот кој се вчитува е преголем",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
 "Files are being scanned, please wait." => "Се скенираат датотеки, ве молам почекајте.",
-"Current scanning" => "Моментално скенирам",
-"file" => "датотека",
-"files" => "датотеки"
+"Current scanning" => "Моментално скенирам"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 86b70faefda..59d0bbfb339 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -15,12 +15,12 @@ $TRANSLATIONS = array(
 "Pending" => "Dalam proses",
 "replace" => "ganti",
 "cancel" => "Batal",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "Name" => "Nama",
 "Size" => "Saiz",
 "Modified" => "Dimodifikasi",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "Muat naik",
 "File handling" => "Pengendalian fail",
 "Maximum upload size" => "Saiz maksimum muat naik",
@@ -40,8 +40,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Muatnaik terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
 "Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.",
-"Current scanning" => "Imbasan semasa",
-"file" => "fail",
-"files" => "fail"
+"Current scanning" => "Imbasan semasa"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/my_MM.php b/apps/files/l10n/my_MM.php
index 4dc63ffee2d..497ecc09492 100644
--- a/apps/files/l10n/my_MM.php
+++ b/apps/files/l10n/my_MM.php
@@ -1,9 +1,9 @@
 <?php
 $TRANSLATIONS = array(
 "Files" => "ဖိုင်များ",
-"_Uploading %n file_::_Uploading %n files_" => array(""),
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "Download" => "ဒေါင်းလုတ်"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 72c4153c6ef..55ce978d2a2 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Mangler midlertidig mappe",
 "Failed to write to disk" => "Klarte ikke å skrive til disk",
 "Not enough storage available" => "Ikke nok lagringsplass",
+"Upload failed" => "Opplasting feilet",
 "Invalid directory." => "Ugyldig katalog.",
 "Files" => "Filer",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "avbryt",
 "replaced {new_name} with {old_name}" => "erstattet {new_name} med {old_name}",
 "undo" => "angre",
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"),
 "files uploading" => "filer lastes opp",
 "'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
@@ -43,8 +46,6 @@ $TRANSLATIONS = array(
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Endret",
-"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "%s could not be renamed" => "Kunne ikke gi nytt navn til %s",
 "Upload" => "Last opp",
 "File handling" => "Filhåndtering",
@@ -70,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
 "Files are being scanned, please wait." => "Skanner filer, vennligst vent.",
 "Current scanning" => "Pågående skanning",
-"directory" => "katalog",
-"directories" => "kataloger",
-"file" => "fil",
-"files" => "filer",
 "Upgrading filesystem cache..." => "Oppgraderer filsystemets  mellomlager..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 422fa8ba130..9fb13517369 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
 "Not enough storage available" => "Niet genoeg opslagruimte beschikbaar",
+"Upload failed" => "Upload mislukt",
 "Invalid directory." => "Ongeldige directory.",
 "Files" => "Bestanden",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "annuleren",
 "replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
 "undo" => "ongedaan maken",
+"_%n folder_::_%n folders_" => array("","%n mappen"),
+"_%n file_::_%n files_" => array("","%n bestanden"),
 "_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"),
 "files uploading" => "bestanden aan het uploaden",
 "'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.",
@@ -44,8 +47,6 @@ $TRANSLATIONS = array(
 "Name" => "Naam",
 "Size" => "Grootte",
 "Modified" => "Aangepast",
-"_%n folder_::_%n folders_" => array("","%n mappen"),
-"_%n file_::_%n files_" => array("","%n bestanden"),
 "%s could not be renamed" => "%s kon niet worden hernoemd",
 "Upload" => "Uploaden",
 "File handling" => "Bestand",
@@ -71,10 +72,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
 "Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
 "Current scanning" => "Er wordt gescand",
-"directory" => "directory",
-"directories" => "directories",
-"file" => "bestand",
-"files" => "bestanden",
 "Upgrading filesystem cache..." => "Upgraden bestandssysteem cache..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index abaaa5ffe8e..b1f38057a88 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Manglar ei mellombels mappe",
 "Failed to write to disk" => "Klarte ikkje skriva til disk",
 "Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg",
+"Upload failed" => "Feil ved opplasting",
 "Invalid directory." => "Ugyldig mappe.",
 "Files" => "Filer",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte",
@@ -30,6 +31,8 @@ $TRANSLATIONS = array(
 "cancel" => "avbryt",
 "replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}",
 "undo" => "angre",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "filer lastar opp",
 "'.' is an invalid file name." => "«.» er eit ugyldig filnamn.",
@@ -41,8 +44,6 @@ $TRANSLATIONS = array(
 "Name" => "Namn",
 "Size" => "Storleik",
 "Modified" => "Endra",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Last opp",
 "File handling" => "Filhandtering",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 552d72bef59..63e572059bf 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -18,13 +18,13 @@ $TRANSLATIONS = array(
 "suggest name" => "nom prepausat",
 "cancel" => "anulla",
 "undo" => "defar",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "fichièrs al amontcargar",
 "Name" => "Nom",
 "Size" => "Talha",
 "Modified" => "Modificat",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Amontcarga",
 "File handling" => "Manejament de fichièr",
 "Maximum upload size" => "Talha maximum d'amontcargament",
@@ -45,8 +45,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Amontcargament tròp gròs",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",
 "Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, ",
-"Current scanning" => "Exploracion en cors",
-"file" => "fichièr",
-"files" => "fichièrs"
+"Current scanning" => "Exploracion en cors"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index d858248f29f..4b22b080b28 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Brak folderu tymczasowego",
 "Failed to write to disk" => "Błąd zapisu na dysk",
 "Not enough storage available" => "Za mało dostępnego miejsca",
+"Upload failed" => "Wysyłanie nie powiodło się",
 "Invalid directory." => "Zła ścieżka.",
 "Files" => "Pliki",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "anuluj",
 "replaced {new_name} with {old_name}" => "zastąpiono {new_name} przez {old_name}",
 "undo" => "cofnij",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "pliki wczytane",
 "'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.",
@@ -43,8 +46,6 @@ $TRANSLATIONS = array(
 "Name" => "Nazwa",
 "Size" => "Rozmiar",
 "Modified" => "Modyfikacja",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "%s could not be renamed" => "%s nie można zmienić nazwy",
 "Upload" => "Wyślij",
 "File handling" => "Zarządzanie plikami",
@@ -70,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
 "Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
 "Current scanning" => "Aktualnie skanowane",
-"directory" => "Katalog",
-"directories" => "Katalogi",
-"file" => "plik",
-"files" => "pliki",
 "Upgrading filesystem cache..." => "Uaktualnianie plików pamięci podręcznej..."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index b42b81d040b..15d0c170e66 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Pasta temporária não encontrada",
 "Failed to write to disk" => "Falha ao escrever no disco",
 "Not enough storage available" => "Espaço de armazenamento insuficiente",
+"Upload failed" => "Falha no envio",
 "Invalid directory." => "Diretório inválido.",
 "Files" => "Arquivos",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes.",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "cancelar",
 "replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ",
 "undo" => "desfazer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "enviando arquivos",
 "'.' is an invalid file name." => "'.' é um nome de arquivo inválido.",
@@ -43,8 +46,6 @@ $TRANSLATIONS = array(
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s não pode ser renomeado",
 "Upload" => "Upload",
 "File handling" => "Tratamento de Arquivo",
@@ -70,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
 "Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
 "Current scanning" => "Scanning atual",
-"directory" => "diretório",
-"directories" => "diretórios",
-"file" => "arquivo",
-"files" => "arquivos",
 "Upgrading filesystem cache..." => "Atualizando cache do sistema de arquivos..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 50a33de6db3..33ec8cddce6 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Está a faltar a pasta temporária",
 "Failed to write to disk" => "Falhou a escrita no disco",
 "Not enough storage available" => "Não há espaço suficiente em disco",
+"Upload failed" => "Carregamento falhou",
 "Invalid directory." => "Directório Inválido",
 "Files" => "Ficheiros",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes",
@@ -32,19 +33,21 @@ $TRANSLATIONS = array(
 "cancel" => "cancelar",
 "replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}",
 "undo" => "desfazer",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
+"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
+"{dirs} and {files}" => "{dirs} e {files}",
+"_Uploading %n file_::_Uploading %n files_" => array("A carregar %n ficheiro","A carregar %n ficheiros"),
 "files uploading" => "A enviar os ficheiros",
 "'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!",
 "File name cannot be empty." => "O nome do ficheiro não pode estar vazio.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
 "Your storage is full, files can not be updated or synced anymore!" => "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados.",
 "Your storage is almost full ({usedSpacePercent}%)" => "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
 "Your download is being prepared. This might take some time if the files are big." => "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s não pode ser renomeada",
 "Upload" => "Carregar",
 "File handling" => "Manuseamento de ficheiros",
@@ -70,10 +73,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
 "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
 "Current scanning" => "Análise actual",
-"directory" => "diretório",
-"directories" => "diretórios",
-"file" => "ficheiro",
-"files" => "ficheiros",
 "Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 7c78c6f0767..59f6cc68499 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Lipsește un director temporar",
 "Failed to write to disk" => "Eroare la scriere pe disc",
 "Not enough storage available" => "Nu este suficient spațiu disponibil",
+"Upload failed" => "Încărcarea a eșuat",
 "Invalid directory." => "Director invalid.",
 "Files" => "Fișiere",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "anulare",
 "replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}",
 "undo" => "Anulează ultima acțiune",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "fișiere se încarcă",
 "'.' is an invalid file name." => "'.' este un nume invalid de fișier.",
@@ -43,8 +46,6 @@ $TRANSLATIONS = array(
 "Name" => "Nume",
 "Size" => "Dimensiune",
 "Modified" => "Modificat",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "%s could not be renamed" => "%s nu a putut fi redenumit",
 "Upload" => "Încărcare",
 "File handling" => "Manipulare fișiere",
@@ -70,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
 "Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
 "Current scanning" => "În curs de scanare",
-"directory" => "catalog",
-"directories" => "cataloage",
-"file" => "fișier",
-"files" => "fișiere",
 "Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 782817be0ae..96f52a9045c 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Отсутствует временная папка",
 "Failed to write to disk" => "Ошибка записи на диск",
 "Not enough storage available" => "Недостаточно доступного места в хранилище",
+"Upload failed" => "Ошибка загрузки",
 "Invalid directory." => "Неправильный каталог.",
 "Files" => "Файлы",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Файл не был загружен: его размер 0 байт либо это не файл, а директория.",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "отмена",
 "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
 "undo" => "отмена",
+"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"),
+"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
 "_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"),
 "files uploading" => "файлы загружаются",
 "'.' is an invalid file name." => "'.' - неправильное имя файла.",
@@ -43,8 +46,6 @@ $TRANSLATIONS = array(
 "Name" => "Имя",
 "Size" => "Размер",
 "Modified" => "Изменён",
-"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"),
-"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
 "%s could not be renamed" => "%s не может быть переименован",
 "Upload" => "Загрузка",
 "File handling" => "Управление файлами",
@@ -70,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
 "Files are being scanned, please wait." => "Подождите, файлы сканируются.",
 "Current scanning" => "Текущее сканирование",
-"directory" => "директория",
-"directories" => "директории",
-"file" => "файл",
-"files" => "файлы",
 "Upgrading filesystem cache..." => "Обновление кэша файловой системы..."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index ffb28e09584..1fd18d0c56f 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
 "No file was uploaded" => "ගොනුවක් උඩුගත නොවුණි",
 "Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්",
 "Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි",
+"Upload failed" => "උඩුගත කිරීම අසාර්ථකයි",
 "Files" => "ගොනු",
 "Upload cancelled." => "උඩුගත කිරීම අත් හරින්න ලදී",
 "File upload is in progress. Leaving the page now will cancel the upload." => "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
@@ -18,12 +19,12 @@ $TRANSLATIONS = array(
 "suggest name" => "නමක් යෝජනා කරන්න",
 "cancel" => "අත් හරින්න",
 "undo" => "නිෂ්ප්‍රභ කරන්න",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "නම",
 "Size" => "ප්‍රමාණය",
 "Modified" => "වෙනස් කළ",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "උඩුගත කරන්න",
 "File handling" => "ගොනු පරිහරණය",
 "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
@@ -45,8 +46,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "උඩුගත කිරීම විශාල වැඩිය",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",
 "Files are being scanned, please wait." => "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න",
-"Current scanning" => "වර්තමාන පරික්ෂාව",
-"file" => "ගොනුව",
-"files" => "ගොනු"
+"Current scanning" => "වර්තමාන පරික්ෂාව"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 9c845794485..b30f263d244 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Chýba dočasný priečinok",
 "Failed to write to disk" => "Zápis na disk sa nepodaril",
 "Not enough storage available" => "Nedostatok dostupného úložného priestoru",
+"Upload failed" => "Odoslanie bolo neúspešné",
 "Invalid directory." => "Neplatný priečinok.",
 "Files" => "Súbory",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "zrušiť",
 "replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}",
 "undo" => "vrátiť",
+"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"),
+"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
 "_Uploading %n file_::_Uploading %n files_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"),
 "files uploading" => "nahrávanie súborov",
 "'.' is an invalid file name." => "'.' je neplatné meno súboru.",
@@ -44,8 +47,6 @@ $TRANSLATIONS = array(
 "Name" => "Názov",
 "Size" => "Veľkosť",
 "Modified" => "Upravené",
-"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"),
-"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
 "%s could not be renamed" => "%s nemohol byť premenovaný",
 "Upload" => "Odoslať",
 "File handling" => "Nastavenie správania sa k súborom",
@@ -71,10 +72,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
 "Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
 "Current scanning" => "Práve prezerané",
-"directory" => "priečinok",
-"directories" => "priečinky",
-"file" => "súbor",
-"files" => "súbory",
 "Upgrading filesystem cache..." => "Aktualizujem medzipamäť súborového systému..."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 79296c80492..08f789ff866 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Manjka začasna mapa",
 "Failed to write to disk" => "Pisanje na disk je spodletelo",
 "Not enough storage available" => "Na voljo ni dovolj prostora",
+"Upload failed" => "Pošiljanje je spodletelo",
 "Invalid directory." => "Neveljavna mapa.",
 "Files" => "Datoteke",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov.",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "prekliči",
 "replaced {new_name} with {old_name}" => "preimenovano ime {new_name} z imenom {old_name}",
 "undo" => "razveljavi",
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","","",""),
 "files uploading" => "poteka pošiljanje datotek",
 "'.' is an invalid file name." => "'.' je neveljavno ime datoteke.",
@@ -43,8 +46,6 @@ $TRANSLATIONS = array(
 "Name" => "Ime",
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
-"_%n folder_::_%n folders_" => array("","","",""),
-"_%n file_::_%n files_" => array("","","",""),
 "%s could not be renamed" => "%s ni bilo mogoče preimenovati",
 "Upload" => "Pošlji",
 "File handling" => "Upravljanje z datotekami",
@@ -70,10 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
 "Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...",
 "Current scanning" => "Trenutno poteka preučevanje",
-"directory" => "direktorij",
-"directories" => "direktoriji",
-"file" => "datoteka",
-"files" => "datoteke",
 "Upgrading filesystem cache..." => "Nadgrajevanje predpomnilnika datotečnega sistema ..."
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index 838bcc5ef23..ff09e7b4f95 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -29,6 +29,8 @@ $TRANSLATIONS = array(
 "cancel" => "anulo",
 "replaced {new_name} with {old_name}" => "U zëvëndësua {new_name} me {old_name}",
 "undo" => "anulo",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "po ngarkoj skedarët",
 "'.' is an invalid file name." => "'.' është emër i pavlefshëm.",
@@ -40,8 +42,6 @@ $TRANSLATIONS = array(
 "Name" => "Emri",
 "Size" => "Dimensioni",
 "Modified" => "Modifikuar",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "Ngarko",
 "File handling" => "Trajtimi i skedarit",
 "Maximum upload size" => "Dimensioni maksimal i ngarkimit",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index d4dcbd14ee5..73f8ace5c81 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Недостаје привремена фасцикла",
 "Failed to write to disk" => "Не могу да пишем на диск",
 "Not enough storage available" => "Нема довољно простора",
+"Upload failed" => "Отпремање није успело",
 "Invalid directory." => "неисправна фасцикла.",
 "Files" => "Датотеке",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова",
@@ -29,6 +30,8 @@ $TRANSLATIONS = array(
 "cancel" => "откажи",
 "replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}",
 "undo" => "опозови",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "датотеке се отпремају",
 "'.' is an invalid file name." => "Датотека „.“ је неисправног имена.",
@@ -40,8 +43,6 @@ $TRANSLATIONS = array(
 "Name" => "Име",
 "Size" => "Величина",
 "Modified" => "Измењено",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Отпреми",
 "File handling" => "Управљање датотекама",
 "Maximum upload size" => "Највећа величина датотеке",
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index bc7b11b8c53..1965479fe66 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -6,12 +6,12 @@ $TRANSLATIONS = array(
 "No file was uploaded" => "Nijedan fajl nije poslat",
 "Missing a temporary folder" => "Nedostaje privremena fascikla",
 "Files" => "Fajlovi",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja izmena",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Pošalji",
 "Maximum upload size" => "Maksimalna veličina pošiljke",
 "Save" => "Snimi",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 0f72443a5f9..fbbe1f15910 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "En temporär mapp saknas",
 "Failed to write to disk" => "Misslyckades spara till disk",
 "Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt",
+"Upload failed" => "Misslyckad uppladdning",
 "Invalid directory." => "Felaktig mapp.",
 "Files" => "Filer",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes",
@@ -32,6 +33,9 @@ $TRANSLATIONS = array(
 "cancel" => "avbryt",
 "replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
 "undo" => "ångra",
+"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
+"{dirs} and {files}" => "{dirs} och {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Laddar upp %n fil","Laddar upp %n filer"),
 "files uploading" => "filer laddas upp",
 "'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.",
@@ -44,8 +48,6 @@ $TRANSLATIONS = array(
 "Name" => "Namn",
 "Size" => "Storlek",
 "Modified" => "Ändrad",
-"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
 "%s could not be renamed" => "%s kunde inte namnändras",
 "Upload" => "Ladda upp",
 "File handling" => "Filhantering",
@@ -71,10 +73,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
 "Files are being scanned, please wait." => "Filer skannas, var god vänta",
 "Current scanning" => "Aktuell skanning",
-"directory" => "mapp",
-"directories" => "mappar",
-"file" => "fil",
-"files" => "filer",
 "Upgrading filesystem cache..." => "Uppgraderar filsystemets cache..."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index eb39218e48d..154e0d6796e 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
 "No file was uploaded" => "எந்த கோப்பும் பதிவேற்றப்படவில்லை",
 "Missing a temporary folder" => "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை",
 "Failed to write to disk" => "வட்டில் எழுத முடியவில்லை",
+"Upload failed" => "பதிவேற்றல் தோல்வியுற்றது",
 "Files" => "கோப்புகள்",
 "Unable to upload your file as it is a directory or has 0 bytes" => "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை",
 "Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
@@ -22,13 +23,13 @@ $TRANSLATIONS = array(
 "cancel" => "இரத்து செய்க",
 "replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது",
 "undo" => "முன் செயல் நீக்கம் ",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
 "Name" => "பெயர்",
 "Size" => "அளவு",
 "Modified" => "மாற்றப்பட்டது",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Upload" => "பதிவேற்றுக",
 "File handling" => "கோப்பு கையாளுதல்",
 "Maximum upload size" => "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
diff --git a/apps/files/l10n/te.php b/apps/files/l10n/te.php
index 5a108274dd9..60aabc8a365 100644
--- a/apps/files/l10n/te.php
+++ b/apps/files/l10n/te.php
@@ -3,11 +3,11 @@ $TRANSLATIONS = array(
 "Error" => "పొరపాటు",
 "Delete permanently" => "శాశ్వతంగా తొలగించు",
 "cancel" => "రద్దుచేయి",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "పేరు",
 "Size" => "పరిమాణం",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
 "Save" => "భద్రపరచు",
 "Folder" => "సంచయం",
 "Delete" => "తొలగించు"
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index ac2da6aed91..aa8cf4e9b50 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
 "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
 "Not enough storage available" => "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน",
+"Upload failed" => "อัพโหลดล้มเหลว",
 "Invalid directory." => "ไดเร็กทอรี่ไม่ถูกต้อง",
 "Files" => "ไฟล์",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์",
@@ -28,6 +29,8 @@ $TRANSLATIONS = array(
 "cancel" => "ยกเลิก",
 "replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว",
 "undo" => "เลิกทำ",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "การอัพโหลดไฟล์",
 "'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
@@ -39,8 +42,6 @@ $TRANSLATIONS = array(
 "Name" => "ชื่อ",
 "Size" => "ขนาด",
 "Modified" => "แก้ไขแล้ว",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "อัพโหลด",
 "File handling" => "การจัดกาไฟล์",
 "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
@@ -63,8 +64,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
 "Files are being scanned, please wait." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
 "Current scanning" => "ไฟล์ที่กำลังสแกนอยู่ขณะนี้",
-"file" => "ไฟล์",
-"files" => "ไฟล์",
 "Upgrading filesystem cache..." => "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 650e4ead88c..dd089757d5f 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Geçici dizin eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Not enough storage available" => "Yeterli disk alanı yok",
+"Upload failed" => "Yükleme başarısız",
 "Invalid directory." => "Geçersiz dizin.",
 "Files" => "Dosyalar",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "iptal",
 "replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile değiştirildi",
 "undo" => "geri al",
+"_%n folder_::_%n folders_" => array("%n dizin","%n dizin"),
+"_%n file_::_%n files_" => array("%n dosya","%n dosya"),
 "_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"),
 "files uploading" => "Dosyalar yükleniyor",
 "'.' is an invalid file name." => "'.' geçersiz dosya adı.",
@@ -44,8 +47,6 @@ $TRANSLATIONS = array(
 "Name" => "İsim",
 "Size" => "Boyut",
 "Modified" => "Değiştirilme",
-"_%n folder_::_%n folders_" => array("%n dizin","%n dizin"),
-"_%n file_::_%n files_" => array("%n dosya","%n dosya"),
 "%s could not be renamed" => "%s yeniden adlandırılamadı",
 "Upload" => "Yükle",
 "File handling" => "Dosya taşıma",
@@ -71,10 +72,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
 "Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
 "Current scanning" => "Güncel tarama",
-"directory" => "dizin",
-"directories" => "dizinler",
-"file" => "dosya",
-"files" => "dosyalar",
 "Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
index 2eceeea44a8..920d077e4eb 100644
--- a/apps/files/l10n/ug.php
+++ b/apps/files/l10n/ug.php
@@ -20,13 +20,13 @@ $TRANSLATIONS = array(
 "suggest name" => "تەۋسىيە ئات",
 "cancel" => "ۋاز كەچ",
 "undo" => "يېنىۋال",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ",
 "Name" => "ئاتى",
 "Size" => "چوڭلۇقى",
 "Modified" => "ئۆزگەرتكەن",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "يۈكلە",
 "Save" => "ساقلا",
 "New" => "يېڭى",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 49747caef19..781590cff35 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Відсутній тимчасовий каталог",
 "Failed to write to disk" => "Невдалося записати на диск",
 "Not enough storage available" => "Місця більше немає",
+"Upload failed" => "Помилка завантаження",
 "Invalid directory." => "Невірний каталог.",
 "Files" => "Файли",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт",
@@ -29,6 +30,8 @@ $TRANSLATIONS = array(
 "cancel" => "відміна",
 "replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}",
 "undo" => "відмінити",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "файли завантажуються",
 "'.' is an invalid file name." => "'.' це невірне ім'я файлу.",
@@ -40,8 +43,6 @@ $TRANSLATIONS = array(
 "Name" => "Ім'я",
 "Size" => "Розмір",
 "Modified" => "Змінено",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
 "%s could not be renamed" => "%s не може бути перейменований",
 "Upload" => "Вивантажити",
 "File handling" => "Робота з файлами",
@@ -67,10 +68,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
 "Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
 "Current scanning" => "Поточне сканування",
-"directory" => "каталог",
-"directories" => "каталоги",
-"file" => "файл",
-"files" => "файли",
 "Upgrading filesystem cache..." => "Оновлення кеша файлової системи..."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/ur_PK.php b/apps/files/l10n/ur_PK.php
index 15c24700df0..6854c421587 100644
--- a/apps/files/l10n/ur_PK.php
+++ b/apps/files/l10n/ur_PK.php
@@ -1,9 +1,9 @@
 <?php
 $TRANSLATIONS = array(
 "Error" => "ایرر",
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Unshare" => "شئیرنگ ختم کریں"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index 9c6e1c2a57b..b98a14f6d7b 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Không tìm thấy thư mục tạm",
 "Failed to write to disk" => "Không thể ghi ",
 "Not enough storage available" => "Không đủ không gian lưu trữ",
+"Upload failed" => "Tải lên thất bại",
 "Invalid directory." => "Thư mục không hợp lệ",
 "Files" => "Tập tin",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte",
@@ -29,6 +30,8 @@ $TRANSLATIONS = array(
 "cancel" => "hủy",
 "replaced {new_name} with {old_name}" => "đã thay thế {new_name} bằng {old_name}",
 "undo" => "lùi lại",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "tệp tin đang được tải lên",
 "'.' is an invalid file name." => "'.' là một tên file không hợp lệ",
@@ -40,8 +43,6 @@ $TRANSLATIONS = array(
 "Name" => "Tên",
 "Size" => "Kích cỡ",
 "Modified" => "Thay đổi",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
 "Upload" => "Tải lên",
 "File handling" => "Xử lý tập tin",
 "Maximum upload size" => "Kích thước tối đa ",
@@ -66,8 +67,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
 "Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.",
 "Current scanning" => "Hiện tại đang quét",
-"file" => "file",
-"files" => "files",
 "Upgrading filesystem cache..." => "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index ad9733f059a..59b09ad950b 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "缺少临时目录",
 "Failed to write to disk" => "写入磁盘失败",
 "Not enough storage available" => "没有足够的存储空间",
+"Upload failed" => "上传失败",
 "Invalid directory." => "无效文件夹。",
 "Files" => "文件",
 "Unable to upload your file as it is a directory or has 0 bytes" => "无法上传您的文件，文件夹或者空文件",
@@ -32,6 +33,8 @@ $TRANSLATIONS = array(
 "cancel" => "取消",
 "replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}",
 "undo" => "撤销",
+"_%n folder_::_%n folders_" => array("%n 文件夹"),
+"_%n file_::_%n files_" => array("%n个文件"),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "文件上传中",
 "'.' is an invalid file name." => "'.' 是一个无效的文件名。",
@@ -43,8 +46,6 @@ $TRANSLATIONS = array(
 "Name" => "名称",
 "Size" => "大小",
 "Modified" => "修改日期",
-"_%n folder_::_%n folders_" => array("%n 文件夹"),
-"_%n file_::_%n files_" => array("%n个文件"),
 "%s could not be renamed" => "%s 不能被重命名",
 "Upload" => "上传",
 "File handling" => "文件处理",
@@ -70,8 +71,6 @@ $TRANSLATIONS = array(
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
 "Files are being scanned, please wait." => "文件正在被扫描，请稍候。",
 "Current scanning" => "当前扫描",
-"file" => "文件",
-"files" => "文件",
 "Upgrading filesystem cache..." => "正在更新文件系统缓存..."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php
index a9064fa7f78..febed4fe8fb 100644
--- a/apps/files/l10n/zh_HK.php
+++ b/apps/files/l10n/zh_HK.php
@@ -3,10 +3,10 @@ $TRANSLATIONS = array(
 "Files" => "文件",
 "Error" => "錯誤",
 "Share" => "分享",
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"Name" => "名稱",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array(""),
+"Name" => "名稱",
 "Upload" => "上傳",
 "Save" => "儲存",
 "Download" => "下載",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 5cca3e0fd85..21c929f81a6 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -1,11 +1,11 @@
 <?php
 $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "無法移動 %s - 同名的檔案已經存在",
+"Could not move %s - File with this name already exists" => "無法移動 %s ，同名的檔案已經存在",
 "Could not move %s" => "無法移動 %s",
-"Unable to set upload directory." => "無法設定上傳目錄。",
+"Unable to set upload directory." => "無法設定上傳目錄",
 "Invalid Token" => "無效的 token",
-"No file was uploaded. Unknown error" => "沒有檔案被上傳。未知的錯誤。",
-"There is no error, the file uploaded with success" => "無錯誤，檔案上傳成功",
+"No file was uploaded. Unknown error" => "沒有檔案被上傳，原因未知",
+"There is no error, the file uploaded with success" => "一切都順利，檔案上傳成功",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定：",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制",
 "The uploaded file was only partially uploaded" => "只有檔案的一部分被上傳",
@@ -13,13 +13,14 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "找不到暫存資料夾",
 "Failed to write to disk" => "寫入硬碟失敗",
 "Not enough storage available" => "儲存空間不足",
-"Invalid directory." => "無效的資料夾。",
+"Upload failed" => "上傳失敗",
+"Invalid directory." => "無效的資料夾",
 "Files" => "檔案",
-"Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0",
+"Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案，因為它可能是一個目錄或檔案大小為0",
 "Not enough space available" => "沒有足夠的可用空間",
 "Upload cancelled." => "上傳已取消",
-"File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中。離開此頁面將會取消上傳。",
-"URL cannot be empty." => "URL 不能為空白。",
+"File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中，離開此頁面將會取消上傳。",
+"URL cannot be empty." => "URL 不能為空",
 "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
 "Error" => "錯誤",
 "Share" => "分享",
@@ -32,49 +33,46 @@ $TRANSLATIONS = array(
 "cancel" => "取消",
 "replaced {new_name} with {old_name}" => "使用 {new_name} 取代 {old_name}",
 "undo" => "復原",
+"_%n folder_::_%n folders_" => array("%n 個資料夾"),
+"_%n file_::_%n files_" => array("%n 個檔案"),
+"{dirs} and {files}" => "{dirs} 和 {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n 個檔案正在上傳"),
-"files uploading" => "檔案正在上傳中",
-"'.' is an invalid file name." => "'.' 是不合法的檔名。",
-"File name cannot be empty." => "檔名不能為空。",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔名不合法，不允許 '\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 。",
+"files uploading" => "檔案上傳中",
+"'.' is an invalid file name." => "'.' 是不合法的檔名",
+"File name cannot be empty." => "檔名不能為空",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔名不合法，不允許 \\ / < > : \" | ? * 字元",
 "Your storage is full, files can not be updated or synced anymore!" => "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
 "Your storage is almost full ({usedSpacePercent}%)" => "您的儲存空間快要滿了 ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。",
 "Your download is being prepared. This might take some time if the files are big." => "正在準備您的下載，若您的檔案較大，將會需要更多時間。",
 "Name" => "名稱",
 "Size" => "大小",
-"Modified" => "修改",
-"_%n folder_::_%n folders_" => array("%n 個資料夾"),
-"_%n file_::_%n files_" => array("%n 個檔案"),
+"Modified" => "修改時間",
 "%s could not be renamed" => "無法重新命名 %s",
 "Upload" => "上傳",
 "File handling" => "檔案處理",
-"Maximum upload size" => "最大上傳檔案大小",
+"Maximum upload size" => "上傳限制",
 "max. possible: " => "最大允許：",
-"Needed for multi-file and folder downloads." => "針對多檔案和目錄下載是必填的。",
-"Enable ZIP-download" => "啟用 Zip 下載",
+"Needed for multi-file and folder downloads." => "下載多檔案和目錄時，此項是必填的。",
+"Enable ZIP-download" => "啟用 ZIP 下載",
 "0 is unlimited" => "0代表沒有限制",
-"Maximum input size for ZIP files" => "針對 ZIP 檔案最大輸入大小",
+"Maximum input size for ZIP files" => "ZIP 壓縮前的原始大小限制",
 "Save" => "儲存",
 "New" => "新增",
 "Text file" => "文字檔",
 "Folder" => "資料夾",
 "From link" => "從連結",
-"Deleted files" => "已刪除的檔案",
+"Deleted files" => "回收桶",
 "Cancel upload" => "取消上傳",
-"You don’t have write permissions here." => "您在這裡沒有編輯權。",
-"Nothing in here. Upload something!" => "這裡什麼也沒有，上傳一些東西吧！",
+"You don’t have write permissions here." => "您在這裡沒有編輯權",
+"Nothing in here. Upload something!" => "這裡還沒有東西，上傳一些吧！",
 "Download" => "下載",
-"Unshare" => "取消共享",
+"Unshare" => "取消分享",
 "Delete" => "刪除",
 "Upload too large" => "上傳過大",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案大小超過伺服器的限制。",
 "Files are being scanned, please wait." => "正在掃描檔案，請稍等。",
-"Current scanning" => "目前掃描",
-"directory" => "目錄",
-"directories" => "目錄",
-"file" => "檔案",
-"files" => "檔案",
-"Upgrading filesystem cache..." => "正在升級檔案系統快取..."
+"Current scanning" => "正在掃描",
+"Upgrading filesystem cache..." => "正在升級檔案系統快取…"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 360874103f8..24cb8c2fe58 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -10,7 +10,7 @@
 						data-type='file'><p><?php p($l->t('Text file'));?></p></li>
 					<li style="background-image:url('<?php p(OCP\mimetype_icon('dir')) ?>')"
 						data-type='folder'><p><?php p($l->t('Folder'));?></p></li>
-					<li style="background-image:url('<?php p(OCP\image_path('core', 'actions/public.png')) ?>')"
+					<li style="background-image:url('<?php p(OCP\image_path('core', 'filetypes/web.svg')) ?>')"
 						data-type='web'><p><?php p($l->t('From link'));?></p></li>
 				</ul>
 			</div>
@@ -56,24 +56,27 @@
 </div>
 
 <?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?>
-	<div id="emptyfolder"><?php p($l->t('Nothing in here. Upload something!'))?></div>
+	<div id="emptycontent"><?php p($l->t('Nothing in here. Upload something!'))?></div>
 <?php endif; ?>
 
-<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>">
+<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36">
 	<thead>
 		<tr>
 			<th id='headerName'>
-				<input type="checkbox" id="select_all" />
-				<span class='name'><?php p($l->t( 'Name' )); ?></span>
-				<span class='selectedActions'>
-					<?php if($_['allowZipDownload']) : ?>
-						<a href="" class="download">
-							<img class="svg" alt="Download"
-								 src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>" />
-							<?php p($l->t('Download'))?>
-						</a>
-					<?php endif; ?>
-				</span>
+				<div id="headerName-container">
+					<input type="checkbox" id="select_all" />
+					<label for="select_all"></label>
+					<span class="name"><?php p($l->t( 'Name' )); ?></span>
+					<span class="selectedActions">
+						<?php if($_['allowZipDownload']) : ?>
+							<a href="" class="download">
+								<img class="svg" alt="Download"
+									 src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>" />
+								<?php p($l->t('Download'))?>
+							</a>
+						<?php endif; ?>
+					</span>
+				</div>
 			</th>
 			<th id="headerSize"><?php p($l->t('Size')); ?></th>
 			<th id="headerDate">
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 3e6f619868d..4076c1bb331 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -1,5 +1,7 @@
 <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
 <?php foreach($_['files'] as $file):
+	//strlen('files/') => 6
+	$relativePath = substr($file['path'], 6);
 	// the bigger the file, the darker the shade of grey; megabytes*2
 	$simple_size_color = intval(160-$file['size']/(1024*1024)*2);
 	if($simple_size_color<0) $simple_size_color = 0;
@@ -13,16 +15,38 @@
 		data-file="<?php p($name);?>"
 		data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>"
 		data-mime="<?php p($file['mimetype'])?>"
-		data-size='<?php p($file['size']);?>'
-		data-permissions='<?php p($file['permissions']); ?>'>
+		data-size="<?php p($file['size']);?>"
+		data-permissions="<?php p($file['permissions']); ?>">
+		<?php if($file['isPreviewAvailable']): ?>
+		<td class="filename svg preview-icon"
+		<?php else: ?>
 		<td class="filename svg"
+		<?php endif; ?>
 		<?php if($file['type'] == 'dir'): ?>
 			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
 		<?php else: ?>
-			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
+			<?php if($_['isPublic']): ?>
+				<?php
+				$relativePath = substr($relativePath, strlen($_['sharingroot']));
+				?>
+				<?php if($file['isPreviewAvailable']): ?>
+				style="background-image:url(<?php print_unescaped(OCP\publicPreview_icon($relativePath, $_['sharingtoken'])); ?>)"
+				<?php else: ?>
+				style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
+				<?php endif; ?>
+			<?php else: ?>
+				<?php if($file['isPreviewAvailable']): ?>
+				style="background-image:url(<?php print_unescaped(OCP\preview_icon($relativePath)); ?>)"
+				<?php else: ?>
+				style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
+				<?php endif; ?>
+			<?php endif; ?>
 		<?php endif; ?>
 			>
-		<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
+		<?php if(!isset($_['readonly']) || !$_['readonly']): ?>
+			<input id="select-<?php p($file['fileid']); ?>" type="checkbox" />
+			<label for="select-<?php p($file['fileid']); ?>"></label>
+		<?php endif; ?>
 		<?php if($file['type'] == 'dir'): ?>
 			<a class="name" href="<?php p(rtrim($_['baseURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>" title="">
 		<?php else: ?>
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index a723d80773b..a80eb3e6521 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -8,12 +8,22 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
 "Private key password successfully updated." => "Heslo súkromného kľúča je úspešne aktualizované.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš privátny kľúč je nesprávny! Pravdepodobne bolo zmenené vaše heslo mimo systému ownCloud (napr. váš korporátny adresár). Môžte aktualizovať vaše heslo privátneho kľúča v osobných nastaveniach za účelom obnovenia prístupu k zašifrovaným súborom.",
+"Missing requirements." => "Chýbajúce požiadavky.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná.",
+"Following users are not set up for encryption:" => "Nasledujúci používatelia nie sú nastavení pre šifrovanie:",
 "Saving..." => "Ukladám...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku.",
+"You can unlock your private key in your " => "Môžte odomknúť váš privátny kľúč v",
 "personal settings" => "osobné nastavenia",
 "Encryption" => "Šifrovanie",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):",
+"Recovery key password" => "Heslo obnovovacieho kľúča",
 "Enabled" => "Povolené",
 "Disabled" => "Zakázané",
+"Change recovery key password:" => "Zmeniť heslo obnovovacieho kľúča:",
+"Old Recovery key password" => "Staré heslo obnovovacieho kľúča",
+"New Recovery key password" => "Nové heslo obnovovacieho kľúča",
 "Change Password" => "Zmeniť heslo",
 "Your private key password no longer match your log-in password:" => "Vaše heslo súkromného kľúča je rovnaké ako Vaše prihlasovacie heslo:",
 "Set your old private key password to your current log-in password." => "Nastavte si staré heslo súkromného kľúča k Vášmu súčasnému prihlasovaciemu heslu.",
diff --git a/apps/files_sharing/ajax/publicpreview.php b/apps/files_sharing/ajax/publicpreview.php
new file mode 100644
index 00000000000..41a1c178a48
--- /dev/null
+++ b/apps/files_sharing/ajax/publicpreview.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+if(!\OC_App::isEnabled('files_sharing')){
+	exit;
+}
+
+$file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : '';
+$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36';
+$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36';
+$scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
+$token = array_key_exists('t', $_GET) ? (string) $_GET['t'] : '';
+
+if($token === ''){
+	\OC_Response::setStatus(400); //400 Bad Request
+	\OC_Log::write('core-preview', 'No token parameter was passed', \OC_Log::DEBUG);
+	exit;
+}
+
+$linkedItem = \OCP\Share::getShareByToken($token);
+if($linkedItem === false || ($linkedItem['item_type'] !== 'file' && $linkedItem['item_type'] !== 'folder')) {
+	\OC_Response::setStatus(404);
+	\OC_Log::write('core-preview', 'Passed token parameter is not valid', \OC_Log::DEBUG);
+	exit;
+}
+
+if(!isset($linkedItem['uid_owner']) || !isset($linkedItem['file_source'])) {
+	\OC_Response::setStatus(500);
+	\OC_Log::write('core-preview', 'Passed token seems to be valid, but it does not contain all necessary information . ("' . $token . '")', \OC_Log::WARN);
+	exit;
+}
+
+$userId = $linkedItem['uid_owner'];
+\OC_Util::setupFS($userId);
+
+$pathId = $linkedItem['file_source'];
+$path = \OC\Files\Filesystem::getPath($pathId);
+$pathInfo = \OC\Files\Filesystem::getFileInfo($path);
+$sharedFile = null;
+
+if($linkedItem['item_type'] === 'folder') {
+	$isvalid = \OC\Files\Filesystem::isValidPath($file);
+	if(!$isvalid) {
+		\OC_Response::setStatus(400); //400 Bad Request
+		\OC_Log::write('core-preview', 'Passed filename is not valid, might be malicious (file:"' . $file . '";ip:"' . $_SERVER['REMOTE_ADDR'] . '")', \OC_Log::WARN);
+		exit;
+	}
+	$sharedFile = \OC\Files\Filesystem::normalizePath($file);
+}
+
+if($linkedItem['item_type'] === 'file') {
+	$parent = $pathInfo['parent'];
+	$path = \OC\Files\Filesystem::getPath($parent);
+	$sharedFile = $pathInfo['name'];
+}
+
+$path = \OC\Files\Filesystem::normalizePath($path, false);
+if(substr($path, 0, 1) === '/') {
+	$path = substr($path, 1);
+}
+
+if($maxX === 0 || $maxY === 0) {
+	\OC_Response::setStatus(400); //400 Bad Request
+	\OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG);
+	exit;
+}
+
+$root = 'files/' . $path;
+
+try{
+	$preview = new \OC\Preview($userId, $root);
+	$preview->setFile($sharedFile);
+	$preview->setMaxX($maxX);
+	$preview->setMaxY($maxY);
+	$preview->setScalingUp($scalingUp);
+
+	$preview->show();
+} catch (\Exception $e) {
+	\OC_Response::setStatus(500);
+	\OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG);
+}
\ No newline at end of file
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
new file mode 100644
index 00000000000..02815b5eb42
--- /dev/null
+++ b/apps/files_sharing/appinfo/routes.php
@@ -0,0 +1,5 @@
+<?php
+$this->create('core_ajax_public_preview', '/publicpreview.png')->action(
+function() {
+	require_once __DIR__ . '/../ajax/publicpreview.php';
+});
\ No newline at end of file
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 7ffd5e06873..357c6fdf540 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -16,7 +16,7 @@ $(document).ready(function() {
 	if (typeof FileActions !== 'undefined') {
 		var mimetype = $('#mimetype').val();
 		// Show file preview if previewer is available, images are already handled by the template
-		if (mimetype.substr(0, mimetype.indexOf('/')) != 'image') {
+		if (mimetype.substr(0, mimetype.indexOf('/')) != 'image' && $('.publicpreview').length === 0) {
 			// Trigger default action if not download TODO
 			var action = FileActions.getDefault(mimetype, 'file', OC.PERMISSION_READ);
 			if (typeof action === 'undefined') {
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index 56d67ea7ce7..5cc33fd3830 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -1,9 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"The password is wrong. Try again." => "請檢查您的密碼並再試一次。",
+"The password is wrong. Try again." => "請檢查您的密碼並再試一次",
 "Password" => "密碼",
 "Submit" => "送出",
-"Sorry, this link doesn’t seem to work anymore." => "抱歉，這連結看來已經不能用了。",
+"Sorry, this link doesn’t seem to work anymore." => "抱歉，此連結已經失效",
 "Reasons might be:" => "可能的原因：",
 "the item was removed" => "項目已經移除",
 "the link expired" => "連結過期",
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index e9fdf6e4c95..ec6b4e815f8 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -172,6 +172,7 @@ if (isset($path)) {
 					} else {
 						$i['extension'] = '';
 					}
+					$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']);
 				}
 				$i['directory'] = $getPath;
 				$i['permissions'] = OCP\PERMISSION_READ;
@@ -194,6 +195,9 @@ if (isset($path)) {
 			$list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
 			$list->assign('downloadURL',
 				OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=');
+			$list->assign('isPublic', true);
+			$list->assign('sharingtoken', $token);
+			$list->assign('sharingroot', $basePath);
 			$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
 			$breadcrumbNav->assign('breadcrumb', $breadcrumb);
 			$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 746a715f3cc..c164b3ea2b7 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -79,6 +79,10 @@
 						<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
 					</video>
 				</div>
+			<?php elseif (\OC\Preview::isMimeSupported($_['mimetype'])): ?>
+				<div id="imgframe">
+					<img src="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => 500, 'y' => 500, 'file' => urlencode($_['directory_path']), 't' => $_['dirToken']))); ?>" class="publicpreview"/>
+				</div>
 			<?php else: ?>
 				<ul id="noPreview">
 					<li class="error">
diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php
new file mode 100644
index 00000000000..a0846b051c7
--- /dev/null
+++ b/apps/files_trashbin/ajax/preview.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+\OC_Util::checkLoggedIn();
+
+if(!\OC_App::isEnabled('files_trashbin')){
+	exit;
+}
+
+$file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : '';
+$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '44';
+$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '44';
+$scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
+
+if($file === '') {
+	\OC_Response::setStatus(400); //400 Bad Request
+	\OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG);
+	exit;
+}
+
+if($maxX === 0 || $maxY === 0) {
+	\OC_Response::setStatus(400); //400 Bad Request
+	\OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG);
+	exit;
+}
+
+try{
+	$preview = new \OC\Preview(\OC_User::getUser(), 'files_trashbin/files');
+	$preview->setFile($file);
+	$preview->setMaxX($maxX);
+	$preview->setMaxY($maxY);
+	$preview->setScalingUp($scalingUp);
+
+	$preview->showPreview();
+}catch(\Exception $e) {
+	\OC_Response::setStatus(500);
+	\OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG);
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/appinfo/routes.php b/apps/files_trashbin/appinfo/routes.php
new file mode 100644
index 00000000000..b1c3f02741e
--- /dev/null
+++ b/apps/files_trashbin/appinfo/routes.php
@@ -0,0 +1,5 @@
+<?php
+$this->create('core_ajax_trashbin_preview', '/preview.png')->action(
+function() {
+	require_once __DIR__ . '/../ajax/preview.php';
+});
\ No newline at end of file
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 27f8407db06..0baeab1de97 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -64,6 +64,7 @@ foreach ($result as $r) {
 		$i['directory'] = '';
 	}
 	$i['permissions'] = OCP\PERMISSION_READ;
+	$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($r['mime']);
 	$files[] = $i;
 }
 
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
index 759e5299e42..939c7fed614 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
 "Delete permanently" => "Μόνιμη διαγραφή",
 "Name" => "Όνομα",
 "Deleted" => "Διαγράφηκε",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("","%n φάκελοι"),
+"_%n file_::_%n files_" => array("","%n αρχεία"),
 "restored" => "έγινε επαναφορά",
 "Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
 "Restore" => "Επαναφορά",
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index 0c88d132b5c..9dccc773cb1 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -8,8 +8,8 @@ $TRANSLATIONS = array(
 "Delete permanently" => "Eliminar permanentemente",
 "Name" => "Nome",
 "Deleted" => "Apagado",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
+"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
 "restored" => "Restaurado",
 "Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
 "Restore" => "Restaurar",
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index 2dfc484fc7f..bfc2fc659de 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
 "_%n folder_::_%n folders_" => array("%n 個資料夾"),
 "_%n file_::_%n files_" => array("%n 個檔案"),
 "restored" => "已還原",
-"Nothing in here. Your trash bin is empty!" => "您的垃圾桶是空的！",
+"Nothing in here. Your trash bin is empty!" => "您的回收桶是空的！",
 "Restore" => "還原",
 "Delete" => "刪除",
 "Deleted Files" => "已刪除的檔案"
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 880832f9afa..c79afdc0c2e 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -904,4 +904,7 @@ class Trashbin {
 		return true;
 	}
 
+	public static function preview_icon($path) {
+		return \OC_Helper::linkToRoute( 'core_ajax_trashbin_preview', array('x' => 36, 'y' => 36, 'file' => urlencode($path) ));
+	}
 }
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index 371765fa69a..88c32b1f3eb 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -6,7 +6,7 @@
 <div id='notification'></div>
 
 <?php if (isset($_['files']) && count($_['files']) === 0 && $_['dirlisting'] === false):?>
-	<div id="emptyfolder"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
+	<div id="emptycontent"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
 <?php endif; ?>
 
 <table id="filestable">
diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php
index 254b08dd36a..f7cc6b01bbb 100644
--- a/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@ -21,11 +21,19 @@
 		data-timestamp='<?php p($file['timestamp']);?>'
 		data-dirlisting=0
 		<?php endif; ?>>
+		<?php if($file['isPreviewAvailable']): ?>
+		<td class="filename svg preview-icon"
+		<?php else: ?>
 		<td class="filename svg"
+		<?php endif; ?>
 		<?php if($file['type'] === 'dir'): ?>
 			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
 		<?php else: ?>
-			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
+				<?php if($file['isPreviewAvailable']): ?>
+				style="background-image:url(<?php print_unescaped(OCA\Files_Trashbin\Trashbin::preview_icon(!$_['dirlisting'] ? ($file['name'].'.d'.$file['timestamp']) : ($file['directory'].'/'.$file['name']))); ?>)"
+				<?php else: ?>
+				style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
+				<?php endif; ?>
 		<?php endif; ?>
 			>
 		<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 9f4c31c068b..9109a8c710a 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -30,11 +30,11 @@ $TRANSLATIONS = array(
 "Password" => "Heslo",
 "For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and heslo prázdné.",
 "User Login Filter" => "Filtr přihlášení uživatelů",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad \"uid=%%uid\"",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"",
 "User List Filter" => "Filtr seznamu uživatelů",
-"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Určuje použitý filtr pro získávaní uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Určuje použitý filtr při získávání uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"",
 "Group Filter" => "Filtr skupin",
-"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Určuje použitý filtr, pro získávaní skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Určuje použitý filtr při získávání skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"",
 "Connection Settings" => "Nastavení spojení",
 "Configuration Active" => "Nastavení aktivní",
 "When unchecked, this configuration will be skipped." => "Pokud není zaškrtnuto, bude toto nastavení přeskočeno.",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index c5bb6a8a50c..df71a71e933 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -30,8 +30,11 @@ $TRANSLATIONS = array(
 "Password" => "Heslo",
 "For anonymous access, leave DN and Password empty." => "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
 "User Login Filter" => "Filter prihlásenia používateľov",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
 "User List Filter" => "Filter zoznamov používateľov",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definuje použitý filter, pri získavaní používateľov (bez \"placeholderov\"). Napríklad: \"objectClass=osoba\"",
 "Group Filter" => "Filter skupiny",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definuje použitý filter, pri získavaní skupín (bez \"placeholderov\"). Napríklad: \"objectClass=posixSkupina\"",
 "Connection Settings" => "Nastavenie pripojenia",
 "Configuration Active" => "Nastavenia sú aktívne ",
 "When unchecked, this configuration will be skipped." => "Ak nie je zaškrtnuté, nastavenie bude preskočené.",
@@ -45,6 +48,7 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Nepoužívajte pre pripojenie LDAPS, zlyhá.",
 "Case insensitve LDAP server (Windows)" => "LDAP server nerozlišuje veľkosť znakov (Windows)",
 "Turn off SSL certificate validation." => "Vypnúť overovanie SSL certifikátu.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera.",
 "Cache Time-To-Live" => "Životnosť objektov v cache",
 "in seconds. A change empties the cache." => "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť.",
 "Directory Settings" => "Nastavenie priečinka",
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index c7fb33195d7..3288438c09b 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -30,8 +30,11 @@ $TRANSLATIONS = array(
 "Password" => "Lösenord",
 "For anonymous access, leave DN and Password empty." => "För anonym åtkomst, lämna DN och lösenord tomt.",
 "User Login Filter" => "Filter logga in användare",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"",
 "User List Filter" => "Filter lista användare",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definierar filter som tillämpas vid sökning efter användare (inga platshållare). Exempel: \"objectClass=person\"",
 "Group Filter" => "Gruppfilter",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definierar filter som tillämpas vid sökning efter grupper (inga platshållare). Exempel: \"objectClass=posixGroup\"",
 "Connection Settings" => "Uppkopplingsinställningar",
 "Configuration Active" => "Konfiguration aktiv",
 "When unchecked, this configuration will be skipped." => "Ifall denna är avbockad så kommer konfigurationen att skippas.",
@@ -45,6 +48,7 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Använd inte för LDAPS-anslutningar, det kommer inte att fungera.",
 "Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)",
 "Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server.",
 "Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "i sekunder. En förändring tömmer cache.",
 "Directory Settings" => "Mappinställningar",