Merge branch 'master' into more-themable-strings

Conflicts:
	lib/template.php

18 files changed, 120 insertions, 69 deletions

diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 0706d4e7829..5b32b6db9b7 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -16,72 +16,56 @@ if (isset($_GET['users'])) {
 }
 
 $eventSource = new OC_EventSource();
-ScanListener::$eventSource = $eventSource;
-ScanListener::$view = \OC\Files\Filesystem::getView();
-
-OC_Hook::connect('\OC\Files\Cache\Scanner', 'scan_folder', 'ScanListener', 'folder');
-OC_Hook::connect('\OC\Files\Cache\Scanner', 'scan_file', 'ScanListener', 'file');
+$listener = new ScanListener($eventSource);
 
 foreach ($users as $user) {
 	$eventSource->send('user', $user);
-	OC_Util::tearDownFS();
-	OC_Util::setupFS($user);
-
-	$absolutePath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir);
-
-	$mountPoints = \OC\Files\Filesystem::getMountPoints($absolutePath);
-	$mountPoints[] = \OC\Files\Filesystem::getMountPoint($absolutePath);
-	$mountPoints = array_reverse($mountPoints); //start with the mount point of $dir
-
-	foreach ($mountPoints as $mountPoint) {
-		$storage = \OC\Files\Filesystem::getStorage($mountPoint);
-		if ($storage) {
-			ScanListener::$mountPoints[$storage->getId()] = $mountPoint;
-			$scanner = $storage->getScanner();
-			if ($force) {
-				$scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG);
-			} else {
-				$scanner->backgroundScan();
-			}
-		}
+	$scanner = new \OC\Files\Utils\Scanner($user);
+	$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', array($listener, 'file'));
+	$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', array($listener, 'folder'));
+	if ($force) {
+		$scanner->scan($dir);
+	} else {
+		$scanner->backgroundScan($dir);
 	}
 }
 
