merge master into filesystem

57 files changed, 151 insertions, 19 deletions

diff --git a/apps/files/index.php b/apps/files/index.php
index 4e5f4cd93a8..54c74167803 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -99,15 +99,15 @@ $freeSpace=\OC\Files\Filesystem::free_space($dir);
 $freeSpace=max($freeSpace,0);
 $maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
 
-$permissions = OCP\Share::PERMISSION_READ;
-if (\OC\Files\Filesystem::isUpdatable($dir.'/')) {
-	$permissions |= OCP\Share::PERMISSION_UPDATE;
+$permissions = OCP\PERMISSION_READ;
+if (OC_Filesystem::isUpdatable($dir.'/')) {
+	$permissions |= OCP\PERMISSION_UPDATE;
 }
-if (\OC\Files\Filesystem::isDeletable($dir.'/')) {
-	$permissions |= OCP\Share::PERMISSION_DELETE;
+if (OC_Filesystem::isDeletable($dir.'/')) {
+	$permissions |= OCP\PERMISSION_DELETE;
 }
-if (\OC\Files\Filesystem::isSharable($dir.'/')) {
-	$permissions |= OCP\Share::PERMISSION_SHARE;
+if (OC_Filesystem::isSharable($dir.'/')) {
+	$permissions |= OCP\PERMISSION_SHARE;
 }
 
 $tmpl = new OCP\Template( 'files', 'index', 'user' );
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index f08e412921e..ac2e0d63588 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -32,14 +32,16 @@ var FileList={
 		html+='<td class="date"><span class="modified" title="'+formatDate(lastModified)+'" style="color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')">'+relative_modified_date(lastModified.getTime() / 1000)+'</span></td>';
 		html+='</tr>';
 		FileList.insertElement(name,'file',$(html).attr('data-file',name));
+		var row = $('tr').filterAttr('data-file',name);
 		if(loading){
-			$('tr').filterAttr('data-file',name).data('loading',true);
+			row.data('loading',true);
 		}else{
-			$('tr').filterAttr('data-file',name).find('td.filename').draggable(dragOptions);
+			row.find('td.filename').draggable(dragOptions);
 		}
 		if (hidden) {
-			$('tr').filterAttr('data-file', name).hide();
+			row.hide();
 		}
+		FileActions.display(row.find('td.filename'));
 	},
 	addDir:function(name,size,lastModified,hidden){
 		var html, td, link_elem, sizeColor, lastModifiedTime, modifiedColor;
@@ -66,11 +68,13 @@ var FileList={
 		td.append($('<span></span>').attr({ "class": "modified", "title": formatDate(lastModified), "style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')' }).text( relative_modified_date(lastModified.getTime() / 1000) ));
 		html.append(td);
 		FileList.insertElement(name,'dir',html);
-		$('tr').filterAttr('data-file',name).find('td.filename').draggable(dragOptions);
-		$('tr').filterAttr('data-file',name).find('td.filename').droppable(folderDropOptions);
+		var row = $('tr').filterAttr('data-file',name);
+		row.find('td.filename').draggable(dragOptions);
+		row.find('td.filename').droppable(folderDropOptions);
 		if (hidden) {
-			$('tr').filterAttr('data-file', name).hide();
+			row.hide();
 		}
+		FileActions.display(row.find('td.filename'));
 	},
 	refresh:function(data) {
 		var result = jQuery.parseJSON(data.responseText);
@@ -375,4 +379,7 @@ $(document).ready(function(){
 			FileList.lastAction();
 		}
 	});
+	$(window).unload(function (){
+		$(window).trigger('beforeunload');
+	});
 });
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index e54d4d7b74f..982351c589e 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -219,8 +219,11 @@ $(document).ready(function() {
 					$( '#uploadsize-message' ).dialog({
 						modal: true,
 						buttons: {
-							Close: function() {
-								$( this ).dialog( 'close' );
+							Close: {
+								text:t('files', 'Close'),
+								click:function() {
+									$( this ).dialog( 'close' );
+								}
 							}
 						}
 					});
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 78b4915f4ed..13d46911dc9 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "المجلد المؤقت غير موجود",
 "Files" => "الملفات",
 "Delete" => "محذوف",
+"Close" => "إغلق",
 "Name" => "الاسم",
 "Size" => "حجم",
 "Modified" => "معدل",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 97ee7f93c57..dbfb56f818f 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
 "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",
 "Upload Error" => "Error en la pujada",
+"Close" => "Tanca",
 "Pending" => "Pendents",
 "1 file uploading" => "1 fitxer pujant",
 "{count} files uploading" => "{count} fitxers en pujada",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index b8be5d0efaa..1409aada194 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to nějakou dobu trvat.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
 "Upload Error" => "Chyba odesílání",
+"Close" => "Zavřít",
 "Pending" => "Čekající",
 "1 file uploading" => "odesílá se 1 soubor",
 "{count} files uploading" => "odesílám {count} souborů",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index ce8a0fa592f..1f5fd87def4 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
 "Upload Error" => "Fejl ved upload",
+"Close" => "Luk",
 "Pending" => "Afventer",
 "1 file uploading" => "1 fil uploades",
 "{count} files uploading" => "{count} filer uploades",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index be5ae397e1d..16fa6cd98a4 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
 "Upload Error" => "Fehler beim Upload",
+"Close" => "Schließen",
 "Pending" => "Ausstehend",
 "1 file uploading" => "Eine Datei wird hoch geladen",
 "{count} files uploading" => "{count} Dateien werden hochgeladen",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index d5e29fe1aae..07af6977e38 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
 "Upload Error" => "Fehler beim Upload",
+"Close" => "Schließen",
 "Pending" => "Ausstehend",
 "1 file uploading" => "1 Datei wird hochgeladen",
 "{count} files uploading" => "{count} Dateien wurden hochgeladen",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 478823bc110..920ddf57591 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes",
 "Upload Error" => "Σφάλμα Αποστολής",
+"Close" => "Κλείσιμο",
 "Pending" => "Εκκρεμεί",
 "1 file uploading" => "1 αρχείο ανεβαίνει",
 "{count} files uploading" => "{count} αρχεία ανεβαίνουν",
@@ -48,6 +49,7 @@
 "New" => "Νέο",
 "Text file" => "Αρχείο κειμένου",
 "Folder" => "Φάκελος",
+"From link" => "Από σύνδεσμο",
 "Upload" => "Αποστολή",
 "Cancel upload" => "Ακύρωση αποστολής",
 "Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 4fae52dd15b..dcd16d3f1ff 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -17,6 +17,7 @@
 "generating ZIP-file, it may take some time." => "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo",
 "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",
 "Upload Error" => "Alŝuta eraro",
+"Close" => "Fermi",
 "Pending" => "Traktotaj",
 "1 file uploading" => "1 dosiero estas alŝutata",
 "Upload cancelled." => "La alŝuto nuliĝis.",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 35f646db525..cf45d10d028 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
 "Upload Error" => "Error al subir el archivo",
+"Close" => "cerrrar",
 "Pending" => "Pendiente",
 "1 file uploading" => "subiendo 1 archivo",
 "{count} files uploading" => "Subiendo {count} archivos",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index a4e29dfec27..d2ab91fafdd 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "generando un archivo ZIP, puede llevar un tiempo.",
 "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",
 "Upload Error" => "Error al subir el archivo",
+"Close" => "Cerrar",
 "Pending" => "Pendiente",
 "1 file uploading" => "Subiendo 1 archivo",
 "{count} files uploading" => "Subiendo {count} archivos",
@@ -48,6 +49,7 @@
 "New" => "Nuevo",
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
+"From link" => "Desde enlace",
 "Upload" => "Subir",
 "Cancel upload" => "Cancelar subida",
 "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index a920d5c2cf6..fedb8b5736c 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "ZIP-faili loomine, see võib veidi aega võtta.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
 "Upload Error" => "Üleslaadimise viga",
+"Close" => "Sulge",
 "Pending" => "Ootel",
 "1 file uploading" => "1 faili üleslaadimisel",
 "{count} files uploading" => "{count} faili üleslaadimist",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index cddbb945ed4..57fc0ace99a 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -17,6 +17,7 @@
 "generating ZIP-file, it may take some time." => "ZIP-fitxategia sortzen ari da, denbora har dezake",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
 "Upload Error" => "Igotzean errore bat suertatu da",
+"Close" => "Itxi",
 "Pending" => "Zain",
 "1 file uploading" => "fitxategi 1 igotzen",
 "Upload cancelled." => "Igoera ezeztatuta",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 7c05b093983..640101b5813 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -15,6 +15,7 @@
 "generating ZIP-file, it may take some time." => "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد",
 "Upload Error" => "خطا در بار گذاری",
+"Close" => "بستن",
 "Pending" => "در انتظار",
 "Upload cancelled." => "بار گذاری لغو شد",
 "Invalid name, '/' is not allowed." => "نام نامناسب '/' غیرفعال است",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 06f47405d0e..bd11e9c9011 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -18,6 +18,7 @@
 "generating ZIP-file, it may take some time." => "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken.",
 "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",
 "Upload Error" => "Lähetysvirhe.",
+"Close" => "Sulje",
 "Pending" => "Odottaa",
 "Upload cancelled." => "Lähetys peruttu.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index e99a59e7003..bb299ace830 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ;  cela peut prendre du temps.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
 "Upload Error" => "Erreur de chargement",
+"Close" => "Fermer",
 "Pending" => "En cours",
 "1 file uploading" => "1 fichier en cours de téléchargement",
 "{count} files uploading" => "{count} fichiers téléversés",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 1c5dfceb4f3..b049f3b2f33 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -16,6 +16,7 @@
 "generating ZIP-file, it may take some time." => "xerando ficheiro ZIP, pode levar un anaco.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes",
 "Upload Error" => "Erro na subida",
+"Close" => "Pechar",
 "Pending" => "Pendentes",
 "Upload cancelled." => "Subida cancelada.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "A subida do ficheiro está en curso. Saír agora da páxina cancelará a subida.",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index e9c85f2cb02..1eac8093efb 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -12,6 +12,7 @@
 "generating ZIP-file, it may take some time." => "יוצר קובץ ZIP, אנא המתן.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
 "Upload Error" => "שגיאת העלאה",
+"Close" => "סגירה",
 "Pending" => "ממתין",
 "Upload cancelled." => "ההעלאה בוטלה.",
 "Invalid name, '/' is not allowed." => "שם לא חוקי, '/' אסור לשימוש.",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 11f813f34a2..4c78ddfd745 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -17,6 +17,7 @@
 "generating ZIP-file, it may take some time." => "generiranje ZIP datoteke, ovo može potrajati.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
 "Upload Error" => "Pogreška pri slanju",
+"Close" => "Zatvori",
 "Pending" => "U tijeku",
 "1 file uploading" => "1 datoteka se učitava",
 "Upload cancelled." => "Slanje poništeno.",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index b96e2333e90..584676a6b26 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -15,6 +15,7 @@
 "generating ZIP-file, it may take some time." => "ZIP-fájl generálása, ez eltarthat egy ideig.",
 "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ű",
 "Upload Error" => "Feltöltési hiba",
+"Close" => "Bezár",
 "Pending" => "Folyamatban",
 "Upload cancelled." => "Feltöltés megszakítva",
 "Invalid name, '/' is not allowed." => "Érvénytelen név, a '/' nem megengedett",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index bcebebc1405..cf3bc1eabbc 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -4,6 +4,7 @@
 "Missing a temporary folder" => "Manca un dossier temporari",
 "Files" => "Files",
 "Delete" => "Deler",
+"Close" => "Clauder",
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 5da5ec63b1b..cd356298a1c 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -15,6 +15,7 @@
 "generating ZIP-file, it may take some time." => "membuat berkas ZIP, ini mungkin memakan waktu.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte",
 "Upload Error" => "Terjadi Galat Pengunggahan",
+"Close" => "tutup",
 "Pending" => "Menunggu",
 "Upload cancelled." => "Pengunggahan dibatalkan.",
 "Invalid name, '/' is not allowed." => "Kesalahan nama, '/' tidak diijinkan.",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 901266c32d1..155b8aa34c9 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
 "Upload Error" => "Errore di invio",
+"Close" => "Chiudi",
 "Pending" => "In corso",
 "1 file uploading" => "1 file in fase di caricamento",
 "{count} files uploading" => "{count} file in fase di caricamentoe",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 9ec7e786b81..b97975b8ef7 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "ZIPファイルを生成中です、しばらくお待ちください。",
 "Unable to upload your file as it is a directory or has 0 bytes" => "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。",
 "Upload Error" => "アップロードエラー",
+"Close" => "閉じる",
 "Pending" => "保留",
 "1 file uploading" => "ファイルを1つアップロード中",
 "{count} files uploading" => "{count} ファイルをアップロード中",
@@ -48,6 +49,7 @@
 "New" => "新規",
 "Text file" => "テキストファイル",
 "Folder" => "フォルダ",
+"From link" => "リンク",
 "Upload" => "アップロード",
 "Cancel upload" => "アップロードをキャンセル",
 "Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index ba991fd34c2..21676d7049b 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "ZIP-ფაილის გენერირება, ამას ჭირდება გარკვეული დრო.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს",
 "Upload Error" => "შეცდომა ატვირთვისას",
+"Close" => "დახურვა",
 "Pending" => "მოცდის რეჟიმში",
 "1 file uploading" => "1 ფაილის ატვირთვა",
 "{count} files uploading" => "{count} ფაილი იტვირთება",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index d2561e129dd..110dea7a8b5 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -14,6 +14,7 @@
 "generating ZIP-file, it may take some time." => "ZIP파일 생성에 시간이 걸릴 수 있습니다.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "이 파일은 디렉토리이거나 0 바이트이기 때문에 업로드 할 수 없습니다.",
 "Upload Error" => "업로드 에러",
+"Close" => "닫기",
 "Pending" => "보류 중",
 "Upload cancelled." => "업로드 취소.",
 "Invalid name, '/' is not allowed." => "잘못된 이름, '/' 은 허용이 되지 않습니다.",
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
index 3c40831b83a..49995f8df86 100644
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Close" => "داخستن",
 "Name" => "ناو",
 "Save" => "پاشکه‌وتکردن",
 "Folder" => "بوخچه",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 4e2ce1b1dbf..cd669d22225 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -14,6 +14,7 @@
 "generating ZIP-file, it may take some time." => "Et  gëtt eng ZIP-File generéiert, dëst ka bëssen daueren.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.",
 "Upload Error" => "Fehler beim eroplueden",
+"Close" => "Zoumaachen",
 "Upload cancelled." => "Upload ofgebrach.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
 "Invalid name, '/' is not allowed." => "Ongültege Numm, '/' net erlaabt.",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 94ad807e2ad..b2732bf92d4 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko.",
 "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",
 "Upload Error" => "Įkėlimo klaida",
+"Close" => "Užverti",
 "Pending" => "Laukiantis",
 "1 file uploading" => "įkeliamas 1 failas",
 "{count} files uploading" => "{count}  įkeliami failai",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index a3c43d266ff..49d00fa45a0 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -11,6 +11,7 @@
 "generating ZIP-file, it may take some time." => "Се генерира ZIP фајлот, ќе треба извесно време.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти",
 "Upload Error" => "Грешка при преземање",
+"Close" => "Затвои",
 "Pending" => "Чека",
 "Upload cancelled." => "Преземањето е прекинато.",
 "Invalid name, '/' is not allowed." => "неисправно име, '/' не е дозволено.",
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 35dda3d8a6b..da3a3946b76 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -13,6 +13,7 @@
 "generating ZIP-file, it may take some time." => "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
 "Upload Error" => "Muat naik ralat",
+"Close" => "Tutup",
 "Pending" => "Dalam proses",
 "Upload cancelled." => "Muatnaik dibatalkan.",
 "Invalid name, '/' is not allowed." => "penggunaa nama tidak sah, '/' tidak dibenarkan.",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index f53b683f84e..eddcc035d19 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -21,6 +21,7 @@
 "generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
 "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",
 "Upload Error" => "Opplasting feilet",
+"Close" => "Lukk",
 "Pending" => "Ventende",
 "1 file uploading" => "1 fil lastes opp",
 "{count} files uploading" => "{count} filer laster opp",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 3dc2a7778d6..b1137e57708 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -22,11 +22,12 @@
 "generating ZIP-file, it may take some time." => "aanmaken ZIP-file, dit kan enige tijd duren.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
 "Upload Error" => "Upload Fout",
+"Close" => "Sluit",
 "Pending" => "Wachten",
 "1 file uploading" => "1 bestand wordt ge-upload",
 "{count} files uploading" => "{count} bestanden aan het uploaden",
 "Upload cancelled." => "Uploaden geannuleerd.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Bestands upload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
 "Invalid name, '/' is not allowed." => "Ongeldige naam, '/' is niet toegestaan.",
 "{count} files scanned" => "{count} bestanden gescanned",
 "error while scanning" => "Fout tijdens het scannen",
@@ -48,6 +49,7 @@
 "New" => "Nieuw",
 "Text file" => "Tekstbestand",
 "Folder" => "Map",
+"From link" => "Vanaf link",
 "Upload" => "Upload",
 "Cancel upload" => "Upload afbreken",
 "Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index df8dcb0e9cf..57974afa858 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Manglar ei mellombels mappe",
 "Files" => "Filer",
 "Delete" => "Slett",
+"Close" => "Lukk",
 "Name" => "Namn",
 "Size" => "Storleik",
 "Modified" => "Endra",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index ad48313773c..999275a3bda 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, może potrwać pewien czas.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów",
 "Upload Error" => "Błąd wczytywania",
+"Close" => "Zamknij",
 "Pending" => "Oczekujące",
 "1 file uploading" => "1 plik wczytany",
 "{count} files uploading" => "{count} przesyłanie plików",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 4af33ed13ea..f9203ec1cc7 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.",
 "Upload Error" => "Erro de envio",
+"Close" => "Fechar",
 "Pending" => "Pendente",
 "1 file uploading" => "enviando 1 arquivo",
 "{count} files uploading" => "Enviando {count} arquivos",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 6f3d72e511f..93b87e405bd 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "a gerar o ficheiro ZIP, poderá demorar algum tempo.",
 "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",
 "Upload Error" => "Erro no envio",
+"Close" => "Fechar",
 "Pending" => "Pendente",
 "1 file uploading" => "A enviar 1 ficheiro",
 "{count} files uploading" => "A carregar {count} ficheiros",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index bdf17a53a24..22eb954e7e0 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -17,6 +17,7 @@
 "generating ZIP-file, it may take some time." => "se generază fișierul ZIP, va dura ceva timp.",
 "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.",
 "Upload Error" => "Eroare la încărcare",
+"Close" => "Închide",
 "Pending" => "În așteptare",
 "1 file uploading" => "un fișier se încarcă",
 "Upload cancelled." => "Încărcare anulată.",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 10b73822b2b..eca3236f571 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "создание ZIP-файла, это может занять некоторое время.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог",
 "Upload Error" => "Ошибка загрузки",
+"Close" => "Закрыть",
 "Pending" => "Ожидание",
 "1 file uploading" => "загружается 1 файл",
 "{count} files uploading" => "{count} файлов загружается",
@@ -48,6 +49,7 @@
 "New" => "Новый",
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
+"From link" => "Из ссылки",
 "Upload" => "Загрузить",
 "Cancel upload" => "Отмена загрузки",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index f01937303d4..5f9747f3599 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "Создание ZIP-файла, это может занять некоторое время.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией",
 "Upload Error" => "Ошибка загрузки",
+"Close" => "Закрыть",
 "Pending" => "Ожидающий решения",
 "1 file uploading" => "загрузка 1 файла",
 "{count} files uploading" => "{количество} загружено файлов",
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index 00098cad6f7..90451e403e1 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "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" => "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය",
 "No file was uploaded" => "කිසිදු ගොනවක් උඩුගත නොවිනි",
 "Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක",
@@ -13,25 +14,38 @@
 "suggest name" => "නමක් යෝජනා කරන්න",
 "cancel" => "අත් හරින්න",
 "undo" => "නිෂ්ප්‍රභ කරන්න",
+"generating ZIP-file, it may take some time." => "ගොනුවක් සෑදෙමින් පවතී. කෙටි වේලාවක් ගත විය හැක",
 "Upload Error" => "උඩුගත කිරීමේ දෝශයක්",
+"Close" => "වසන්න",
+"1 file uploading" => "1 ගොනුවක් උඩගත කෙරේ",
 "Upload cancelled." => "උඩුගත කිරීම අත් හරින්න ලදී",
+"File upload is in progress. Leaving the page now will cancel the upload." => "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
+"Invalid name, '/' is not allowed." => "අවලංගු නමක්. '/' ට අවසර නැත",
+"error while scanning" => "පරීක්ෂා කිරීමේදී දෝෂයක්",
 "Name" => "නම",
 "Size" => "ප්‍රමාණය",
 "Modified" => "වෙනස් කළ",
+"1 folder" => "1 ෆොල්ඩරයක්",
 "1 file" => "1 ගොනුවක්",
 "File handling" => "ගොනු පරිහරණය",
 "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
 "max. possible: " => "හැකි උපරිමය:",
+"Needed for multi-file and folder downloads." => "බහු-ගොනු හා ෆොල්ඩර බාගත කිරීමට අවශ්‍යයි",
+"Enable ZIP-download" => "ZIP-බාගත කිරීම් සක්‍රිය කරන්න",
 "0 is unlimited" => "0 යනු සීමාවක් නැති බවය",
+"Maximum input size for ZIP files" => "ZIP ගොනු සඳහා දැමිය හැකි උපරිම විශාලතවය",
 "Save" => "සුරකින්න",
 "New" => "නව",
 "Text file" => "පෙළ ගොනුව",
 "Folder" => "ෆෝල්ඩරය",
+"From link" => "යොමුවෙන්",
 "Upload" => "උඩුගත කිරීම",
 "Cancel upload" => "උඩුගත කිරීම අත් හරින්න",
 "Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
 "Share" => "බෙදාහදාගන්න",
 "Download" => "බාගත කිරීම",
 "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" => "වර්තමාන පරික්ෂාව"
 );
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 5b6c2579bf5..ae625ae71b4 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "generujem ZIP-súbor, môže to chvíľu trvať.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov.",
 "Upload Error" => "Chyba odosielania",
+"Close" => "Zavrieť",
 "Pending" => "Čaká sa",
 "1 file uploading" => "1 súbor sa posiela ",
 "{count} files uploading" => "{count} súborov odosielaných",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 073aa7daad8..bf4cfa1ea3a 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -20,6 +20,7 @@
 "generating ZIP-file, it may take some time." => "Ustvarjanje datoteke ZIP. To lahko traja nekaj časa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov.",
 "Upload Error" => "Napaka med nalaganjem",
+"Close" => "Zapri",
 "Pending" => "V čakanju ...",
 "1 file uploading" => "Pošiljanje 1 datoteke",
 "Upload cancelled." => "Pošiljanje je preklicano.",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index b61b989f33a..6c5fdd39349 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -5,19 +5,58 @@
 "The uploaded file was only partially uploaded" => "Послати фајл је само делимично отпремљен!",
 "No file was uploaded" => "Ниједан фајл није послат",
 "Missing a temporary folder" => "Недостаје привремена фасцикла",
+"Failed to write to disk" => "Није успело записивање на диск",
 "Files" => "Фајлови",
+"Unshare" => "Укини дељење",
 "Delete" => "Обриши",
+"Rename" => "Преименуј",
+"{new_name} already exists" => "{new_name} већ постоји",
+"replace" => "замени",
+"suggest name" => "предложи назив",
+"cancel" => "поништи",
+"replaced {new_name}" => "замењена са {new_name}",
+"undo" => "врати",
+"replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}",
+"unshared {files}" => "укинуто дељење над {files}",
+"deleted {files}" => "обриши {files}",
+"generating ZIP-file, it may take some time." => "генерисање ЗИП датотеке, потрајаће неко време.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Није могуће послати датотеку или зато што је директоријуму или јој је величина 0 бајта",
+"Upload Error" => "Грешка у слању",
+"Close" => "Затвори",
+"Pending" => "На чекању",
+"1 file uploading" => "1 датотека се шаље",
+"{count} files uploading" => "Шаље се {count} датотека",
+"Upload cancelled." => "Слање је прекинуто.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Слање датотеке је у току. Ако сада напустите страну слање ће бити прекинуто.",
+"Invalid name, '/' is not allowed." => "Грешка у имену, '/' није дозвољено.",
+"{count} files scanned" => "{count} датотека се скенира",
+"error while scanning" => "грешка у скенирању",
 "Name" => "Име",
 "Size" => "Величина",
 "Modified" => "Задња измена",
+"1 folder" => "1 директоријум",
+"{count} folders" => "{count} директоријума",
+"1 file" => "1 датотека",
+"{count} files" => "{count} датотека",
+"File handling" => "Рад са датотекама",
 "Maximum upload size" => "Максимална величина пошиљке",
+"max. possible: " => "макс. величина:",
+"Needed for multi-file and folder downloads." => "Неопходно за вишеструко преузимања датотека и директоријума.",
+"Enable ZIP-download" => "Укључи преузимање у ЗИП-у",
+"0 is unlimited" => "0 је неограничено",
+"Maximum input size for ZIP files" => "Максимална величина ЗИП датотека",
 "Save" => "Сними",
 "New" => "Нови",
 "Text file" => "текстуални фајл",
 "Folder" => "фасцикла",
+"From link" => "Са линка",
 "Upload" => "Пошаљи",
+"Cancel upload" => "Прекини слање",
 "Nothing in here. Upload something!" => "Овде нема ничег. Пошаљите нешто!",
+"Share" => "Дељење",
 "Download" => "Преузми",
 "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" => "Тренутно се скенира"
 );
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index d5a5920b372..ae28045f30b 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Nedostaje privremena fascikla",
 "Files" => "Fajlovi",
 "Delete" => "Obriši",
+"Close" => "Zatvori",
 "Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja izmena",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 2d5ae944468..64e71346416 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "genererar ZIP-fil, det kan ta lite tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
 "Upload Error" => "Uppladdningsfel",
+"Close" => "Stäng",
 "Pending" => "Väntar",
 "1 file uploading" => "1 filuppladdning",
 "{count} files uploading" => "{count} filer laddas upp",
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index eae910e1906..7018f3080e6 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => " ZIP கோப்பு உருவாக்கப்படுகின்றது, இது சில நேரம் ஆகலாம்.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை",
 "Upload Error" => "பதிவேற்றல் வழு",
+"Close" => "மூடுக",
 "Pending" => "நிலுவையிலுள்ள",
 "1 file uploading" => "1 கோப்பு பதிவேற்றப்படுகிறது",
 "{count} files uploading" => "{எண்ணிக்கை} கோப்புகள் பதிவேற்றப்படுகின்றது",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 321e087f075..79b607413f0 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์",
 "Upload Error" => "เกิดข้อผิดพลาดในการอัพโหลด",
+"Close" => "ปิด",
 "Pending" => "อยู่ระหว่างดำเนินการ",
 "1 file uploading" => "กำลังอัพโหลดไฟล์ 1 ไฟล์",
 "{count} files uploading" => "กำลังอัพโหลด {count} ไฟล์",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index cc9485010e4..9dd56497f29 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -16,6 +16,7 @@
 "generating ZIP-file, it may take some time." => "ZIP dosyası oluşturuluyor, biraz sürebilir.",
 "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",
 "Upload Error" => "Yükleme hatası",
+"Close" => "Kapat",
 "Pending" => "Bekliyor",
 "Upload cancelled." => "Yükleme iptal edildi.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index aa6d51e9442..af75c2774ec 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -12,6 +12,7 @@
 "generating ZIP-file, it may take some time." => "Створення ZIP-файлу, це може зайняти певний час.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт",
 "Upload Error" => "Помилка завантаження",
+"Close" => "Закрити",
 "Pending" => "Очікування",
 "Upload cancelled." => "Завантаження перервано.",
 "Invalid name, '/' is not allowed." => "Некоректне ім'я, '/' не дозволено.",
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index 2a84494628d..e83ce940c1e 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "Tạo tập tinh ZIP, điều này có thể mất một ít thời gian",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte",
 "Upload Error" => "Tải lên lỗi",
+"Close" => "Đóng",
 "Pending" => "Chờ",
 "1 file uploading" => "1 tệp tin đang được tải lên",
 "{count} files uploading" => "{count} tập tin đang tải lên",
@@ -48,6 +49,7 @@
 "New" => "Mới",
 "Text file" => "Tập tin văn bản",
 "Folder" => "Folder",
+"From link" => "Từ liên kết",
 "Upload" => "Tải lên",
 "Cancel upload" => "Hủy upload",
 "Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index fa6a791697b..362d31ecda5 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -10,22 +10,34 @@
 "Unshare" => "取消共享",
 "Delete" => "删除",
 "Rename" => "重命名",
+"{new_name} already exists" => "{new_name} 已存在",
 "replace" => "替换",
 "suggest name" => "推荐名称",
 "cancel" => "取消",
+"replaced {new_name}" => "已替换 {new_name}",
 "undo" => "撤销",
+"replaced {new_name} with {old_name}" => "已用 {old_name} 替换 {new_name}",
+"unshared {files}" => "未分享的 {files}",
+"deleted {files}" => "已删除的 {files}",
 "generating ZIP-file, it may take some time." => "正在生成ZIP文件,这可能需要点时间",
 "Unable to upload your file as it is a directory or has 0 bytes" => "不能上传你指定的文件,可能因为它是个文件夹或者大小为0",
 "Upload Error" => "上传错误",
+"Close" => "关闭",
 "Pending" => "Pending",
 "1 file uploading" => "1 个文件正在上传",
+"{count} files uploading" => "{count} 个文件正在上传",
 "Upload cancelled." => "上传取消了",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
 "Invalid name, '/' is not allowed." => "非法文件名,\"/\"是不被许可的",
+"{count} files scanned" => "{count} 个文件已扫描",
 "error while scanning" => "扫描出错",
 "Name" => "名字",
 "Size" => "大小",
 "Modified" => "修改日期",
+"1 folder" => "1 个文件夹",
+"{count} folders" => "{count} 个文件夹",
+"1 file" => "1 个文件",
+"{count} files" => "{count} 个文件",
 "File handling" => "文件处理中",
 "Maximum upload size" => "最大上传大小",
 "max. possible: " => "最大可能",
@@ -37,6 +49,7 @@
 "New" => "新建",
 "Text file" => "文本文档",
 "Folder" => "文件夹",
+"From link" => "来自链接",
 "Upload" => "上传",
 "Cancel upload" => "取消上传",
 "Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index df51cfbe4c4..12975abdcf6 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -22,6 +22,7 @@
 "generating ZIP-file, it may take some time." => "正在生成 ZIP 文件，可能需要一些时间",
 "Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件，因为它是一个目录或者大小为 0 字节",
 "Upload Error" => "上传错误",
+"Close" => "关闭",
 "Pending" => "操作等待中",
 "1 file uploading" => "1个文件上传中",
 "{count} files uploading" => "{count} 个文件上传中",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 1146857eb10..12910078faf 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -15,6 +15,7 @@
 "generating ZIP-file, it may take some time." => "產生壓縮檔, 它可能需要一段時間.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0",
 "Upload Error" => "上傳發生錯誤",
+"Close" => "關閉",
 "Upload cancelled." => "上傳取消",
 "File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中. 離開此頁面將會取消上傳.",
 "Invalid name, '/' is not allowed." => "無效的名稱, '/'是不被允許的",
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index e2640c1113c..725390d4505 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -58,7 +58,7 @@
 			<th id="headerSize"><?php echo $l->t( 'Size' ); ?></th>
 			<th id="headerDate">
 				<span id="modified"><?php echo $l->t( 'Modified' ); ?></span>
-				<?php if ($_['permissions'] & OCP\Share::PERMISSION_DELETE): ?>
+				<?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
 <!-- 					NOTE: Temporary fix to allow unsharing of files in root of Shared folder -->
 					<?php if ($_['dir'] == '/Shared'): ?>
 						<span class="selectedActions"><a href="" class="delete"><?php echo $l->t('Unshare')?> <img class="svg" alt="<?php echo $l->t('Unshare')?>" src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" /></a></span>