9 files changed, 22 insertions, 16 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 0d632c9b2c2..6475afb56e0 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_Filesystem::filesize($filename));
 
-@ob_end_clean();
+OC_Util::obEnd();
 OC_Filesystem::readfile( $filename );
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index dbd9a647151..d29732f9b3f 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -730,7 +730,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');
 	}
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 66b6e69d69d..c89060db432 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -19,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
 "unshared {files}" => "jagamata {files}",
 "deleted {files}" => "kustutatud {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
 "generating ZIP-file, it may take some time." => "ZIP-faili loomine, see võib veidi aega võtta.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
 "Upload Error" => "Üleslaadimise viga",
@@ -28,6 +29,7 @@
 "{count} files uploading" => "{count} faili üleslaadimist",
 "Upload cancelled." => "Üleslaadimine tühistati.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös.  Lehelt lahkumine katkestab selle üleslaadimise.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Vigane kausta nimi. Nime \"Jagatud\" kasutamine on Owncloudi poolt broneeritud ",
 "{count} files scanned" => "{count} faili skännitud",
 "error while scanning" => "viga skännimisel",
 "Name" => "Nimi",
diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php
index f98809bfc0d..5024dac4d8c 100644
--- a/apps/files_external/l10n/gl.php
+++ b/apps/files_external/l10n/gl.php
@@ -1,19 +1,19 @@
 <?php $TRANSLATIONS = array(
 "Access granted" => "Concedeuse acceso",
-"Error configuring Dropbox storage" => "Erro configurando o almacenamento en Dropbox",
+"Error configuring Dropbox storage" => "Produciuse un erro ao configurar o almacenamento en Dropbox",
 "Grant access" => "Permitir o acceso",
 "Fill out all required fields" => "Cubrir todos os campos obrigatorios",
-"Please provide a valid Dropbox app key and secret." => "Dá o segredo e a clave correcta do aplicativo de Dropbox.",
-"Error configuring Google Drive storage" => "Erro configurando o almacenamento en Google Drive",
+"Please provide a valid Dropbox app key and secret." => "Dá o segredo e a chave correcta do aplicativo de Dropbox.",
+"Error configuring Google Drive storage" => "Produciuse un erro ao configurar o almacenamento en Google Drive",
 "External Storage" => "Almacenamento externo",
 "Mount point" => "Punto de montaxe",
 "Backend" => "Infraestrutura",
 "Configuration" => "Configuración",
 "Options" => "Opcións",
-"Applicable" => "Aplicable",
+"Applicable" => "Aplicábel",
 "Add mount point" => "Engadir un punto de montaxe",
 "None set" => "Ningún definido",
-"All Users" => "Tódolos usuarios",
+"All Users" => "Todos os usuarios",
 "Groups" => "Grupos",
 "Users" => "Usuarios",
 "Delete" => "Eliminar",
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
index fe06a5bc70e..d03f1a5005f 100644
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Contrasinal",
 "Submit" => "Enviar",
-"%s shared the folder %s with you" => "%s compartiu o cartafol %s contigo",
-"%s shared the file %s with you" => "%s compartiu ficheiro %s contigo",
-"Download" => "Baixar",
-"No preview available for" => "Sen vista previa dispoñible para ",
-"web services under your control" => "servizos web baixo o teu control"
+"%s shared the folder %s with you" => "%s compartiu o cartafol %s con vostede",
+"%s shared the file %s with you" => "%s compartiu o ficheiro %s con vostede",
+"Download" => "Descargar",
+"No preview available for" => "Sen vista previa dispoñíbel para",
+"web services under your control" => "servizos web baixo o seu control"
 );
diff --git a/apps/files_versions/l10n/gl.php b/apps/files_versions/l10n/gl.php
index 535a669d357..f10c1e16263 100644
--- a/apps/files_versions/l10n/gl.php
+++ b/apps/files_versions/l10n/gl.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Caducar todas as versións",
-"History" => "Historia",
+"Expire all versions" => "Caducan todas as versións",
+"History" => "Historial",
 "Versions" => "Versións",
-"This will delete all existing backup versions of your files" => "Isto eliminará todas as copias de seguranza que haxa dos teus ficheiros",
+"This will delete all existing backup versions of your files" => "Isto eliminará todas as copias de seguranza que haxa dos seus ficheiros",
 "Files Versioning" => "Sistema de versión de ficheiros",
 "Enable" => "Activar"
 );
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
index 6f8fdefad0c..a21fdc85f8d 100644
--- a/apps/files_versions/l10n/zh_TW.php
+++ b/apps/files_versions/l10n/zh_TW.php
@@ -2,5 +2,6 @@
 "Expire all versions" => "所有逾期的版本",
 "History" => "歷史",
 "Versions" => "版本",
+"Files Versioning" => "檔案版本化中...",
 "Enable" => "啟用"
 );
diff --git a/apps/user_webdavauth/l10n/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
new file mode 100644
index 00000000000..9bd32954b05
--- /dev/null
+++ b/apps/user_webdavauth/l10n/et_EE.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"WebDAV URL: http://" => "WebDAV URL: http://"
+);