-$eventSource->send('done', ScanListener::$fileCount);
+$eventSource->send('done', $listener->getCount());
 $eventSource->close();
 
 class ScanListener {
 
-	static public $fileCount = 0;
-	static public $lastCount = 0;
+	private $fileCount = 0;
+	private $lastCount = 0;
 
 	/**
-	 * @var \OC\Files\View $view
+	 * @var \OC_EventSource event source to pass events to
 	 */
-	static public $view;
+	private $eventSource;
 
 	/**
-	 * @var array $mountPoints map storage ids to mountpoints
+	 * @param \OC_EventSource $eventSource
 	 */
-	static public $mountPoints = array();
+	public function __construct($eventSource) {
+		$this->eventSource = $eventSource;
+	}
 
 	/**
-	 * @var \OC_EventSource event source to pass events to
+	 * @param string $path
 	 */
-	static public $eventSource;
-
-	static function folder($params) {
-		$internalPath = $params['path'];
-		$mountPoint = self::$mountPoints[$params['storage']];
-		$path = self::$view->getRelativePath($mountPoint . $internalPath);
-		self::$eventSource->send('folder', $path);
+	public function folder($path) {
+		$this->eventSource->send('folder', $path);
 	}
 
-	static function file() {
-		self::$fileCount++;
-		if (self::$fileCount > self::$lastCount + 20) { //send a count update every 20 files
-			self::$lastCount = self::$fileCount;
-			self::$eventSource->send('count', self::$fileCount);
+	public function file() {
+		$this->fileCount++;
+		if ($this->fileCount > $this->lastCount + 20) { //send a count update every 20 files
+			$this->lastCount = $this->fileCount;
+			$this->eventSource->send('count', $this->fileCount);
 		}
 	}
+
+	public function getCount() {
+		return $this->fileCount;
+	}
 }
diff --git a/apps/files/index.php b/apps/files/index.php
index 2338cf439e4..2f005391509 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -121,6 +121,10 @@ if ($needUpgrade) {
 	// information about storage capacities
 	$storageInfo=OC_Helper::getStorageInfo();
 	$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
+	$publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes');
+	if (OC_App::isEnabled('files_encryption')) {
+		$publicUploadEnabled = 'no';
+	}
 
 	OCP\Util::addscript('files', 'fileactions');
 	OCP\Util::addscript('files', 'files');
@@ -138,5 +142,6 @@ if ($needUpgrade) {
 	$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 	$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
 	$tmpl->assign('isPublic', false);
+	$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
 	$tmpl->printPage();
 }
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index cf3ce2e5089..04a9fb91649 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -47,7 +47,7 @@ var FileList={
 
 		//size column
 		if(size!=t('files', 'Pending')){
-			simpleSize=simpleFileSize(size);
+			simpleSize = humanFileSize(size);
 		}else{
 			simpleSize=t('files', 'Pending');
 		}
@@ -55,7 +55,6 @@ var FileList={
 		var lastModifiedTime = Math.round(lastModified.getTime() / 1000);
 		td = $('<td></td>').attr({
 			"class": "filesize",
-			"title": humanFileSize(size),
 			"style": 'color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')'
 		}).text(simpleSize);
 		tr.append(td);
@@ -171,6 +170,8 @@ var FileList={
 			}
 		}else if(type=='dir' && $('tr[data-file]').length>0){
 			$('tr[data-file]').first().before(element);
+		} else if(type=='file' && $('tr[data-file]').length>0) {
+			$('tr[data-file]').last().before(element);
 		}else{
 			$('#fileList').append(element);
 		}
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 51b3f31fb96..98fc53b71a9 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -756,9 +756,7 @@ function procesSelection(){
 		for(var i=0;i<selectedFolders.length;i++){
 			totalSize+=selectedFolders[i].size;
 		};
-		simpleSize=simpleFileSize(totalSize);
-		$('#headerSize').text(simpleSize);
-		$('#headerSize').attr('title',humanFileSize(totalSize));
+		$('#headerSize').text(humanFileSize(totalSize));
 		var selection='';
 		if(selectedFolders.length>0){
 			if(selectedFolders.length==1){
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 98214d6a1b2..33430795ddd 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
 "Could not move %s" => "Konnte %s nicht verschieben",
+"Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
+"Invalid Token" => "Ungültiges Merkmal",
 "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
 "There is no error, the file uploaded with success" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
@@ -47,6 +49,7 @@
 "{count} folders" => "{count} Ordner",
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
+"%s could not be renamed" => "%s konnte nicht umbenannt werden",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
 "Maximum upload size" => "Maximale Upload-Größe",
@@ -70,6 +73,8 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
 "Current scanning" => "Scanne",
+"directory" => "Verzeichnis",
+"directories" => "Verzeichnisse",
 "file" => "Datei",
 "files" => "Dateien",
 "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index f9c347b45da..3ce3b2a7fb5 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
+"Could not move %s - File with this name already exists" => "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.",
 "Could not move %s" => "Konnte %s nicht verschieben",
 "Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
 "Invalid Token" => "Ungültiges Merkmal",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index d5ae7ae53d2..3fc3be17982 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -1,26 +1,28 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No se pudo mover %s - Un archivo con este nombre ya existe",
 "Could not move %s" => "No se pudo mover %s ",
+"Unable to set upload directory." => "No fue posible crear el directorio de subida.",
+"Invalid Token" => "Token Inválido",
 "No file was uploaded. Unknown error" => "El archivo no fue subido. Error desconocido",
 "There is no error, the file uploaded with success" => "No hay errores, el archivo fue subido con éxito",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML",
 "The uploaded file was only partially uploaded" => "El archivo fue subido parcialmente",
 "No file was uploaded" => "No se subió ningún archivo ",
-"Missing a temporary folder" => "Error en la carpera temporal",
+"Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "Error al escribir en el disco",
-"Not enough storage available" => "No hay suficiente capacidad de almacenamiento",
-"Invalid directory." => "Directorio invalido.",
+"Not enough storage available" => "No hay suficiente almacenamiento",
+"Invalid directory." => "Directorio inválido.",
 "Files" => "Archivos",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes",
 "Not enough space available" => "No hay suficiente espacio disponible",
 "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á.",
 "URL cannot be empty." => "La URL no puede estar vacía",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de directorio inválido. El uso de \"Shared\" está reservado por ownCloud",
 "Error" => "Error",
 "Share" => "Compartir",
-"Delete permanently" => "Borrar de manera permanente",
+"Delete permanently" => "Borrar permanentemente",
 "Delete" => "Borrar",
 "Rename" => "Cambiar nombre",
 "Pending" => "Pendientes",
@@ -28,9 +30,9 @@
 "replace" => "reemplazar",
 "suggest name" => "sugerir nombre",
 "cancel" => "cancelar",
-"replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
+"replaced {new_name} with {old_name}" => "se reemplazó {new_name} con {old_name}",
 "undo" => "deshacer",
-"perform delete operation" => "Eliminar",
+"perform delete operation" => "Llevar a cabo borrado",
 "1 file uploading" => "Subiendo 1 archivo",
 "files uploading" => "Subiendo archivos",
 "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
@@ -38,7 +40,7 @@
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
 "Your storage is full, files can not be updated or synced anymore!" => "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
 "Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento está casi lleno ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes.",
+"Your download is being prepared. This might take some time if the files are big." => "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud",
 "Name" => "Nombre",
 "Size" => "Tamaño",
@@ -47,11 +49,12 @@
 "{count} folders" => "{count} directorios",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
+"%s could not be renamed" => "No se pudo renombrar %s",
 "Upload" => "Subir",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
 "max. possible: " => "máx. posible:",
-"Needed for multi-file and folder downloads." => "Es necesario para descargas multi-archivo y de carpetas",
+"Needed for multi-file and folder downloads." => "Es necesario para descargas multi-archivo y de directorios.",
 "Enable ZIP-download" => "Habilitar descarga en formato ZIP",
 "0 is unlimited" => "0 significa ilimitado",
 "Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
@@ -60,7 +63,7 @@
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
 "From link" => "Desde enlace",
-"Deleted files" => "Archivos Borrados",
+"Deleted files" => "Archivos borrados",
 "Cancel upload" => "Cancelar subida",
 "You don’t have write permissions here." => "No tenés permisos de escritura acá.",
 "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
@@ -70,6 +73,8 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
 "Current scanning" => "Escaneo actual",
+"directory" => "directorio",
+"directories" => "directorios",
 "file" => "archivo",
 "files" => "archivos",
 "Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos"
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index c87e20b1ff6..96bfb2d1cc8 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
 "Could not move %s" => "Ezin dira fitxategiak mugitu %s",
+"Unable to set upload directory." => "Ezin da igoera direktorioa ezarri.",
+"Invalid Token" => "Lekuko baliogabea",
 "No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
 "There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo da",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
@@ -17,6 +19,7 @@
 "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.",
 "URL cannot be empty." => "URLa ezin da hutsik egon.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Karpeta izne baliogabea. \"Shared\" karpeta erabilpena OwnCloudentzat erreserbaturik dago.",
 "Error" => "Errorea",
 "Share" => "Elkarbanatu",
 "Delete permanently" => "Ezabatu betirako",
@@ -46,6 +49,7 @@
 "{count} folders" => "{count} karpeta",
 "1 file" => "fitxategi bat",
 "{count} files" => "{count} fitxategi",
+"%s could not be renamed" => "%s ezin da berrizendatu",
 "Upload" => "Igo",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
@@ -69,6 +73,8 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
 "Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
 "Current scanning" => "Orain eskaneatzen ari da",
+"directory" => "direktorioa",
+"directories" => "direktorioak",
 "file" => "fitxategia",
 "files" => "fitxategiak",
 "Upgrading filesystem cache..." => "Fitxategi sistemaren katxea eguneratzen..."
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 22e448c01db..40df7b1546e 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -65,6 +65,8 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
 "Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.",
 "Current scanning" => "Tämänhetkinen tutkinta",
+"directory" => "kansio",
+"directories" => "kansiota",
 "file" => "tiedosto",
 "files" => "tiedostoa",
 "Upgrading filesystem cache..." => "Päivitetään tiedostojärjestelmän välimuistia..."
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 769dfe33ffe..d4080a17960 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kan ikke flytte %s - En fil med samme navn finnes allerede",
 "Could not move %s" => "Kunne ikke flytte %s",
+"Unable to set upload directory." => "Kunne ikke sette opplastingskatalog.",
 "No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
 "There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
@@ -70,6 +71,8 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
 "Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
 "Current scanning" => "Pågående skanning",
+"directory" => "katalog",
+"directories" => "kataloger",
 "file" => "fil",
 "files" => "filer",
 "Upgrading filesystem cache..." => "Oppgraderer filsystemets  mellomlager..."
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 914d5087af1..0d906cb138b 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -49,6 +49,7 @@
 "{count} folders" => "{count} mappen",
 "1 file" => "1 bestand",
 "{count} files" => "{count} bestanden",
+"%s could not be renamed" => "%s kon niet worden hernoemd",
 "Upload" => "Uploaden",
 "File handling" => "Bestand",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
@@ -72,6 +73,8 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
 "Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
 "Current scanning" => "Er wordt gescand",
+"directory" => "directory",
+"directories" => "directories",
 "file" => "bestand",
 "files" => "bestanden",
 "Upgrading filesystem cache..." => "Upgraden bestandssysteem cache..."
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 4273de9c478..8aeb30efbf2 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Não foi possível mover o ficheiro %s - Já existe um ficheiro com esse nome",
 "Could not move %s" => "Não foi possível move o ficheiro %s",
+"Unable to set upload directory." => "Não foi possível criar o diretório de upload",
+"Invalid Token" => "Token inválido",
 "No file was uploaded. Unknown error" => "Nenhum ficheiro foi carregado. Erro desconhecido",
 "There is no error, the file uploaded with success" => "Não ocorreram erros, o ficheiro foi submetido com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede o limite permitido na directiva do php.ini upload_max_filesize",
@@ -47,6 +49,7 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
+"%s could not be renamed" => "%s não pode ser renomeada",
 "Upload" => "Carregar",
 "File handling" => "Manuseamento de ficheiros",
 "Maximum upload size" => "Tamanho máximo de envio",
@@ -70,6 +73,8 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
 "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
 "Current scanning" => "Análise actual",
+"directory" => "diretório",
+"directories" => "diretórios",
 "file" => "ficheiro",
 "files" => "ficheiros",
 "Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..."
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 34eca54f493..71742cb4d57 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -32,7 +32,7 @@
 "cancel" => "отмена",
 "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
 "undo" => "отмена",
-"perform delete operation" => "выполняется операция удаления",
+"perform delete operation" => "выполнить операцию удаления",
 "1 file uploading" => "загружается 1 файл",
 "files uploading" => "файлы загружаются",
 "'.' is an invalid file name." => "'.' - неправильное имя файла.",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 0b2dbb12dd9..6b479b580eb 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten var.",
 "Could not move %s" => "%s taşınamadı",
+"Unable to set upload directory." => "Yükleme dizini tanımlanamadı.",
+"Invalid Token" => "Geçeriz simge",
 "No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
 "There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.",
@@ -47,6 +49,7 @@
 "{count} folders" => "{count} dizin",
 "1 file" => "1 dosya",
 "{count} files" => "{count} dosya",
+"%s could not be renamed" => "%s yeniden adlandırılamadı",
 "Upload" => "Yükle",
 "File handling" => "Dosya taşıma",
 "Maximum upload size" => "Maksimum yükleme boyutu",
@@ -70,6 +73,8 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
 "Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
 "Current scanning" => "Güncel tarama",
+"directory" => "dizin",
+"directories" => "dizinler",
 "file" => "dosya",
 "files" => "dosyalar",
 "Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor"
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index 4108516cda1..469211ca7f4 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -1,18 +1,28 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "无法移动 %s - 存在同名文件",
+"Could not move %s" => "无法移动 %s",
+"Unable to set upload directory." => "无法设置上传文件夹",
+"Invalid Token" => "非法Token",
 "No file was uploaded. Unknown error" => "没有上传文件。未知错误",
 "There is no error, the file uploaded with success" => "文件上传成功",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上传的文件超过了php.ini指定的upload_max_filesize",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了 HTML 表格中指定的 MAX_FILE_SIZE 选项",
 "The uploaded file was only partially uploaded" => "文件部分上传",
 "No file was uploaded" => "没有上传文件",
 "Missing a temporary folder" => "缺失临时文件夹",
 "Failed to write to disk" => "写磁盘失败",
+"Not enough storage available" => "容量不足",
+"Invalid directory." => "无效文件夹",
 "Files" => "文件",
 "Unable to upload your file as it is a directory or has 0 bytes" => "不能上传您的文件，由于它是文件夹或者为空文件",
+"Not enough space available" => "容量不足",
 "Upload cancelled." => "上传取消了",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
 "URL cannot be empty." => "网址不能为空。",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "无效文件夹名。“Shared”已经被系统保留。",
 "Error" => "出错",
 "Share" => "分享",
+"Delete permanently" => "永久删除",
 "Delete" => "删除",
 "Rename" => "重命名",
 "Pending" => "等待中",
@@ -22,8 +32,16 @@
 "cancel" => "取消",
 "replaced {new_name} with {old_name}" => "已用 {old_name} 替换 {new_name}",
 "undo" => "撤销",
+"perform delete operation" => "执行删除",
 "1 file uploading" => "1 个文件正在上传",
 "files uploading" => "个文件正在上传",
+"'.' is an invalid file name." => "'.' 文件名不正确",
+"File name cannot be empty." => "文件名不能为空",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "文件名内不能包含以下符号：\\ / < > : \" | ?和 *",
+"Your storage is full, files can not be updated or synced anymore!" => "容量已满，不能再同步/上传文件了！",
+"Your storage is almost full ({usedSpacePercent}%)" => "你的空间快用满了 ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "正在下载，可能会花点时间，跟文件大小有关",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "不正确文件夹名。Shared是保留名，不能使用。",
 "Name" => "名称",
 "Size" => "大小",
 "Modified" => "修改日期",
@@ -31,6 +49,7 @@
 "{count} folders" => "{count} 个文件夹",
 "1 file" => "1 个文件",
 "{count} files" => "{count} 个文件",
+"%s could not be renamed" => "不能重命名 %s",
 "Upload" => "上传",
 "File handling" => "文件处理中",
 "Maximum upload size" => "最大上传大小",
@@ -44,7 +63,9 @@
 "Text file" => "文本文档",
 "Folder" => "文件夹",
 "From link" => "来自链接",
+"Deleted files" => "已删除的文件",
 "Cancel upload" => "取消上传",
+"You don’t have write permissions here." => "您没有写入权限。",
 "Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
 "Download" => "下载",
 "Unshare" => "取消分享",
@@ -52,6 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.",
 "Files are being scanned, please wait." => "正在扫描文件,请稍候.",
 "Current scanning" => "正在扫描",
+"directory" => "文件夹",
+"directories" => "文件夹",
 "file" => "文件",
-"files" => "文件"
+"files" => "文件",
+"Upgrading filesystem cache..." => "升级系统缓存..."
 );
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 59a332f628f..63d2bd92365 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "無法移動 %s - 同名的檔案已經存在",
 "Could not move %s" => "無法移動 %s",
+"Unable to set upload directory." => "無法設定上傳目錄。",
+"Invalid Token" => "無效的 token",
 "No file was uploaded. Unknown error" => "沒有檔案被上傳。未知的錯誤。",
 "There is no error, the file uploaded with success" => "無錯誤，檔案上傳成功",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定：",
@@ -47,6 +49,7 @@
 "{count} folders" => "{count} 個資料夾",
 "1 file" => "1 個檔案",
 "{count} files" => "{count} 個檔案",
+"%s could not be renamed" => "無法重新命名 %s",
 "Upload" => "上傳",
 "File handling" => "檔案處理",
 "Maximum upload size" => "最大上傳檔案大小",
@@ -70,5 +73,9 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。",
 "Files are being scanned, please wait." => "正在掃描檔案，請稍等。",
 "Current scanning" => "目前掃描",
+"directory" => "目錄",
+"directories" => "目錄",
+"file" => "檔案",
+"files" => "檔案",
 "Upgrading filesystem cache..." => "正在升級檔案系統快取..."
 );
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 7d679bc4bf6..e0731609368 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -61,7 +61,7 @@
 	<div id="emptyfolder"><?php p($l->t('Nothing in here. Upload something!'))?></div>
 <?php endif; ?>
 
-<table id="filestable">
+<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>">
 	<thead>
 		<tr>
 			<th id='headerName'>
@@ -77,7 +77,7 @@
 					<?php endif; ?>
 				</span>
 			</th>
-			<th id="headerSize"><?php p($l->t('Size (MB)')); ?></th>
+			<th id="headerSize"><?php p($l->t('Size')); ?></th>
 			<th id="headerDate">
 				<span id="modified"><?php p($l->t( 'Modified' )); ?></span>
 				<?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 97a9026860b..0c7d6936697 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -9,7 +9,6 @@ $totalsize = 0; ?>
 	} else {
 		$totalfiles++;
 	}
-	$simple_file_size = OCP\simple_file_size($file['size']);
 	// the bigger the file, the darker the shade of grey; megabytes*2
 	$simple_size_color = intval(160-$file['size']/(1024*1024)*2);
 	if($simple_size_color<0) $simple_size_color = 0;
@@ -52,9 +51,8 @@ $totalsize = 0; ?>
 			</a>
 		</td>
 		<td class="filesize"
-			title="<?php p(OCP\human_file_size($file['size'])); ?>"
 			style="color:rgb(<?php p($simple_size_color.','.$simple_size_color.','.$simple_size_color) ?>)">
-				<?php print_unescaped($simple_file_size); ?>
+				<?php print_unescaped(OCP\human_file_size($file['size'])); ?>
 		</td>
 		<td class="date">
 			<span class="modified"
@@ -91,7 +89,7 @@ $totalsize = 0; ?>
 			} ?>
 		</span></td>
 		<td class="filesize">
-		<?php print_unescaped(OCP\simple_file_size($totalsize)); ?>
+		<?php print_unescaped(OCP\human_file_size($totalsize)); ?>
 		</td>
 		<td></td>
 	</tr>