merge master into filesystem

31 files changed, 359 insertions, 59 deletions

diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 0ab7e7674c6..1713bcc22ce 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -27,7 +27,7 @@ $RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging');
 
 OC_App::loadApps($RUNTIME_APPTYPES);
 
-ob_end_clean();
+OC_Util::obEnd();
 
 // Backends
 $authBackend = new OC_Connector_Sabre_Auth();
diff --git a/apps/files/download.php b/apps/files/download.php
index 8b9aac5fd6e..dd356b27e9b 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -44,5 +44,5 @@ header('Content-Disposition: attachment; filename="'.basename($filename).'"');
 OCP\Response::disableCaching();
 header('Content-Length: '.\OC\Files\Filesystem::filesize($filename));
 
-@ob_end_clean();
+OC_Util::obEnd();
 \OC\Files\Filesystem::readfile( $filename );
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 3b33fc19780..7c6d4fd3ee5 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -722,7 +722,7 @@ function updateBreadcrumb(breadcrumbHtml) {
 
 //options for file drag/dropp
 var dragOptions={
-	distance: 20, revert: 'invalid', opacity: 0.7,
+	distance: 20, revert: 'invalid', opacity: 0.7, helper: 'clone',
 	stop: function(event, ui) {
 		$('#fileList tr td.filename').addClass('ui-draggable');
 	}
@@ -856,7 +856,7 @@ function getMimeIcon(mime, ready){
 	if(getMimeIcon.cache[mime]){
 		ready(getMimeIcon.cache[mime]);
 	}else{
-		$.get( OC.filePath('files','ajax','mimeicon.php')+'?mime='+mime, function(path){
+		$.get( OC.filePath('files','ajax','mimeicon.php')+'&mime='+mime, function(path){
 			getMimeIcon.cache[mime]=path;
 			ready(getMimeIcon.cache[mime]);
 		});
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index a2d5bddbfc2..de72d3f46fd 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}",
 "unshared {files}" => "no compartits {files}",
 "deleted {files}" => "eliminats {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
 "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",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 4abfc8c432c..88c1e792ae6 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
 "unshared {files}" => "Freigabe von {files} aufgehoben",
 "deleted {files}" => "{files} gelöscht",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
 "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",
@@ -28,6 +29,7 @@
 "{count} files uploading" => "{count} Dateien werden hochgeladen",
 "Upload cancelled." => "Upload abgebrochen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
 "{count} files scanned" => "{count} Dateien wurden gescannt",
 "error while scanning" => "Fehler beim Scannen",
 "Name" => "Name",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 7ba7600a0d7..427380e5a21 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
 "unshared {files}" => "Freigabe für {files} beendet",
 "deleted {files}" => "{files} gelöscht",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
 "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",
@@ -28,6 +29,7 @@
 "{count} files uploading" => "{count} Dateien wurden hochgeladen",
 "Upload cancelled." => "Upload abgebrochen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
 "{count} files scanned" => "{count} Dateien wurden gescannt",
 "error while scanning" => "Fehler beim Scannen",
 "Name" => "Name",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index a7da6e04a73..3f2a44c0343 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}",
 "unshared {files}" => "μη διαμοιρασμένα {files}",
 "deleted {files}" => "διαγραμμένα {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.",
 "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" => "Σφάλμα Αποστολής",
@@ -28,6 +29,7 @@
 "{count} files uploading" => "{count} αρχεία ανεβαίνουν",
 "Upload cancelled." => "Η αποστολή ακυρώθηκε.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη.  Έξοδος από την σελίδα τώρα θα ακυρώσει την αποστολή.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του \"Shared\" είναι δεσμευμένη από το Owncloud",
 "{count} files scanned" => "{count} αρχεία ανιχνεύτηκαν",
 "error while scanning" => "σφάλμα κατά την ανίχνευση",
 "Name" => "Όνομα",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index dddb58e9cb5..062ae33fb66 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -7,25 +7,38 @@
 "Missing a temporary folder" => "Aldi baterako karpeta falta da",
 "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
 "Files" => "Fitxategiak",
-"Unshare" => "Ez partekatu",
+"Unshare" => "Ez elkarbanatu",
 "Delete" => "Ezabatu",
 "Rename" => "Berrizendatu",
+"{new_name} already exists" => "{new_name} dagoeneko existitzen da",
 "replace" => "ordeztu",
 "suggest name" => "aholkatu izena",
 "cancel" => "ezeztatu",
+"replaced {new_name}" => "ordezkatua {new_name}",
 "undo" => "desegin",
+"replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
+"unshared {files}" => "elkarbanaketa utzita {files}",
+"deleted {files}" => "ezabatuta {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
 "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",
+"{count} files uploading" => "{count} fitxategi igotzen",
 "Upload cancelled." => "Igoera ezeztatuta",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Karpeta izen baliogabea. \"Shared\" karpetaren erabilera Owncloudek erreserbatuta dauka",
+"{count} files scanned" => "{count} fitxategi eskaneatuta",
 "error while scanning" => "errore bat egon da eskaneatzen zen bitartean",
 "Name" => "Izena",
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
+"1 folder" => "karpeta bat",
+"{count} folders" => "{count} karpeta",
+"1 file" => "fitxategi bat",
+"{count} files" => "{count} fitxategi",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
 "max. possible: " => "max, posiblea:",
@@ -37,6 +50,7 @@
 "New" => "Berria",
 "Text file" => "Testu fitxategia",
 "Folder" => "Karpeta",
+"From link" => "Estekatik",
 "Upload" => "Igo",
 "Cancel upload" => "Ezeztatu igoera",
 "Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 781cfaca3c8..cbc0fe45ff3 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -15,6 +15,7 @@
 "suggest name" => "ehdota nimeä",
 "cancel" => "peru",
 "undo" => "kumoa",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.",
 "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.",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 5170272c45a..97643c63632 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
 "unshared {files}" => "Fichiers non partagés : {files}",
 "deleted {files}" => "Fichiers supprimés : {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
 "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",
@@ -28,6 +29,7 @@
 "{count} files uploading" => "{count} fichiers téléversés",
 "Upload cancelled." => "Chargement annulé.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nom de répertoire invalide. \"Shared\" est réservé par ownCloud",
 "{count} files scanned" => "{count} fichiers indexés",
 "error while scanning" => "erreur lors de l'indexation",
 "Name" => "Nom",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 50df005091f..9c0c202d73c 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
 "unshared {files}" => "未共有 {files}",
 "deleted {files}" => "削除 {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
 "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" => "アップロードエラー",
@@ -28,6 +29,7 @@
 "{count} files uploading" => "{count} ファイルをアップロード中",
 "Upload cancelled." => "アップロードはキャンセルされました。",
 "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "無効なフォルダ名です。\"Shared\" の利用は ownCloud が予約済みです。",
 "{count} files scanned" => "{count} ファイルをスキャン",
 "error while scanning" => "スキャン中のエラー",
 "Name" => "名前",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 80b3551181e..860ccba2eee 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "zastąpiony {new_name} z {old_name}",
 "unshared {files}" => "Udostępniane wstrzymane {files}",
 "deleted {files}" => "usunięto {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Niepoprawna nazwa, Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*'są niedozwolone.",
 "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",
@@ -28,6 +29,7 @@
 "{count} files uploading" => "{count} przesyłanie plików",
 "Upload cancelled." => "Wczytywanie anulowane.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Błędna nazwa folderu. Nazwa \"Shared\" jest zarezerwowana dla Owncloud",
 "{count} files scanned" => "{count} pliki skanowane",
 "error while scanning" => "Wystąpił błąd podczas skanowania",
 "Name" => "Nazwa",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 6961c538b4d..3413fa691b4 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
 "unshared {files}" => "не опубликованные {files}",
 "deleted {files}" => "удаленные {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.",
 "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" => "Ошибка загрузки",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 59021ea99ad..018dfa8f7a3 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "заменено {новое_имя} с {старое_имя}",
 "unshared {files}" => "Cовместное использование прекращено {файлы}",
 "deleted {files}" => "удалено {файлы}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы.",
 "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" => "Ошибка загрузки",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index dbac36b9a94..4b5cbe9ed4e 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
 "unshared {files}" => "stoppad delning {files}",
 "deleted {files}" => "raderade {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
 "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",
@@ -28,6 +29,7 @@
 "{count} files uploading" => "{count} filer laddas upp",
 "Upload cancelled." => "Uppladdning avbruten.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ogiltigt mappnamn. Ordet \"Delad\" är reserverat av ownCloud.",
 "{count} files scanned" => "{count} filer skannade",
 "error while scanning" => "fel vid skanning",
 "Name" => "Namn",
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index 0bd4b173c04..d9b6b021be3 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது",
 "unshared {files}" => "பகிரப்படாதது  {கோப்புகள்}",
 "deleted {files}" => "நீக்கப்பட்டது  {கோப்புகள்}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
 "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" => "பதிவேற்றல் வழு",
@@ -28,6 +29,7 @@
 "{count} files uploading" => "{எண்ணிக்கை} கோப்புகள் பதிவேற்றப்படுகின்றது",
 "Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
 "File upload is in progress. Leaving the page now will cancel the upload." => "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "செல்லுபடியற்ற கோப்புறை பெயர். \"பகிர்வின்\" பாவனை Owncloud இனால் ஒதுக்கப்பட்டுள்ளது",
 "{count} files scanned" => "{எண்ணிக்கை} கோப்புகள் வருடப்பட்டது",
 "error while scanning" => "வருடும் போதான வழு",
 "Name" => "பெயர்",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 4bd7abfffef..ea1aa90d518 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว",
 "unshared {files}" => "ยกเลิกการแชร์แล้ว {files} ไฟล์",
 "deleted {files}" => "ลบไฟล์แล้ว {files} ไฟล์",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้",
 "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" => "เกิดข้อผิดพลาดในการอัพโหลด",
@@ -28,6 +29,7 @@
 "{count} files uploading" => "กำลังอัพโหลด {count} ไฟล์",
 "Upload cancelled." => "การอัพโหลดถูกยกเลิก",
 "File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "ชื่อโฟลเดอร์ที่ใช้ไม่ถูกต้อง การใช้งาน \"ถูกแชร์\" ถูกสงวนไว้เฉพาะ Owncloud เท่านั้น",
 "{count} files scanned" => "สแกนไฟล์แล้ว {count} ไฟล์",
 "error while scanning" => "พบข้อผิดพลาดในระหว่างการสแกนไฟล์",
 "Name" => "ชื่อ",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index ac826d27cb5..4eb130736c6 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -17,7 +17,9 @@
 "replaced {new_name}" => "замінено {new_name}",
 "undo" => "відмінити",
 "replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}",
+"unshared {files}" => "неопубліковано {files}",
 "deleted {files}" => "видалено {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
 "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" => "Помилка завантаження",
@@ -27,6 +29,7 @@
 "{count} files uploading" => "{count} файлів завантажується",
 "Upload cancelled." => "Завантаження перервано.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Невірне ім'я каталогу. Використання \"Shared\" зарезервовано Owncloud",
 "{count} files scanned" => "{count} файлів проскановано",
 "error while scanning" => "помилка при скануванні",
 "Name" => "Ім'я",
@@ -36,8 +39,10 @@
 "{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" => "Активувати ZIP-завантаження",
 "0 is unlimited" => "0 є безліміт",
 "Maximum input size for ZIP files" => "Максимальний розмір завантажуємого ZIP файлу",
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index 9140a24f2f3..047caae39f6 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "đã thay thế {new_name} bằng {old_name}",
 "unshared {files}" => "hủy chia sẽ {files}",
 "deleted {files}" => "đã xóa {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.",
 "generating ZIP-file, it may take some time." => "Tạo tập tin ZIP, điều này có thể làm mất một chú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",
@@ -28,6 +29,7 @@
 "{count} files uploading" => "{count} tập tin đang tải lên",
 "Upload cancelled." => "Hủy tải lên",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Tên thư mục không hợp lệ. Sử dụng \"Chia sẻ\" được dành riêng bởi Owncloud",
 "{count} files scanned" => "{count} tập tin đã được quét",
 "error while scanning" => "lỗi trong khi quét",
 "Name" => "Tên",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index fd3d1b60997..b5a02267415 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -10,17 +10,29 @@
 "Unshare" => "取消共享",
 "Delete" => "刪除",
 "Rename" => "重新命名",
+"{new_name} already exists" => "{new_name} 已經存在",
 "replace" => "取代",
 "cancel" => "取消",
+"replaced {new_name}" => "已取代 {new_name}",
+"undo" => "復原",
+"replaced {new_name} with {old_name}" => "使用 {new_name} 取代 {old_name}",
 "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" => "關閉",
+"1 file uploading" => "1 個檔案正在上傳",
+"{count} files uploading" => "{count} 個檔案正在上傳",
 "Upload cancelled." => "上傳取消",
 "File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中. 離開此頁面將會取消上傳.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "無效的資料夾名稱. \"Shared\" 名稱已被 Owncloud 所保留使用",
+"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: " => "最大允許: ",
diff --git a/apps/files_external/l10n/ta_LK.php b/apps/files_external/l10n/ta_LK.php
new file mode 100644
index 00000000000..1e01b22efa0
--- /dev/null
+++ b/apps/files_external/l10n/ta_LK.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Access granted" => "அனுமதி வழங்கப்பட்டது",
+"Error configuring Dropbox storage" => "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
+"Grant access" => "அனுமதியை வழங்கல்",
+"Fill out all required fields" => "தேவையான எல்லா புலங்களையும் நிரப்புக",
+"Please provide a valid Dropbox app key and secret." => "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. ",
+"Error configuring Google Drive storage" => "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு",
+"External Storage" => "வெளி சேமிப்பு",
+"Mount point" => "ஏற்றப்புள்ளி",
+"Backend" => "பின்நிலை",
+"Configuration" => "தகவமைப்பு",
+"Options" => "தெரிவுகள்",
+"Applicable" => "பயன்படத்தக்க",
+"Add mount point" => "ஏற்றப்புள்ளியை சேர்க்க",
+"None set" => "தொகுப்பில்லா",
+"All Users" => "பயனாளர்கள் எல்லாம்",
+"Groups" => "குழுக்கள்",
+"Users" => "பயனாளர்",
+"Delete" => "நீக்குக",
+"Enable User External Storage" => "பயனாளர் வெளி சேமிப்பை இயலுமைப்படுத்துக",
+"Allow users to mount their own external storage" => "பயனாளர் அவர்களுடைய சொந்த வெளியக சேமிப்பை ஏற்ற அனுமதிக்க",
+"SSL root certificates" => "SSL வேர் சான்றிதழ்கள்",
+"Import Root Certificate" => "வேர் சான்றிதழை இறக்குமதி செய்க"
+);
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
index ea8f2b26657..478342380e3 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -10,6 +10,7 @@
 "Backend" => "Backend",
 "Configuration" => "Налаштування",
 "Options" => "Опції",
+"Applicable" => "Придатний",
 "Add mount point" => "Додати точку монтування",
 "None set" => "Не встановлено",
 "All Users" => "Усі користувачі",
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
new file mode 100644
index 00000000000..ab8c4caf24a
--- /dev/null
+++ b/apps/files_external/l10n/zh_TW.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "外部儲存裝置",
+"Mount point" => "掛載點",
+"None set" => "尚未設定",
+"All Users" => "所有使用者",
+"Groups" => "群組",
+"Users" => "使用者",
+"Delete" => "刪除",
+"Import Root Certificate" => "匯入根憑證"
+);
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index 27fa634c03d..fa4f8075c6e 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Password" => "密碼",
 "Submit" => "送出",
+"%s shared the folder %s with you" => "%s 分享了資料夾 %s 給您",
+"%s shared the file %s with you" => "%s 分享了檔案 %s 給您",
 "Download" => "下載",
 "No preview available for" => "無法預覽"
 );
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index edb8e011459..fcf7063955e 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -20,7 +20,6 @@ if (isset($_GET['token'])) {
 		\OCP\Util::writeLog('files_sharing', 'You have files that are shared by link originating from ownCloud 4.0. Redistribute the new links, because backwards compatibility will be removed in ownCloud 5.', \OCP\Util::WARN);
 	}
 }
