Merge branch 'master' into routing

Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php

32 files changed, 503 insertions, 74 deletions

diff --git a/apps/files/admin.php b/apps/files/admin.php
index a8f2deffc92..e8b3cb0aca0 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -30,8 +30,11 @@ OCP\User::checkAdminUser();
 $htaccessWorking=(getenv('htaccessWorking')=='true');
 
 $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
+$upload_max_filesize_possible = OCP\Util::computerFileSize(get_cfg_var('upload_max_filesize'));
 $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
+$post_max_size_possible = OCP\Util::computerFileSize(get_cfg_var('post_max_size'));
 $maxUploadFilesize = OCP\Util::humanFileSize(min($upload_max_filesize, $post_max_size));
+$maxUploadFilesizePossible = OCP\Util::humanFileSize(min($upload_max_filesize_possible, $post_max_size_possible));
 if($_POST) {
 	if(isset($_POST['maxUploadSize'])) {
 		if(($setMaxSize = OC_Files::setUploadLimit(OCP\Util::computerFileSize($_POST['maxUploadSize']))) !== false) {
@@ -56,7 +59,7 @@ $htaccessWritable=is_writable(OC::$SERVERROOT.'/.htaccess');
 $tmpl = new OCP\Template( 'files', 'admin' );
 $tmpl->assign( 'uploadChangable', $htaccessWorking and $htaccessWritable );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
-$tmpl->assign( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX));
+$tmpl->assign( 'maxPossibleUploadSize', $maxUploadFilesizePossible);
 $tmpl->assign( 'allowZipDownload', $allowZipDownload);
 $tmpl->assign( 'maxZipInputSize', $maxZipInputSize);
-return $tmpl->fetchPage();
\ No newline at end of file
+return $tmpl->fetchPage();
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index c2d65d718c5..77d866979c3 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -8,12 +8,11 @@ if(!OC_User::isLoggedIn()) {
 }
 
 session_write_close();
-
 // Get the params
-$dir = isset( $_REQUEST['dir'] ) ? stripslashes($_REQUEST['dir']) : '';
-$filename = isset( $_REQUEST['filename'] ) ? stripslashes($_REQUEST['filename']) : '';
+$dir = isset( $_REQUEST['dir'] ) ? trim($_REQUEST['dir'], '/\\') : '';
+$filename = isset( $_REQUEST['filename'] ) ? trim($_REQUEST['filename'], '/\\') : '';
 $content = isset( $_REQUEST['content'] ) ? $_REQUEST['content'] : '';
-$source = isset( $_REQUEST['source'] ) ? stripslashes($_REQUEST['source']) : '';
+$source = isset( $_REQUEST['source'] ) ? trim($_REQUEST['source'], '/\\') : '';
 
 if($source) {
 	$eventSource=new OC_EventSource();
diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index 34c2d0ca145..0f1f2f14eb0 100644
--- a/apps/files/ajax/newfolder.php
+++ b/apps/files/ajax/newfolder.php
@@ -20,7 +20,13 @@ if(strpos($foldername, '/')!==false) {
 }
 
 if(OC_Files::newFile($dir, stripslashes($foldername), 'dir')) {
-	OCP\JSON::success(array("data" => array()));
+	if ( $dir != '/') {
+		$path = $dir.'/'.$foldername;
+	} else {
+		$path = '/'.$foldername;
+	}
+	$id = OC_FileCache::getId($path);
+	OCP\JSON::success(array("data" => array('id'=>$id)));
 	exit();
 }
 
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index e58f83c5a01..0a1b196b06f 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<description>File Management</description>
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
-	<require>4</require>
+	<require>4.9</require>
 	<shipped>true</shipped>
 	<standalone/>
 	<default_enable/>
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index d963b754772..bcbbc6035fa 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -1,16 +1,16 @@
 <?php
 
-// fix webdav properties,add namespace in front of the property, update for OC4.5

-$installedVersion=OCP\Config::getAppValue('files', 'installed_version');

-if (version_compare($installedVersion, '1.1.6', '<')) {

-	$query = OC_DB::prepare( "SELECT propertyname, propertypath, userid FROM `*PREFIX*properties`" );

-	$result = $query->execute();

+// fix webdav properties,add namespace in front of the property, update for OC4.5
+$installedVersion=OCP\Config::getAppValue('files', 'installed_version');
+if (version_compare($installedVersion, '1.1.6', '<')) {
+	$query = OC_DB::prepare( "SELECT `propertyname`, `propertypath`, `userid` FROM `*PREFIX*properties`" );
+	$result = $query->execute();
 	while( $row = $result->fetchRow()){
-		if ( $row["propertyname"][0] != '{' ) {

-			$query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertyname = ? WHERE userid = ? AND propertypath = ?' );

+		if ( $row["propertyname"][0] != '{' ) {
+			$query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertyname` = ? WHERE `userid` = ? AND `propertypath` = ?' );
 			$query->execute( array( '{DAV:}' + $row["propertyname"], $row["userid"], $row["propertypath"] ));
-		}

-	}

+		}
+	}
 }
 
 //update from OC 3
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index db8b8ff57ba..14482c5edb5 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -10,7 +10,7 @@
 .file_upload_form, #file_newfolder_form { display:inline; float: left; margin-left:0; }
 #fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; }
 .file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .5em; padding-left:2em; }
-.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:0;}
+.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:block; float:left; padding-left:0; overflow:hidden; position:relative; margin:0;}
 .file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
 #new { background-color:#5bb75b; float:left; border-top-right-radius:0; border-bottom-right-radius:0; margin:0 0 0 1em; border-right:none; z-index:1010; height:1.3em; }
 #new:hover, a.file_upload_button_wrapper:hover + button.file_upload_filename { background-color:#4b964b; }
@@ -89,4 +89,3 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
 
 div.crumb a{ padding: 0.9em 0 0.7em 0; }
-
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index f51bb828cb4..d5de9268f47 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -15,9 +15,9 @@ var FileList={
 			extension=false;
 		}
 		html+='<td class="filename" style="background-image:url('+img+')"><input type="checkbox" />';
-		html+='<a class="name" href="download.php?file='+$('#dir').val().replace(/</, '&lt;').replace(/>/, '&gt;')+'/'+name+'"><span class="nametext">'+basename;
+		html+='<a class="name" href="download.php?file='+$('#dir').val().replace(/</, '&lt;').replace(/>/, '&gt;')+'/'+escapeHTML(name)+'"><span class="nametext">'+escapeHTML(basename);
 		if(extension){
-			html+='<span class="extension">'+extension+'</span>';
+			html+='<span class="extension">'+escapeHTML(extension)+'</span>';
 		}
 		html+='</span></a></td>';
 		if(size!='Pending'){
@@ -116,11 +116,14 @@ var FileList={
 		$('#emptyfolder').hide();
 		$('.file_upload_filename').removeClass('highlight');
 	},
-	loadingDone:function(name){
+	loadingDone:function(name, id){
 		var mime, tr=$('tr').filterAttr('data-file',name);
 		tr.data('loading',false);
 		mime=tr.data('mime');
 		tr.attr('data-mime',mime);
+		if (id != null) {
+			tr.attr('data-id', id);
+		}
 		getMimeIcon(mime,function(path){
 			tr.find('td.filename').attr('style','background-image:url('+path+')');
 		});
@@ -147,7 +150,7 @@ var FileList={
 			if (newname != name) {
 				if (FileList.checkName(name, newname, false)) {
 					newname = name;
-				} else {					
+				} else {
 					$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(result) {
 						if (!result || result.status == 'error') {
 							OC.dialogs.alert(result.data.message, 'Error moving file');
@@ -155,25 +158,24 @@ var FileList={
 						}
 						tr.data('renaming',false);
 					});
-					
-				}
-			
-				tr.attr('data-file', newname);
-				var path = td.children('a.name').attr('href');
-				td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
-				if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
-					var basename=newname.substr(0,newname.lastIndexOf('.'));
-				} else {
-					var basename=newname;
-				}
-				td.children('a.name').empty();
-				var span=$('<span class="nametext"></span>');
-				span.text(basename);
-				td.children('a.name').append(span);
-				if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
-					span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
+
 				}
 			}
+			tr.attr('data-file', newname);
+			var path = td.children('a.name').attr('href');
+			td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
+			if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
+				var basename=newname.substr(0,newname.lastIndexOf('.'));
+			} else {
+				var basename=newname;
+			}
+			td.children('a.name').empty();
+			var span=$('<span class="nametext"></span>');
+			span.text(basename);
+			td.children('a.name').append(span);
+			if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
+				span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
+			}
 			return false;
 		});
 		input.click(function(event){
@@ -187,9 +189,9 @@ var FileList={
 	checkName:function(oldName, newName, isNewFile) {
 		if (isNewFile || $('tr').filterAttr('data-file', newName).length > 0) {
 			if (isNewFile) {
-				$('#notification').html(newName+' '+t('files', 'already exists')+'<span class="replace">'+t('files', 'replace')+'</span><span class="suggest">'+t('files', 'suggest name')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
+				$('#notification').html(escapeHTML(newName)+' '+t('files', 'already exists')+'<span class="replace">'+t('files', 'replace')+'</span><span class="suggest">'+t('files', 'suggest name')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
 			} else {
-				$('#notification').html(newName+' '+t('files', 'already exists')+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
+				$('#notification').html(escapeHTML(newName)+' '+t('files', 'already exists')+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
 			}
 			$('#notification').data('oldName', oldName);
 			$('#notification').data('newName', newName);
@@ -262,17 +264,17 @@ var FileList={
 		if (FileList.lastAction) {
 			FileList.lastAction();
 		}
-		
+
 		FileList.prepareDeletion(files);
-		
+
 		if (!FileList.useUndo) {
 			FileList.lastAction();
 		} else {
 			// NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
 			if ($('#dir').val() == '/Shared') {
-				$('#notification').html(t('files', 'unshared')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+				$('#notification').html(t('files', 'unshared')+' '+ escapeHTML(files) +'<span class="undo">'+t('files', 'undo')+'</span>');
 			} else {
-				$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+				$('#notification').html(t('files', 'deleted')+' '+ escapeHTML(files)+'<span class="undo">'+t('files', 'undo')+'</span>');
 			}
 			$('#notification').fadeIn();
 		}
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 0c00fe8c922..777a5ec647e 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -178,7 +178,12 @@ $(document).ready(function() {
 		var dir=$('#dir').val()||'/';
 		$('#notification').text(t('files','generating ZIP-file, it may take some time.'));
 		$('#notification').fadeIn();
-		window.location=OC.filePath('files', 'ajax', 'download.php') + '?'+ $.param({ dir: dir, files: files });
+		// use special download URL if provided, e.g. for public shared files
+		if ( (downloadURL = document.getElementById("downloadURL")) ) {
+			window.location=downloadURL.value+"&download&files="+files;
+		} else {
+			window.location=OC.filePath('files', 'ajax', 'download.php') + '?'+ $.param({ dir: dir, files: files });
+		}
 		return false;
 	});
 
@@ -195,6 +200,7 @@ $(document).ready(function() {
 			e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
 	});
 
+	if ( document.getElementById("data-upload-form") ) {
 	$(function() {
 		$('.file_upload_start').fileupload({
 			dropZone: $('#content'), // restrict dropZone to content div
@@ -203,7 +209,7 @@ $(document).ready(function() {
 				var totalSize=0;
 				if(files){
 					for(var i=0;i<files.length;i++){
-						if(files[i].size ==0 && files[i].type== '')
+						if(files[i].size ==0 || files[i].type== '')
 						{
 							OC.dialogs.alert(t('files', 'Unable to upload your file as it is a directory or has 0 bytes'), t('files', 'Upload Error'));
 							return;
@@ -276,7 +282,7 @@ $(document).ready(function() {
 							var fileName = files[i].name
 							var dropTarget = $(e.originalEvent.target).closest('tr');
 							if(dropTarget && dropTarget.attr('data-type') === 'dir') { // drag&drop upload to folder
-								var dirName = dropTarget.attr('data-file')
+								var dirName = dropTarget.attr('data-file');
 								var jqXHR =  $('.file_upload_start').fileupload('send', {files: files[i],
 										formData: function(form) {
 											var formArray = form.serializeArray();
@@ -341,7 +347,7 @@ $(document).ready(function() {
 												if(size==t('files','Pending')){
 													$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
 												}
-												FileList.loadingDone(file.name);
+												FileList.loadingDone(file.name, file.id);
 											} else {
 												$('#notification').text(t('files', response.data.message));
 												$('#notification').fadeIn();
@@ -371,7 +377,7 @@ $(document).ready(function() {
 								if(size==t('files','Pending')){
 									$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
 								}
-								FileList.loadingDone(file.name);
+								FileList.loadingDone(file.name, file.id);
 							} else {
 								$('#notification').text(t('files', response.data.message));
 								$('#notification').fadeIn();
@@ -408,7 +414,7 @@ $(document).ready(function() {
 			}
 		})
 	});
-
+	}
 	$.assocArraySize = function(obj) {
 		// http://stackoverflow.com/a/6700/11236
 		var size = 0, key;
@@ -513,6 +519,7 @@ $(document).ready(function() {
 								FileList.addFile(name,0,date,false,hidden);
 								var tr=$('tr').filterAttr('data-file',name);
 								tr.data('mime','text/plain').data('id',result.data.id);
+								tr.attr('data-id', result.data.id);
 								getMimeIcon('text/plain',function(path){
 									tr.find('td.filename').attr('style','background-image:url('+path+')');
 								});
@@ -530,6 +537,8 @@ $(document).ready(function() {
 							if (result.status == 'success') {
 								var date=new Date();
 								FileList.addDir(name,0,date,hidden);
+								var tr=$('tr').filterAttr('data-file',name);
+								tr.attr('data-id', result.data.id);
 							} else {
 								OC.dialogs.alert(result.data.message, 'Error');
 							}
@@ -566,6 +575,7 @@ $(document).ready(function() {
 						FileList.addFile(localName,size,date,false,hidden);
 						var tr=$('tr').filterAttr('data-file',localName);
 						tr.data('mime',mime).data('id',id);
+						tr.attr('data-id', id);
 						getMimeIcon(mime,function(path){
 							tr.find('td.filename').attr('style','background-image:url('+path+')');
 						});
@@ -592,7 +602,10 @@ $(document).ready(function() {
 
 	var lastWidth = 0;
 	var breadcrumbs = [];
-	var breadcrumbsWidth = $('#navigation').get(0).offsetWidth;
+	var breadcrumbsWidth = 0;
+	if ( document.getElementById("navigation") ) {
+		breadcrumbsWidth = $('#navigation').get(0).offsetWidth;
+	}
 	var hiddenBreadcrumbs = 0;
 
 	$.each($('.crumb'), function(index, breadcrumb) {
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index e86c1960753..17432f72a1e 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -9,6 +9,7 @@
 "Files" => "Fitxers",
 "Unshare" => "Deixa de compartir",
 "Delete" => "Suprimeix",
+"Rename" => "Reanomena",
 "already exists" => "ja existeix",
 "replace" => "substitueix",
 "suggest name" => "sugereix un nom",
@@ -22,6 +23,8 @@
 "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",
 "Pending" => "Pendents",
+"1 file uploading" => "1 fitxer pujant",
+"files uploading" => "fitxers pujant",
 "Upload cancelled." => "La pujada s'ha cancel·lat.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
 "Invalid name, '/' is not allowed." => "El nom no és vàlid, no es permet '/'.",
@@ -34,6 +37,16 @@
 "folders" => "carpetes",
 "file" => "fitxer",
 "files" => "fitxers",
+"seconds ago" => "segons enrere",
+"minute ago" => "minut enrere",
+"minutes ago" => "minuts enrere",
+"today" => "avui",
+"yesterday" => "ahir",
+"days ago" => "dies enrere",
+"last month" => "el mes passat",
+"months ago" => "mesos enrere",
+"last year" => "l'any passat",
+"years ago" => "anys enrere",
 "File handling" => "Gestió de fitxers",
 "Maximum upload size" => "Mida màxima de pujada",
 "max. possible: " => "màxim possible:",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 4a1372de529..5e428c9b2d9 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -23,6 +23,8 @@
 "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",
 "Pending" => "Afventer",
+"1 file uploading" => "1 fil uploades",
+"files uploading" => "filer uploades",
 "Upload cancelled." => "Upload afbrudt.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
 "Invalid name, '/' is not allowed." => "Ugyldigt navn, '/' er ikke tilladt.",
@@ -35,6 +37,16 @@
 "folders" => "mapper",
 "file" => "fil",
 "files" => "filer",
+"seconds ago" => "sekunder siden",
+"minute ago" => "minut siden",
+"minutes ago" => "minutter",
+"today" => "i dag",
+"yesterday" => "i går",
+"days ago" => "dage siden",
+"last month" => "sidste måned",
+"months ago" => "måneder siden",
+"last year" => "sidste år",
+"years ago" => "år siden",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimal upload-størrelse",
 "max. possible: " => "max. mulige: ",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index fc07c9b911e..d8b3cf4227c 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -20,13 +20,13 @@
 "unshared" => "Nicht mehr freigegeben",
 "deleted" => "gelöscht",
 "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.",
+"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",
 "Pending" => "Ausstehend",
 "1 file uploading" => "Eine Datei wird hoch geladen",
 "files uploading" => "Dateien werden hoch geladen",
 "Upload cancelled." => "Upload abgebrochen.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der 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 name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
 "files scanned" => "Dateien gescannt",
 "error while scanning" => "Fehler beim Scannen",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
new file mode 100644
index 00000000000..2ed409d2a50
--- /dev/null
+++ b/apps/files/l10n/de_DE.php
@@ -0,0 +1,71 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Datei fehlerfrei hochgeladen.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Die Größe der hochzuladenden Datei überschreitet die upload_max_filesize-Richtlinie in php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde",
+"The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
+"No file was uploaded" => "Es wurde keine Datei hochgeladen.",
+"Missing a temporary folder" => "Temporärer Ordner fehlt.",
+"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
+"Files" => "Dateien",
+"Unshare" => "Nicht mehr freigeben",
+"Delete" => "Löschen",
+"Rename" => "Umbenennen",
+"already exists" => "ist bereits vorhanden",
+"replace" => "ersetzen",
+"suggest name" => "Name vorschlagen",
+"cancel" => "abbrechen",
+"replaced" => "ersetzt",
+"undo" => "rückgängig machen",
+"with" => "mit",
+"unshared" => "Nicht mehr freigegeben",
+"deleted" => "gelöscht",
+"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",
+"Pending" => "Ausstehend",
+"1 file uploading" => "Eine Datei wird hoch geladen",
+"files uploading" => "Dateien werden hoch geladen",
+"Upload cancelled." => "Upload abgebrochen.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
+"Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
+"files scanned" => "Dateien gescannt",
+"error while scanning" => "Fehler beim Scannen",
+"Name" => "Name",
+"Size" => "Größe",
+"Modified" => "Bearbeitet",
+"folder" => "Ordner",
+"folders" => "Ordner",
+"file" => "Datei",
+"files" => "Dateien",
+"seconds ago" => "Sekunden her",
+"minute ago" => "Minute her",
+"minutes ago" => "Minuten her",
+"today" => "Heute",
+"yesterday" => "Gestern",
+"days ago" => "Tage her",
+"last month" => "Letzten Monat",
+"months ago" => "Monate her",
+"last year" => "Letztes Jahr",
+"years ago" => "Jahre her",
+"File handling" => "Dateibehandlung",
+"Maximum upload size" => "Maximale Upload-Größe",
+"max. possible: " => "maximal möglich:",
+"Needed for multi-file and folder downloads." => "Für Mehrfachdatei- und Ordnerdownloads benötigt:",
+"Enable ZIP-download" => "ZIP-Download aktivieren",
+"0 is unlimited" => "0 bedeutet unbegrenzt",
+"Maximum input size for ZIP files" => "Maximale Größe für ZIP-Dateien",
+"Save" => "Speichern",
+"New" => "Neu",
+"Text file" => "Textdatei",
+"Folder" => "Ordner",
+"From url" => "Von einer URL",
+"Upload" => "Hochladen",
+"Cancel upload" => "Upload abbrechen",
+"Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",
+"Share" => "Teilen",
+"Download" => "Herunterladen",
+"Upload too large" => "Upload zu groß",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
+"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
+"Current scanning" => "Scanne"
+);
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 1206f7f0f48..ef2e0bd2839 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -9,6 +9,7 @@
 "Files" => "Αρχεία",
 "Unshare" => "Διακοπή κοινής χρήσης",
 "Delete" => "Διαγραφή",
+"Rename" => "Μετονομασία",
 "already exists" => "υπάρχει ήδη",
 "replace" => "αντικατέστησε",
 "suggest name" => "συνιστώμενο όνομα",
@@ -22,6 +23,8 @@
 "Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes",
 "Upload Error" => "Σφάλμα Μεταφόρτωσης",
 "Pending" => "Εκκρεμεί",
+"1 file uploading" => "1 αρχείο ανεβαίνει",
+"files uploading" => "αρχεία ανεβαίνουν",
 "Upload cancelled." => "Η μεταφόρτωση ακυρώθηκε.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Η μεταφόρτωση του αρχείου βρίσκεται σε εξέλιξη.  Έξοδος από την σελίδα τώρα θα ακυρώσει την μεταφόρτωση.",
 "Invalid name, '/' is not allowed." => "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται.",
@@ -34,6 +37,16 @@
 "folders" => "φάκελοι",
 "file" => "αρχείο",
 "files" => "αρχεία",
+"seconds ago" => "δευτερόλεπτα πριν",
+"minute ago" => "λεπτό πριν",
+"minutes ago" => "λεπτά πριν",
+"today" => "σήμερα",
+"yesterday" => "χτες",
+"days ago" => "μέρες πριν",
+"last month" => "τελευταίο μήνα",
+"months ago" => "μήνες πριν",
+"last year" => "τελευταίο χρόνο",
+"years ago" => "χρόνια πριν",
 "File handling" => "Διαχείριση αρχείων",
 "Maximum upload size" => "Μέγιστο μέγεθος μεταφόρτωσης",
 "max. possible: " => "μέγιστο δυνατό:",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 03d44587448..e9d8eb9e9af 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -9,6 +9,7 @@
 "Files" => "Dosieroj",
 "Unshare" => "Malkunhavigi",
 "Delete" => "Forigi",
+"Rename" => "Alinomigi",
 "already exists" => "jam ekzistas",
 "replace" => "anstataŭigi",
 "suggest name" => "sugesti nomon",
@@ -22,9 +23,13 @@
 "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",
 "Pending" => "Traktotaj",
+"1 file uploading" => "1 dosiero estas alŝutata",
+"files uploading" => "dosieroj estas alŝutataj",
 "Upload cancelled." => "La alŝuto nuliĝis.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
 "Invalid name, '/' is not allowed." => "Nevalida nomo, “/” ne estas permesata.",
+"files scanned" => "dosieroj skanitaj",
+"error while scanning" => "eraro dum skano",
 "Name" => "Nomo",
 "Size" => "Grando",
 "Modified" => "Modifita",
@@ -32,6 +37,16 @@
 "folders" => "dosierujoj",
 "file" => "dosiero",
 "files" => "dosieroj",
+"seconds ago" => "sekundoj antaŭe",
+"minute ago" => "minuto antaŭe",
+"minutes ago" => "minutoj antaŭe",
+"today" => "hodiaŭ",
+"yesterday" => "hieraŭ",
+"days ago" => "tagoj antaŭe",
+"last month" => "lastamonate",
+"months ago" => "monatoj antaŭe",
+"last year" => "lastajare",
+"years ago" => "jaroj antaŭe",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alŝutogrando",
 "max. possible: " => "maks. ebla: ",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 7e92576fe11..3837cf49f99 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -23,6 +23,8 @@
 "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",
 "Pending" => "Pendiente",
+"1 file uploading" => "subiendo 1 archivo",
+"files uploading" => "archivos subiendo",
 "Upload cancelled." => "Subida cancelada.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida.",
 "Invalid name, '/' is not allowed." => "Nombre no válido, '/' no está permitido.",
@@ -35,6 +37,16 @@
 "folders" => "carpetas",
 "file" => "archivo",
 "files" => "archivos",
+"seconds ago" => "hace segundos",
+"minute ago" => "minuto",
+"minutes ago" => "hace minutos",
+"today" => "hoy",
+"yesterday" => "ayer",
+"days ago" => "días",
+"last month" => "mes pasado",
+"months ago" => "hace meses",
+"last year" => "año pasado",
+"years ago" => "hace años",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
 "max. possible: " => "máx. posible:",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index f3290ef4e3c..e94a904327c 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -23,6 +23,8 @@
 "Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir tu archivo porque es un directorio o su tamaño es 0 bytes",
 "Upload Error" => "Error al subir el archivo",
 "Pending" => "Pendiente",
+"1 file uploading" => "Subiendo 1 archivo",
+"files uploading" => "Subiendo archivos",
 "Upload cancelled." => "La subida fue cancelada",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
 "Invalid name, '/' is not allowed." => "Nombre no válido, '/' no está permitido.",
@@ -35,6 +37,16 @@
 "folders" => "carpetas",
 "file" => "archivo",
 "files" => "archivos",
+"seconds ago" => "segundos atrás",
+"minute ago" => "hace un minuto",
+"minutes ago" => "minutos atrás",
+"today" => "hoy",
+"yesterday" => "ayer",
+"days ago" => "días atrás",
+"last month" => "el mes pasado",
+"months ago" => "meses atrás",
+"last year" => "el año pasado",
+"years ago" => "años atrás",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
 "max. possible: " => "máx. posible:",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 9c504880008..94212afe8c2 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -9,6 +9,7 @@
 "Files" => "Fitxategiak",
 "Unshare" => "Ez partekatu",
 "Delete" => "Ezabatu",
+"Rename" => "Berrizendatu",
 "already exists" => "dagoeneko existitzen da",
 "replace" => "ordeztu",
 "suggest name" => "aholkatu izena",
@@ -22,6 +23,8 @@
 "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",
 "Pending" => "Zain",
+"1 file uploading" => "fitxategi 1 igotzen",
+"files uploading" => "fitxategiak 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 name, '/' is not allowed." => "Baliogabeko izena, '/' ezin da erabili. ",
@@ -34,6 +37,16 @@
 "folders" => "Karpetak",
 "file" => "fitxategia",
 "files" => "fitxategiak",
+"seconds ago" => "segundu",
+"minute ago" => "minutu",
+"minutes ago" => "minutu",
+"today" => "gaur",
+"yesterday" => "atzo",
+"days ago" => "egun",
+"last month" => "joan den hilabetean",
+"months ago" => "hilabete",
+"last year" => "joan den urtean",
+"years ago" => "urte",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
 "max. possible: " => "max, posiblea:",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index f3b26999e8f..412c97630d4 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -7,20 +7,29 @@
 "Missing a temporary folder" => "Nedostaje privremena mapa",
 "Failed to write to disk" => "Neuspjelo pisanje na disk",
 "Files" => "Datoteke",
+"Unshare" => "Prekini djeljenje",
 "Delete" => "Briši",
+"Rename" => "Promjeni ime",
 "already exists" => "već postoji",
 "replace" => "zamjeni",
+"suggest name" => "predloži ime",
 "cancel" => "odustani",
 "replaced" => "zamjenjeno",
 "undo" => "vrati",
 "with" => "sa",
+"unshared" => "maknuto djeljenje",
 "deleted" => "izbrisano",
 "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",
 "Pending" => "U tijeku",
+"1 file uploading" => "1 datoteka se učitava",
+"files uploading" => "datoteke se učitavaju",
 "Upload cancelled." => "Slanje poništeno.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje.",
 "Invalid name, '/' is not allowed." => "Neispravan naziv, znak '/' nije dozvoljen.",
+"files scanned" => "datoteka skenirana",
+"error while scanning" => "grečka prilikom skeniranja",
 "Name" => "Naziv",
 "Size" => "Veličina",
 "Modified" => "Zadnja promjena",
@@ -28,6 +37,16 @@
 "folders" => "mape",
 "file" => "datoteka",
 "files" => "datoteke",
+"seconds ago" => "sekundi prije",
+"minute ago" => "minutu",
+"minutes ago" => "minuta",
+"today" => "danas",
+"yesterday" => "jučer",
+"days ago" => "dana",
+"last month" => "prošli mjesec",
+"months ago" => "mjeseci",
+"last year" => "prošlu godinu",
+"years ago" => "godina",
 "File handling" => "datoteka za rukovanje",
 "Maximum upload size" => "Maksimalna veličina prijenosa",
 "max. possible: " => "maksimalna moguća: ",
@@ -35,6 +54,7 @@
 "Enable ZIP-download" => "Omogući ZIP-preuzimanje",
 "0 is unlimited" => "0 je \"bez limita\"",
 "Maximum input size for ZIP files" => "Maksimalna veličina za ZIP datoteke",
+"Save" => "Snimi",
 "New" => "novo",
 "Text file" => "tekstualna datoteka",
 "Folder" => "mapa",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index cda1d51ed2f..f1cd054b1df 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -7,20 +7,29 @@
 "Missing a temporary folder" => "Mangler en midlertidig mappe",
 "Failed to write to disk" => "Klarte ikke å skrive til disk",
 "Files" => "Filer",
+"Unshare" => "Avslutt deling",
 "Delete" => "Slett",
+"Rename" => "Omdøp",
 "already exists" => "eksisterer allerede",
 "replace" => "erstatt",
+"suggest name" => "foreslå navn",
 "cancel" => "avbryt",
 "replaced" => "erstattet",
 "undo" => "angre",
 "with" => "med",
+"unshared" => "deling avsluttet",
 "deleted" => "slettet",
 "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",
 "Pending" => "Ventende",
+"1 file uploading" => "1 fil lastes opp",
+"files uploading" => "filer lastes opp",
 "Upload cancelled." => "Opplasting avbrutt.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
 "Invalid name, '/' is not allowed." => "Ugyldig navn, '/' er ikke tillatt. ",
+"files scanned" => "Filer skannet",
+"error while scanning" => "feil under skanning",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Endret",
@@ -28,6 +37,16 @@
 "folders" => "mapper",
 "file" => "fil",
 "files" => "filer",
+"seconds ago" => "sekunder siden",
+"minute ago" => "minutt siden",
+"minutes ago" => "minutter siden",
+"today" => "i dag",
+"yesterday" => "i går",
+"days ago" => "dager siden",
+"last month" => "forrige måned",
+"months ago" => "måneder siden",
+"last year" => "forrige år",
+"years ago" => "år siden",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimum opplastingsstørrelse",
 "max. possible: " => "max. mulige:",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 016f7341ab7..5f7f03a3d81 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -23,6 +23,8 @@
 "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",
 "Pending" => "Wachten",
+"1 file uploading" => "1 bestand wordt ge-upload",
+"files uploading" => "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.",
 "Invalid name, '/' is not allowed." => "Ongeldige naam, '/' is niet toegestaan.",
@@ -35,6 +37,16 @@
 "folders" => "mappen",
 "file" => "bestand",
 "files" => "bestanden",
+"seconds ago" => "seconden geleden",
+"minute ago" => "minuut geleden",
+"minutes ago" => "minuten geleden",
+"today" => "vandaag",
+"yesterday" => "gisteren",
+"days ago" => "dagen geleden",
+"last month" => "vorige maand",
+"months ago" => "maanden geleden",
+"last year" => "vorig jaar",
+"years ago" => "jaar geleden",
 "File handling" => "Bestand",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
 "max. possible: " => "max. mogelijk: ",
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
new file mode 100644
index 00000000000..3f70761e903
--- /dev/null
+++ b/apps/files/l10n/oc.php
@@ -0,0 +1,71 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Amontcargament capitat, pas d'errors",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Lo fichièr amontcargat es tròp bèl per la directiva «upload_max_filesize » del php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lo fichièr amontcargat es mai gròs que la directiva «MAX_FILE_SIZE» especifiada dins lo formulari HTML",
+"The uploaded file was only partially uploaded" => "Lo fichièr foguèt pas completament amontcargat",
+"No file was uploaded" => "Cap de fichièrs son estats amontcargats",
+"Missing a temporary folder" => "Un dorsièr temporari manca",
+"Failed to write to disk" => "L'escriptura sul disc a fracassat",
+"Files" => "Fichièrs",
+"Unshare" => "Non parteja",
+"Delete" => "Escafa",
+"Rename" => "Torna nomenar",
+"already exists" => "existís jà",
+"replace" => "remplaça",
+"suggest name" => "nom prepausat",
+"cancel" => "anulla",
+"replaced" => "remplaçat",
+"undo" => "defar",
+"with" => "amb",
+"unshared" => "Non partejat",
+"deleted" => "escafat",
+"generating ZIP-file, it may take some time." => "Fichièr ZIP a se far, aquò pòt trigar un briu.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet.",
+"Upload Error" => "Error d'amontcargar",
+"Pending" => "Al esperar",
+"1 file uploading" => "1 fichièr al amontcargar",
+"files uploading" => "fichièrs al amontcargar",
+"Upload cancelled." => "Amontcargar anullat.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
+"Invalid name, '/' is not allowed." => "Nom invalid, '/' es pas permis.",
+"files scanned" => "Fichièr explorat",
+"error while scanning" => "error pendant l'exploracion",
+"Name" => "Nom",
+"Size" => "Talha",
+"Modified" => "Modificat",
+"folder" => "Dorsièr",
+"folders" => "Dorsièrs",
+"file" => "fichièr",
+"files" => "fichièrs",
+"seconds ago" => "secondas",
+"minute ago" => "minuta",
+"minutes ago" => "minutas",
+"today" => "uèi",
+"yesterday" => "ièr",
+"days ago" => "jorns",
+"last month" => "mes passat",
+"months ago" => "meses",
+"last year" => "an passat",
+"years ago" => "ans",
+"File handling" => "Manejament de fichièr",
+"Maximum upload size" => "Talha maximum d'amontcargament",
+"max. possible: " => "max. possible: ",
+"Needed for multi-file and folder downloads." => "Requesit per avalcargar gropat de fichièrs e dorsièr",
+"Enable ZIP-download" => "Activa l'avalcargament de ZIP",
+"0 is unlimited" => "0 es pas limitat",
+"Maximum input size for ZIP files" => "Talha maximum de dintrada per fichièrs ZIP",
+"Save" => "Enregistra",
+"New" => "Nòu",
+"Text file" => "Fichièr de tèxte",
+"Folder" => "Dorsièr",
+"From url" => "Dempuèi l'URL",
+"Upload" => "Amontcarga",
+"Cancel upload" => " Anulla l'amontcargar",
+"Nothing in here. Upload something!" => "Pas res dedins. Amontcarga qualquaren",
+"Share" => "Parteja",
+"Download" => "Avalcarga",
+"Upload too large" => "Amontcargament tròp gròs",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",
+"Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, ",
+"Current scanning" => "Exploracion en cors"
+);
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 1f823d0bb5e..425c6a5a18d 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -23,6 +23,8 @@
 "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",
 "Pending" => "Oczekujące",
+"1 file uploading" => "1 plik wczytany",
+"files uploading" => "pliki wczytane",
 "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 name, '/' is not allowed." => "Nieprawidłowa nazwa '/' jest niedozwolone.",
@@ -35,6 +37,16 @@
 "folders" => "foldery",
 "file" => "plik",
 "files" => "pliki",
+"seconds ago" => "sekund temu",
+"minute ago" => "minutę temu",
+"minutes ago" => "minut temu",
+"today" => "dziś",
+"yesterday" => "wczoraj",
+"days ago" => "dni temu",
+"last month" => "ostani miesiąc",
+"months ago" => "miesięcy temu",
+"last year" => "ostatni rok",
+"years ago" => "lat temu",
 "File handling" => "Zarządzanie plikami",
 "Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
 "max. possible: " => "max. możliwych",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index ffd15ae1d06..5968769f2a1 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -1,26 +1,35 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Sem erro, ficheiro enviado com sucesso",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O ficheiro enviado escede o diretivo upload_max_filesize no php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O ficheiro enviado excede a directiva upload_max_filesize no php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado excede o diretivo MAX_FILE_SIZE especificado no formulário HTML",
 "The uploaded file was only partially uploaded" => "O ficheiro enviado só foi enviado parcialmente",
 "No file was uploaded" => "Não foi enviado nenhum ficheiro",
 "Missing a temporary folder" => "Falta uma pasta temporária",
 "Failed to write to disk" => "Falhou a escrita no disco",
 "Files" => "Ficheiros",
+"Unshare" => "Deixar de partilhar",
 "Delete" => "Apagar",
-"already exists" => "Já existe",
+"Rename" => "Renomear",
+"already exists" => "já existe",
 "replace" => "substituir",
+"suggest name" => "Sugira um nome",
 "cancel" => "cancelar",
-"replaced" => "substituido",
+"replaced" => "substituído",
 "undo" => "desfazer",
 "with" => "com",
+"unshared" => "não partilhado",
 "deleted" => "apagado",
 "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 é possivel fazer o upload do ficheiro devido a ser uma pasta ou ter 0 bytes",
-"Upload Error" => "Erro no upload",
+"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",
 "Pending" => "Pendente",
-"Upload cancelled." => "O upload foi cancelado.",
-"Invalid name, '/' is not allowed." => "nome inválido, '/' não permitido.",
+"1 file uploading" => "A enviar 1 ficheiro",
+"files uploading" => "ficheiros a serem enviados",
+"Upload cancelled." => "O envio foi cancelado.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.",
+"Invalid name, '/' is not allowed." => "Nome inválido, '/' não permitido.",
+"files scanned" => "ficheiros analisados",
+"error while scanning" => "erro ao analisar",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
@@ -28,24 +37,35 @@
 "folders" => "pastas",
 "file" => "ficheiro",
 "files" => "ficheiros",
+"seconds ago" => "há segundos",
+"minute ago" => "há um minuto",
+"minutes ago" => "há minutos",
+"today" => "hoje",
+"yesterday" => "ontem",
+"days ago" => "há dias",
+"last month" => "mês passado",
+"months ago" => "há meses",
+"last year" => "ano passado",
+"years ago" => "há anos",
 "File handling" => "Manuseamento de ficheiros",
 "Maximum upload size" => "Tamanho máximo de envio",
 "max. possible: " => "max. possivel: ",
-"Needed for multi-file and folder downloads." => "Necessário para multi download de ficheiros e pastas",
-"Enable ZIP-download" => "Ativar dowload de ficheiros ZIP",
+"Needed for multi-file and folder downloads." => "Necessário para descarregamento múltiplo de ficheiros e pastas",
+"Enable ZIP-download" => "Permitir descarregar em ficheiro ZIP",
 "0 is unlimited" => "0 é ilimitado",
 "Maximum input size for ZIP files" => "Tamanho máximo para ficheiros ZIP",
+"Save" => "Guardar",
 "New" => "Novo",
 "Text file" => "Ficheiro de texto",
 "Folder" => "Pasta",
 "From url" => "Do endereço",
 "Upload" => "Enviar",
-"Cancel upload" => "Cancelar upload",
-"Nothing in here. Upload something!" => "Vazio. Envia alguma coisa!",
+"Cancel upload" => "Cancelar envio",
+"Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
 "Share" => "Partilhar",
 "Download" => "Transferir",
 "Upload too large" => "Envio muito grande",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que estás a tentar enviar excedem o tamanho máximo de envio neste servidor.",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que está a tentar enviar excedem o tamanho máximo de envio permitido neste servidor.",
 "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
 "Current scanning" => "Análise actual"
 );
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index d21d6e3a6d8..64010937fdb 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -9,6 +9,7 @@
 "Files" => "Файлы",
 "Unshare" => "Отменить публикацию",
 "Delete" => "Удалить",
+"Rename" => "Переименовать",
 "already exists" => "уже существует",
 "replace" => "заменить",
 "suggest name" => "предложить название",
@@ -22,6 +23,8 @@
 "Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог",
 "Upload Error" => "Ошибка загрузки",
 "Pending" => "Ожидание",
+"1 file uploading" => "загружается 1 файл",
+"files uploading" => "загружаются файлы",
 "Upload cancelled." => "Загрузка отменена.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.",
 "Invalid name, '/' is not allowed." => "Неверное имя, '/' не допускается.",
@@ -32,6 +35,10 @@
 "folders" => "папки",
 "file" => "файл",
 "files" => "файлы",
+"minute ago" => "минуту назад",
+"today" => "сегодня",
+"yesterday" => "вчера",
+"last month" => "в прошлом месяце",
 "File handling" => "Управление файлами",
 "Maximum upload size" => "Максимальный размер загружаемого файла",
 "max. possible: " => "макс. возможно: ",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 0574e2dfcde..34e9d19ca33 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -9,6 +9,7 @@
 "Files" => "Файлы",
 "Unshare" => "Скрыть",
 "Delete" => "Удалить",
+"Rename" => "Переименовать",
 "already exists" => "уже существует",
 "replace" => "отмена",
 "suggest name" => "подобрать название",
@@ -22,9 +23,13 @@
 "Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией",
 "Upload Error" => "Ошибка загрузки",
 "Pending" => "Ожидающий решения",
+"1 file uploading" => "загрузка 1 файла",
+"files uploading" => "загрузка файлов",
 "Upload cancelled." => "Загрузка отменена",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена.",
 "Invalid name, '/' is not allowed." => "Неправильное имя, '/' не допускается.",
+"files scanned" => "файлы отсканированы",
+"error while scanning" => "ошибка при сканировании",
 "Name" => "Имя",
 "Size" => "Размер",
 "Modified" => "Изменен",
@@ -32,6 +37,16 @@
 "folders" => "папки",
 "file" => "файл",
 "files" => "файлы",
+"seconds ago" => "секунд назад",
+"minute ago" => "минуту назад",
+"minutes ago" => "минут назад",
+"today" => "сегодня",
+"yesterday" => "вчера",
+"days ago" => "дней назад",
+"last month" => "в прошлом месяце",
+"months ago" => "месяцев назад",
+"last year" => "в прошлом году",
+"years ago" => "лет назад",
 "File handling" => "Работа с файлами",
 "Maximum upload size" => "Максимальный размер загружаемого файла",
 "max. possible: " => "Максимально возможный",
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
new file mode 100644
index 00000000000..97a125faff1
--- /dev/null
+++ b/apps/files/l10n/si_LK.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "නිවැරදි ව ගොනුව උඩුගත කෙරිනි",
+"The uploaded file was only partially uploaded" => "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය",
+"No file was uploaded" => "කිසිදු ගොනවක් උඩුගත නොවිනි",
+"Files" => "ගොනු",
+"Name" => "නම",
+"Size" => "ප්‍රමාණය",
+"folder" => "ෆෝල්ඩරය",
+"folders" => "ෆෝල්ඩර",
+"file" => "ගොනුව",
+"files" => "ගොනු",
+"Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
+"New" => "නව",
+"Folder" => "ෆෝල්ඩරය",
+"Upload" => "උඩුගත කිරීම",
+"Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
+"Download" => "බාගත කිරීම"
+);
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index f25e6bb9bb7..787e903ac8e 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -9,6 +9,7 @@
 "Files" => "Súbory",
 "Unshare" => "Nezdielať",
 "Delete" => "Odstrániť",
+"Rename" => "Premenovať",
 "already exists" => "už existuje",
 "replace" => "nahradiť",
 "suggest name" => "pomôcť s menom",
@@ -20,9 +21,11 @@
 "deleted" => "zmazané",
 "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 nahrávania",
+"Upload Error" => "Chyba odosielania",
 "Pending" => "Čaká sa",
-"Upload cancelled." => "Nahrávanie zrušené",
+"1 file uploading" => "1 súbor sa posiela ",
+"files uploading" => "súbory sa posielajú",
+"Upload cancelled." => "Odosielanie zrušené",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
 "Invalid name, '/' is not allowed." => "Chybný názov, \"/\" nie je povolené",
 "files scanned" => "skontrolovaných súborov",
@@ -34,6 +37,16 @@
 "folders" => "priečinky",
 "file" => "súbor",
 "files" => "súbory",
+"seconds ago" => "pred sekundami",
+"minute ago" => "pred minútou",
+"minutes ago" => "pred minútami",
+"today" => "dnes",
+"yesterday" => "včera",
+"days ago" => "pred pár dňami",
+"last month" => "minulý mesiac",
+"months ago" => "pred mesiacmi",
+"last year" => "minulý rok",
+"years ago" => "pred rokmi",
 "File handling" => "Nastavenie správanie k súborom",
 "Maximum upload size" => "Maximálna veľkosť odosielaného súboru",
 "max. possible: " => "najväčšie možné:",
@@ -46,13 +59,13 @@
 "Text file" => "Textový súbor",
 "Folder" => "Priečinok",
 "From url" => "Z url",
-"Upload" => "Nahrať",
+"Upload" => "Odoslať",
 "Cancel upload" => "Zrušiť odosielanie",
 "Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
 "Share" => "Zdielať",
 "Download" => "Stiahnuť",
 "Upload too large" => "Odosielaný súbor je príliš veľký",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory ktoré sa snažíte nahrať presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
-"Files are being scanned, please wait." => "Súbory sa práve prehľadávajú, prosím čakajte.",
+"Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané..",
 "Current scanning" => "Práve prehliadané"
 );
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index d6593022d8b..a519c1a2ba1 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -9,6 +9,7 @@
 "Files" => "Tập tin",
 "Unshare" => "Không chia sẽ",
 "Delete" => "Xóa",
+"Rename" => "Sửa tên",
 "already exists" => "đã tồn tại",
 "replace" => "thay thế",
 "suggest name" => "tên gợi ý",
@@ -16,14 +17,19 @@
 "replaced" => "đã được thay thế",
 "undo" => "lùi lại",
 "with" => "với",
+"unshared" => "gỡ chia sẻ",
 "deleted" => "đã xóa",
 "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",
 "Pending" => "Chờ",
+"1 file uploading" => "1 tệp tin đang được tải lên",
+"files uploading" => "tệp tin đang được 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 name, '/' is not allowed." => "Tên không hợp lệ ,không được phép dùng '/'",
+"files scanned" => "tệp tin đã quét",
+"error while scanning" => "lỗi trong khi quét",
 "Name" => "Tên",
 "Size" => "Kích cỡ",
 "Modified" => "Thay đổi",
@@ -31,8 +37,19 @@
 "folders" => "folders",
 "file" => "file",
 "files" => "files",
+"seconds ago" => "giây trước",
+"minute ago" => "một phút trước",
+"minutes ago" => "phút trước",
+"today" => "hôm nay",
+"yesterday" => "hôm qua",
+"days ago" => "ngày trước",
+"last month" => "tháng trước",
+"months ago" => "tháng trước",
+"last year" => "năm trước",
+"years ago" => "năm trước",
 "File handling" => "Xử lý tập tin",
 "Maximum upload size" => "Kích thước tối đa ",
+"max. possible: " => "tối đa cho phép",
 "Needed for multi-file and folder downloads." => "Cần thiết cho tải nhiều tập tin và thư mục.",
 "Enable ZIP-download" => "Cho phép ZIP-download",
 "0 is unlimited" => "0 là không giới hạn",
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index b60ad3d4cdd..8d4ae972b9b 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -9,6 +9,7 @@
 "Files" => "文件",
 "Unshare" => "取消共享",
 "Delete" => "删除",
+"Rename" => "重命名",
 "already exists" => "已经存在了",
 "replace" => "替换",
 "suggest name" => "推荐名称",
@@ -22,6 +23,8 @@
 "Unable to upload your file as it is a directory or has 0 bytes" => "不能上传你指定的文件,可能因为它是个文件夹或者大小为0",
 "Upload Error" => "上传错误",
 "Pending" => "Pending",
+"1 file uploading" => "1 个文件正在上传",
+"files uploading" => "个文件正在上传",
 "Upload cancelled." => "上传取消了",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
 "Invalid name, '/' is not allowed." => "非法文件名,\"/\"是不被许可的",
@@ -34,6 +37,16 @@
 "folders" => "文件夹",
 "file" => "文件",
 "files" => "文件",
+"seconds ago" => "秒前",
+"minute ago" => "分钟前",
+"minutes ago" => "分钟前",
+"today" => "今天",
+"yesterday" => "昨天",
+"days ago" => "天前",
+"last month" => "上个月",
+"months ago" => "月前",
+"last year" => "去年",
+"years ago" => "年前",
 "File handling" => "文件处理中",
 "Maximum upload size" => "最大上传大小",
 "max. possible: " => "最大可能",
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index aff484f0a7a..d49f2f4d5d3 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -12,7 +12,7 @@
 				</ul>
 			</div>
 			<div class="file_upload_wrapper svg">
-				<form data-upload-id='1' class="file_upload_form" action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1">
+				<form data-upload-id='1' id="data-upload-form" class="file_upload_form" action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1">
 					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
 					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 875fc747bb7..71b695f65f8 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,6 +1,6 @@
 	<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
         $crumb = $_["breadcrumb"][$i]; ?>
-		<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo OCP\image_path('core','breadcrumb.png');?>")'>
-		<a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
+		<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo urlencode($crumb["dir"]);?>' style='background-image:url("<?php echo OCP\image_path('core','breadcrumb.png');?>")'>
+		<a href="<?php echo $_['baseURL'].urlencode($crumb["dir"]); ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
 		</div>
 	<?php endfor;?>
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 8faeae3939c..0f5b839b180 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -1,3 +1,12 @@
+		<script type="text/javascript">
+		<?php if ( array_key_exists('publicListView', $_) && $_['publicListView'] == true ) {
+			echo "var publicListView = true;";
+		} else {
+			echo "var publicListView = false;";
+		}
+		?>
+		</script>
+
 		<?php foreach($_['files'] as $file):
 			$simple_file_size = OCP\simple_file_size($file['size']);
 			$simple_size_color = intval(200-$file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey; megabytes*2