-// Enf of backward compatibility
 
 function getID($path) {
 	// use the share table from the db to find the item source if the file was reshared because shared files
@@ -29,7 +28,7 @@ function getID($path) {
 		$path_parts = explode('/', $path, 5);
 		$user = $path_parts[1];
 		$intPath = '/'.$path_parts[4];
-		$query = \OC_DB::prepare('SELECT item_source FROM *PREFIX*share WHERE uid_owner = ? AND file_target = ? ');
+		$query = \OC_DB::prepare('SELECT `item_source` FROM `*PREFIX*share` WHERE `uid_owner` = ? AND `file_target` = ? ');
 		$result = $query->execute(array($user, $intPath));
 		$row = $result->fetchRow();
 		$fileSource = $row['item_source'];
@@ -41,8 +40,51 @@ function getID($path) {
 
 	return $fileSource;
 }
+// Enf of backward compatibility
+
+/**
+ * lookup file path and owner by fetching it from the fscache
+ * needed becaus OC_FileCache::getPath($id, $user) already requires the user
+ * @param int $id
+ * @return array
+ */
+function getPathAndUser($id) {
+	$query = \OC_DB::prepare('SELECT `user`, `path` FROM `*PREFIX*fscache` WHERE `id` = ?');
+	$result = $query->execute(array($id));
+	$row = $result->fetchRow();
+	return $row;
+}
 
-if (isset($_GET['file']) || isset($_GET['dir'])) {
+
+if (isset($_GET['t'])) {
+	$token = $_GET['t'];
+	$linkItem = OCP\Share::getShareByToken($token);
+	if (is_array($linkItem) && isset($linkItem['uid_owner'])) {
+		// seems to be a valid share
+		$type = $linkItem['item_type'];
+		$fileSource = $linkItem['file_source'];
+		$shareOwner = $linkItem['uid_owner'];
+		
+		if (OCP\User::userExists($shareOwner) && $fileSource != -1 ) {
+			
+			$pathAndUser = getPathAndUser($linkItem['file_source']);
+			$fileOwner = $pathAndUser['user'];
+			
+			//if this is a reshare check the file owner also exists
+			if ($shareOwner != $fileOwner && ! OCP\User::userExists($fileOwner)) {
+					OCP\Util::writeLog('share', 'original file owner '.$fileOwner.' does not exist for share '.$linkItem['id'], \OCP\Util::ERROR);
+					header('HTTP/1.0 404 Not Found');
+					$tmpl = new OCP\Template('', '404', 'guest');
+					$tmpl->printPage();
+					exit();
+			}
+			
+			//mount filesystem of file owner
+			OC_Util::setupFS($fileOwner);
+		}
+	}
+} else if (isset($_GET['file']) || isset($_GET['dir'])) {
+	OCP\Util::writeLog('share', 'Missing token, trying fallback file/dir links', \OCP\Util::DEBUG);
 	if (isset($_GET['dir'])) {
 		$type = 'folder';
 		$path = $_GET['dir'];
@@ -58,49 +100,146 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
 			$path=substr($path, 0, -1);
 		}
 	}
-	$uidOwner = substr($path, 1, strpos($path, '/', 1) - 1);
-	if (OCP\User::userExists($uidOwner)) {
-		OC_Util::setupFS($uidOwner);
+	$shareOwner = substr($path, 1, strpos($path, '/', 1) - 1);
+	
+	if (OCP\User::userExists($shareOwner)) {
+		OC_Util::setupFS($shareOwner);
 		$fileSource = getId($path);
-		if ($fileSource != -1 && ($linkItem = OCP\Share::getItemSharedWithByLink($type, $fileSource, $uidOwner))) {
-			// TODO Fix in the getItems
-			if (!isset($linkItem['item_type']) || $linkItem['item_type'] != $type) {
+		if ($fileSource != -1 ) {
+			$linkItem = OCP\Share::getItemSharedWithByLink($type, $fileSource, $shareOwner);
+			$pathAndUser['path'] = $path;
+			$path_parts = explode('/', $path, 5);
+			$pathAndUser['user'] = $path_parts[1];
+			$fileOwner = $path_parts[1];
+		}
+	}
+}
+
+if ($linkItem) {
+	if (!isset($linkItem['item_type'])) {
+		OCP\Util::writeLog('share', 'No item type set for share id: '.$linkItem['id'], \OCP\Util::ERROR);
+		header('HTTP/1.0 404 Not Found');
+		$tmpl = new OCP\Template('', '404', 'guest');
+		$tmpl->printPage();
+		exit();
+	}
+	if (isset($linkItem['share_with'])) {
+		// Authenticate share_with
+		$url = OCP\Util::linkToPublic('files').'&t='.$token;
+		if (isset($_GET['file'])) {
+			$url .= '&file='.urlencode($_GET['file']);
+		} else if (isset($_GET['dir'])) {
+			$url .= '&dir='.urlencode($_GET['dir']);
+		}
+		if (isset($_POST['password'])) {
+			$password = $_POST['password'];
+			if ($linkItem['share_type'] == OCP\Share::SHARE_TYPE_LINK) {
+				// Check Password
+				$forcePortable = (CRYPT_BLOWFISH != 1);
+				$hasher = new PasswordHash(8, $forcePortable);
+				if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $linkItem['share_with']))) {
+					$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
+					$tmpl->assign('URL', $url);
+					$tmpl->assign('error', true);
+					$tmpl->printPage();
+					exit();
+				} else {
+					// Save item id in session for future requests
+					$_SESSION['public_link_authenticated'] = $linkItem['id'];
+				}
+			} else {
+				OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type'].' for share id '.$linkItem['id'], \OCP\Util::ERROR);
 				header('HTTP/1.0 404 Not Found');
 				$tmpl = new OCP\Template('', '404', 'guest');
 				$tmpl->printPage();
 				exit();
 			}
-			if (isset($linkItem['share_with'])) {
-				// Check password
-				if (isset($_GET['file'])) {
-					$url = OCP\Util::linkToPublic('files').'&file='.urlencode($_GET['file']);
-				} else {
-					$url = OCP\Util::linkToPublic('files').'&dir='.urlencode($_GET['dir']);
+		// Check if item id is set in session
+		} else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) {
+			// Prompt for password
+			$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
+			$tmpl->assign('URL', $url);
+			$tmpl->printPage();
+			exit();
+		}
+	}
+	$basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files'));
+	$path = $basePath;
+	if (isset($_GET['path'])) {
+		$path .= $_GET['path'];
+	}
+	if (!$path || !OC_Filesystem::isValidPath($path) || !OC_Filesystem::file_exists($path)) {
+		OCP\Util::writeLog('share', 'Invalid path '.$path.' for share id '.$linkItem['id'], \OCP\Util::ERROR);
+		header('HTTP/1.0 404 Not Found');
+		$tmpl = new OCP\Template('', '404', 'guest');
+		$tmpl->printPage();
+		exit();
+	}
+	$dir = dirname($path);
+	$file = basename($path);
+	// Download the file
+	if (isset($_GET['download'])) {
+		if (isset($_GET['path']) && $_GET['path'] !== '' ) {
+			if ( isset($_GET['files']) ) { // download selected files
+				OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+			} else if (isset($_GET['path']) && $_GET['path'] != '' ) { // download a file from a shared directory
+				OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+			} else { // download the whole shared directory
+				OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+			}
+		} else { // download a single shared file
+			OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+		}
+
+	} else {
+		OCP\Util::addStyle('files_sharing', 'public');
+		OCP\Util::addScript('files_sharing', 'public');
+		OCP\Util::addScript('files', 'fileactions');
+		$tmpl = new OCP\Template('files_sharing', 'public', 'base');
+		$tmpl->assign('uidOwner', $shareOwner);
+		$tmpl->assign('dir', $dir);
+		$tmpl->assign('filename', $file);
+		$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
+		if (isset($_GET['path'])) {
+			$getPath = $_GET['path'];
+		} else {
+			$getPath = '';
+		}
+		//
+		$urlLinkIdentifiers= (isset($token)?'&t='.$token:'').(isset($_GET['dir'])?'&dir='.$_GET['dir']:'').(isset($_GET['file'])?'&file='.$_GET['file']:'');
+		// Show file list
+		if (OC_Filesystem::is_dir($path)) {
+			OCP\Util::addStyle('files', 'files');
+			OCP\Util::addScript('files', 'files');
+			OCP\Util::addScript('files', 'filelist');
+			$files = array();
+			$rootLength = strlen($basePath) + 1;
+			foreach (OC_Files::getDirectoryContent($path) as $i) {
+				$i['date'] = OCP\Util::formatDate($i['mtime']);
+				if ($i['type'] == 'file') {
+					$fileinfo = pathinfo($i['name']);
+					$i['basename'] = $fileinfo['filename'];
+					$i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
 				}
-				if (isset($_POST['password'])) {
-					$password = $_POST['password'];
-					$storedHash = $linkItem['share_with'];
-					$forcePortable = (CRYPT_BLOWFISH != 1);
-					$hasher = new PasswordHash(8, $forcePortable);
-					if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash))) {
-						$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
-						$tmpl->assign('URL', $url);
-						$tmpl->assign('error', true);
-						$tmpl->printPage();
-						exit();
-					} else {
-						// Save item id in session for future requests
-						$_SESSION['public_link_authenticated'] = $linkItem['id'];
-					}
-				// Check if item id is set in session
-				} else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) {
-					// Prompt for password
-					$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
-					$tmpl->assign('URL', $url);
-					$tmpl->printPage();
-					exit();
+				$i['directory'] = '/'.substr($i['directory'], $rootLength);
+				if ($i['directory'] == '/') {
+					$i['directory'] = '';
 				}
+				$i['permissions'] = OCP\PERMISSION_READ;
+				$files[] = $i;
 			}
+			// Make breadcrumb
+			$breadcrumb = array();
+			$pathtohere = '';
+
+			//add base breadcrumb
+			$breadcrumb[] = array('dir' => '/', 'name' => basename($basePath));
+
+			//add subdir breadcrumbs
+			foreach (explode('/', urldecode($_GET['path'])) as $i) {
+				if ($i != '') {
+					$pathtohere .= '/'.$i;
+					$breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
 			$path = $linkItem['path'];
 			if (isset($_GET['path'])) {
 				$path .= $_GET['path'];
@@ -112,20 +251,31 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
 					exit();
 				}
 			}
-			// Download the file
-			if (isset($_GET['download'])) {
-				if (isset($_GET['dir'])) {
-					if ( isset($_GET['files']) ) { // download selected files
-						OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-					} else 	if (isset($_GET['path']) &&  $_GET['path'] != '' ) { // download a file from a shared directory
-						OC_Files::get('', $path, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-					} else { // download the whole shared directory
-						OC_Files::get($path, '', $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-					}
-				} else { // download a single shared file
-					OC_Files::get("", $path, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
-				}
 
+			$list = new OCP\Template('files', 'part.list', '');
+			$list->assign('files', $files, false);
+			$list->assign('publicListView', true);
+			$list->assign('baseURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&path=', false);
+			$list->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download&path=', false);
+			$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' );
+			$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
+			$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&path=', false);
+			$folder = new OCP\Template('files', 'index', '');
+			$folder->assign('fileList', $list->fetchPage(), false);
+			$folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
+			$folder->assign('isCreatable', false);
+			$folder->assign('permissions', 0);
+			$folder->assign('files', $files);
+			$folder->assign('uploadMaxFilesize', 0);
+			$folder->assign('uploadMaxHumanFilesize', 0);
+			$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+			$tmpl->assign('folder', $folder->fetchPage(), false);
+			$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+			$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download&path='.urlencode($getPath));
+		} else {
+			// Show file preview if viewer is available
+			if ($type == 'file') {
+				$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download');
 			} else {
 				OCP\Util::addStyle('files_sharing', 'public');
 				OCP\Util::addScript('files_sharing', 'public');
@@ -133,7 +283,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
 				$tmpl = new OCP\Template('files_sharing', 'public', 'base');
 				$tmpl->assign('owner', $uidOwner);
 				// Show file list
-				if (\OC\Files\Filesystem::is_dir($path)) {
+				if (OC_Filesystem::is_dir($path)) {
 					OCP\Util::addStyle('files', 'files');
 					OCP\Util::addScript('files', 'files');
 					OCP\Util::addScript('files', 'filelist');
@@ -190,7 +340,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
 					$tmpl->assign('uidOwner', $uidOwner);
 					$tmpl->assign('dir', basename($dir));
 					$tmpl->assign('filename', basename($path));
-					$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
+					$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
 					$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 					if (isset($_GET['path'])) {
 						$getPath = $_GET['path'];
@@ -203,7 +353,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
 					$tmpl->assign('uidOwner', $uidOwner);
 					$tmpl->assign('dir', dirname($path));
 					$tmpl->assign('filename', basename($path));
-					$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
+					$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
 					if ($type == 'file') {
 						$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&file='.urlencode($_GET['file']).'&download', false);
 					} else {
@@ -217,9 +367,12 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
 				}
 				$tmpl->printPage();
 			}
-			exit();
 		}
+		$tmpl->printPage();
 	}
+	exit();
+} else {
+	OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG);
 }
 header('HTTP/1.0 404 Not Found');
 $tmpl = new OCP\Template('', '404', 'guest');
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
new file mode 100644
index 00000000000..a21fdc85f8d
--- /dev/null
+++ b/apps/files_versions/l10n/zh_TW.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "所有逾期的版本",
+"History" => "歷史",
+"Versions" => "版本",
+"Files Versioning" => "檔案版本化中...",
+"Enable" => "啟用"
+);
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index fd6a88d2372..1bbd24f679b 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -1,4 +1,37 @@
 <?php $TRANSLATIONS = array(
+"Host" => "Хост",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
+"Base DN" => "Базовий DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково",
+"User DN" => "DN Користувача",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми.",
 "Password" => "Пароль",
+"For anonymous access, leave DN and Password empty." => "Для анонімного доступу, залиште DN і Пароль порожніми.",
+"User Login Filter" => "Фільтр Користувачів, що під'єднуються",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\"",
+"User List Filter" => "Фільтр Списку Користувачів",
+"Defines the filter to apply, when retrieving users." => "Визначає фільтр, який застосовується при отриманні користувачів",
+"without any placeholder, e.g. \"objectClass=person\"." => "без будь-якого заповнювача, наприклад: \"objectClass=person\".",
+"Group Filter" => "Фільтр Груп",
+"Defines the filter to apply, when retrieving groups." => "Визначає фільтр, який застосовується при отриманні груп.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\".",
+"Port" => "Порт",
+"Base User Tree" => "Основне Дерево Користувачів",
+"Base Group Tree" => "Основне Дерево Груп",
+"Group-Member association" => "Асоціація Група-Член",
+"Use TLS" => "Використовуйте TLS",
+"Do not use it for SSL connections, it will fail." => "Не використовуйте його для SSL з'єднань, це не буде виконано.",
+"Case insensitve LDAP server (Windows)" => "Нечутливий до регістру LDAP сервер (Windows)",
+"Turn off SSL certificate validation." => "Вимкнути перевірку SSL сертифіката.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер.",
+"Not recommended, use for testing only." => "Не рекомендується, використовуйте лише для тестів.",
+"User Display Name Field" => "Поле, яке відображає Ім'я Користувача",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud.",
+"Group Display Name Field" => "Поле, яке відображає Ім'я Групи",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP, який використовується для генерації імен груп ownCloud.",
+"in bytes" => "в байтах",
+"in seconds. A change empties the cache." => "в секундах. Зміна очищує кеш.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.",
 "Help" => "Допомога"
 );
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
new file mode 100644
index 00000000000..abc1b03d49d
--- /dev/null
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Password" => "密碼",
+"Use TLS" => "使用TLS",
+"Turn off SSL certificate validation." => "關閉 SSL 憑證驗證",
+"Help" => "說明"
+);
diff --git a/apps/user_webdavauth/l10n/eu.php b/apps/user_webdavauth/l10n/eu.php
new file mode 100644
index 00000000000..9bd32954b05
--- /dev/null
+++ b/apps/user_webdavauth/l10n/eu.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"WebDAV URL: http://" => "WebDAV URL: http://"
+);
diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php
new file mode 100644
index 00000000000..759d45b230e
--- /dev/null
+++ b/apps/user_webdavauth/l10n/fr.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"WebDAV URL: http://" => "URL WebDAV : http://"
+);
diff --git a/apps/user_webdavauth/l10n/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php
new file mode 100644
index 00000000000..79740561e5a
--- /dev/null
+++ b/apps/user_webdavauth/l10n/zh_TW.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"WebDAV URL: http://" => "WebDAV 網址 http://"
+);