Merge branch 'master' into oc_avatars

17 files changed, 184 insertions, 73 deletions

diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index bafbd0e0e9f..f1836fd4727 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -39,7 +39,8 @@
 					return;
 				}
 				// Escape
-				if(event.keyCode === 27 && self.options.closeOnEscape) {
+				if(event.keyCode === 27 && event.type === 'keydown' && self.options.closeOnEscape) {
+					event.stopImmediatePropagation();
 					self.close();
 					return false;
 				}
@@ -83,20 +84,21 @@
 			var self = this;
 			switch(key) {
 				case 'title':
-					var $title = $('<h3 class="oc-dialog-title">' + this.options.title
-						+ '</h3>'); //<hr class="oc-dialog-separator" />');
 					if(this.$title) {
-						this.$title.replaceWith($title);
+						this.$title.text(value);
 					} else {
+						var $title = $('<h3 class="oc-dialog-title">'
+							+ value
+							+ '</h3>');
 						this.$title = $title.prependTo(this.$dialog);
 					}
 					this._setSizes();
 					break;
 				case 'buttons':
-					var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
 					if(this.$buttonrow) {
-						this.$buttonrow.replaceWith($buttonrow);
+						this.$buttonrow.empty();
 					} else {
+						var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
 						this.$buttonrow = $buttonrow.appendTo(this.$dialog);
 					}
 					$.each(value, function(idx, val) {
@@ -124,6 +126,8 @@
 						$closeButton.on('click', function() {
 							self.close();
 						});
+					} else {
+						this.$dialog.find('.oc-dialog-close').remove();
 					}
 					break;
 				case 'width':
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index f184a1022bc..61b58d00fa6 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -244,9 +244,16 @@ var OCdialogs = {
 		return defer.promise();
 	},
 	_getFileList: function(dir, mimeType) {
+		if (typeof(mimeType) === "string") {
+			mimeType = [mimeType];
+		}
+
 		return $.getJSON(
 			OC.filePath('files', 'ajax', 'rawlist.php'),
-			{dir: dir, mimetype: mimeType}
+			{
+				dir: dir,
+				mimetypes: JSON.stringify(mimeType)
+			}
 		);
 	},
 	_determineValue: function(element) {
diff --git a/core/l10n/ach.php b/core/l10n/ach.php
new file mode 100644
index 00000000000..25f1137e8cd
--- /dev/null
+++ b/core/l10n/ach.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index a77924b1218..76973490125 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -2,6 +2,12 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s ha compartit »%s« amb tu",
 "group" => "grup",
+"Turned on maintenance mode" => "Activat el mode de manteniment",
+"Turned off maintenance mode" => "Desactivat el mode de manteniment",
+"Updated database" => "Actualitzada la base de dades",
+"Updating filecache, this may take really long..." => "Actualitzant la memòria de cau del fitxers, això pot trigar molt...",
+"Updated filecache" => "Actualitzada la memòria de cau dels fitxers",
+"... %d%% done ..." => "... %d%% fet ...",
 "Category type not provided." => "No s'ha especificat el tipus de categoria.",
 "No category to add?" => "No voleu afegir cap categoria?",
 "This category already exists: %s" => "Aquesta categoria ja existeix: %s",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 077f677e972..9e34e6f4ac3 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,7 +1,13 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s compatido  »%s« contigo",
+"%s shared »%s« with you" => "%s ha compatido  »%s« contigo",
 "group" => "grupo",
+"Turned on maintenance mode" => "Modo mantenimiento activado",
+"Turned off maintenance mode" => "Modo mantenimiento desactivado",
+"Updated database" => "Base de datos actualizada",
+"Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar bastante tiempo...",
+"Updated filecache" => "Caché de archivos actualizada",
+"... %d%% done ..." => "... %d%% hecho ...",
 "Category type not provided." => "Tipo de categoría no proporcionado.",
 "No category to add?" => "¿Ninguna categoría para añadir?",
 "This category already exists: %s" => "Esta categoría ya existe: %s",
@@ -30,17 +36,17 @@ $TRANSLATIONS = array(
 "November" => "Noviembre",
 "December" => "Diciembre",
 "Settings" => "Ajustes",
-"seconds ago" => "hace segundos",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"seconds ago" => "segundos antes",
+"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
 "today" => "hoy",
 "yesterday" => "ayer",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("Hace %n día","Hace %n días"),
 "last month" => "el mes pasado",
-"_%n month ago_::_%n months ago_" => array("",""),
-"months ago" => "hace meses",
+"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
+"months ago" => "meses antes",
 "last year" => "el año pasado",
-"years ago" => "hace años",
+"years ago" => "años antes",
 "Choose" => "Seleccionar",
 "Error loading file picker template" => "Error cargando la plantilla del seleccionador de archivos",
 "Yes" => "Sí",
@@ -49,12 +55,12 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "El tipo de objeto no está especificado.",
 "Error" => "Error",
 "The app name is not specified." => "El nombre de la aplicación no está especificado.",
-"The required file {file} is not installed!" => "¡El fichero requerido {file} no está instalado!",
+"The required file {file} is not installed!" => "¡El fichero {file} es necesario y no está instalado!",
 "Shared" => "Compartido",
 "Share" => "Compartir",
-"Error while sharing" => "Error mientras comparte",
-"Error while unsharing" => "Error mientras se deja de compartir",
-"Error while changing permissions" => "Error mientras se cambia permisos",
+"Error while sharing" => "Error al compartir",
+"Error while unsharing" => "Error al dejar de compartir",
+"Error while changing permissions" => "Error al cambiar permisos",
 "Shared with you and the group {group} by {owner}" => "Compartido contigo y el grupo {group} por {owner}",
 "Shared with you by {owner}" => "Compartido contigo por {owner}",
 "Share with" => "Compartir con",
@@ -84,6 +90,7 @@ $TRANSLATIONS = array(
 "Email sent" => "Correo electrónico enviado",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
+"%s password reset" => "%s restablecer contraseña",
 "Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local.",
 "Request failed!<br>Did you make sure your email/username was right?" => "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?",
@@ -101,9 +108,9 @@ $TRANSLATIONS = array(
 "Apps" => "Aplicaciones",
 "Admin" => "Administración",
 "Help" => "Ayuda",
-"Access forbidden" => "Acceso prohibido",
+"Access forbidden" => "Acceso denegado",
 "Cloud not found" => "No se encuentra la nube",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hey,\n\nsólo te hago saber que %s ha compartido %s contigo.\nEcha un ojo en: %s\n\n¡Un saludo!",
 "Edit categories" => "Editar categorías",
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
@@ -127,13 +134,13 @@ $TRANSLATIONS = array(
 "%s is available. Get more information on how to update." => "%s esta disponible. Obtener mas información de como actualizar.",
 "Log out" => "Salir",
 "Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!",
-"If you did not change your password recently, your account may be compromised!" => "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
+"If you did not change your password recently, your account may be compromised!" => "Si no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
 "Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.",
 "Lost your password?" => "¿Ha perdido su contraseña?",
 "remember" => "recordar",
 "Log in" => "Entrar",
 "Alternative Logins" => "Inicios de sesión alternativos",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Oye,<br><br>sólo te hago saber que %s compartido %s contigo,<br><a href=\"%s\">\nMíralo!</a><br><br>Disfrutalo!",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hey,<br><br>sólo te hago saber que %s ha compartido %s contigo.<br><a href=\"%s\">¡Echa un ojo!</a><br><br>¡Un saludo!",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 389251de8aa..953a30c01d5 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -2,6 +2,12 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s compartió \"%s\" con vos",
 "group" => "grupo",
+"Turned on maintenance mode" => "Modo de mantenimiento activado",
+"Turned off maintenance mode" => "Modo de mantenimiento desactivado",
+"Updated database" => "Base de datos actualizada",
+"Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar mucho tiempo...",
+"Updated filecache" => "Caché de archivos actualizada",
+"... %d%% done ..." => "... %d%% hecho ...",
 "Category type not provided." => "Tipo de categoría no provisto. ",
 "No category to add?" => "¿Ninguna categoría para añadir?",
 "This category already exists: %s" => "Esta categoría ya existe: %s",
@@ -31,13 +37,13 @@ $TRANSLATIONS = array(
 "December" => "diciembre",
 "Settings" => "Configuración",
 "seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
 "today" => "hoy",
 "yesterday" => "ayer",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("Hace %n día","Hace %n días"),
 "last month" => "el mes pasado",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
 "months ago" => "meses atrás",
 "last year" => "el año pasado",
 "years ago" => "años atrás",
@@ -84,6 +90,7 @@ $TRANSLATIONS = array(
 "Email sent" => "e-mail mandado",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
+"%s password reset" => "%s restablecer contraseña",
 "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña fue enviada a tu e-mail. <br> Si no lo recibís en un plazo de tiempo razonable,  revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador.",
 "Request failed!<br>Did you make sure your email/username was right?" => "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de correo electrónico o nombre de usuario son correcto?",
@@ -108,9 +115,11 @@ $TRANSLATIONS = array(
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor, habilitá la extensión OpenSSL de PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir las pruebas de reinicio de tu contraseña y tomar control de tu cuenta.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
new file mode 100644
index 00000000000..93c8e33f3e2
--- /dev/null
+++ b/core/l10n/es_MX.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index a2a0ff22ef6..5ce6ce9c821 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
 "_%n day ago_::_%n days ago_" => array("",""),
 "_%n month ago_::_%n months ago_" => array("",""),
 "Error" => "هه‌ڵه",
+"Share" => "هاوبەشی کردن",
 "Password" => "وشەی تێپەربو",
 "Username" => "ناوی به‌کارهێنه‌ر",
 "New password" => "وشەی نهێنی نوێ",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 942824ecb74..6d34d6e23c3 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,6 +1,13 @@
 <?php
 $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s delte «%s» med deg",
 "group" => "gruppe",
+"Turned on maintenance mode" => "Skrudde på vedlikehaldsmodus",
+"Turned off maintenance mode" => "Skrudde av vedlikehaldsmodus",
+"Updated database" => "Database oppdatert",
+"Updating filecache, this may take really long..." => "Oppdaterer mellomlager; dette kan ta ei god stund …",
+"Updated filecache" => "Mellomlager oppdatert",
+"... %d%% done ..." => "… %d %% ferdig …",
 "Category type not provided." => "Ingen kategoritype.",
 "No category to add?" => "Ingen kategori å leggja til?",
 "This category already exists: %s" => "Denne kategorien finst alt: %s",
@@ -30,17 +37,18 @@ $TRANSLATIONS = array(
 "December" => "Desember",
 "Settings" => "Innstillingar",
 "seconds ago" => "sekund sidan",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minutt sidan","%n minutt sidan"),
+"_%n hour ago_::_%n hours ago_" => array("%n time sidan","%n timar sidan"),
 "today" => "i dag",
 "yesterday" => "i går",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n dag sidan","%n dagar sidan"),
 "last month" => "førre månad",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n månad sidan","%n månadar sidan"),
 "months ago" => "månadar sidan",
 "last year" => "i fjor",
 "years ago" => "år sidan",
 "Choose" => "Vel",
+"Error loading file picker template" => "Klarte ikkje å lasta filveljarmalen",
 "Yes" => "Ja",
 "No" => "Nei",
 "Ok" => "Greitt",
@@ -59,6 +67,7 @@ $TRANSLATIONS = array(
 "Share with link" => "Del med lenkje",
 "Password protect" => "Passordvern",
 "Password" => "Passord",
+"Allow Public Upload" => "Tillat offentleg opplasting",
 "Email link to person" => "Send lenkja over e-post",
 "Send" => "Send",
 "Set expiration date" => "Set utløpsdato",
@@ -81,11 +90,14 @@ $TRANSLATIONS = array(
 "Email sent" => "E-post sendt",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
+"%s password reset" => "%s passordnullstilling",
 "Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Lenkja til å nullstilla passordet med er sendt til e-posten din.<br>Sjå i spam-/søppelmappa di viss du ikkje ser e-posten innan rimeleg tid.<br>Spør din lokale administrator viss han ikkje er der heller.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/brukarnamn?",
 "You will receive a link to reset your password via Email." => "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
 "Username" => "Brukarnamn",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
+"Yes, I really want to reset my password now" => "Ja, eg vil nullstilla passordet mitt no",
 "Request reset" => "Be om nullstilling",
 "Your password was reset" => "Passordet ditt er nullstilt",
 "To login page" => "Til innloggingssida",
@@ -98,13 +110,16 @@ $TRANSLATIONS = array(
 "Help" => "Hjelp",
 "Access forbidden" => "Tilgang forbudt",
 "Cloud not found" => "Fann ikkje skyen",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei der,\n\nnemner berre at %s delte %s med deg.\nSjå det her: %s\n\nMe talast!",
 "Edit categories" => "Endra kategoriar",
 "Add" => "Legg til",
 "Security Warning" => "Tryggleiksåtvaring",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen tilgjengeleg tilfeldig nummer-generator, ver venleg og aktiver OpenSSL-utvidinga i PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan ein trygg tilfeldig nummer-generator er det enklare for ein åtakar å gjetta seg fram til passordnullstillingskodar og dimed ta over kontoen din.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
 "Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
 "Advanced" => "Avansert",
 "Data folder" => "Datamappe",
@@ -125,6 +140,7 @@ $TRANSLATIONS = array(
 "remember" => "hugs",
 "Log in" => "Logg inn",
 "Alternative Logins" => "Alternative innloggingar",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei der,<br><br>nemner berre at %s delte «%s» med deg.<br><a href=\"%s\">Sjå det!</a><br><br>Me talast!<",
 "Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nqo.php b/core/l10n/nqo.php
new file mode 100644
index 00000000000..556cca20dac
--- /dev/null
+++ b/core/l10n/nqo.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 48f6dff6184..2162de0e48c 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -2,6 +2,12 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
 "group" => "grupa",
+"Turned on maintenance mode" => "Włączony tryb konserwacji",
+"Turned off maintenance mode" => "Wyłączony tryb konserwacji",
+"Updated database" => "Zaktualizuj bazę",
+"Updating filecache, this may take really long..." => "Aktualizowanie filecache, to może potrwać bardzo długo...",
+"Updated filecache" => "Zaktualizuj filecache",
+"... %d%% done ..." => "... %d%% udane ...",
 "Category type not provided." => "Nie podano typu kategorii.",
 "No category to add?" => "Brak kategorii do dodania?",
 "This category already exists: %s" => "Ta kategoria już istnieje: %s",
@@ -31,13 +37,13 @@ $TRANSLATIONS = array(
 "December" => "Grudzień",
 "Settings" => "Ustawienia",
 "seconds ago" => "sekund temu",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"),
+"_%n hour ago_::_%n hours ago_" => array("%n godzine temu","%n godzin temu","%n godzin temu"),
 "today" => "dziś",
 "yesterday" => "wczoraj",
-"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("%n dzień temu","%n dni temu","%n dni temu"),
 "last month" => "w zeszłym miesiącu",
-"_%n month ago_::_%n months ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"),
 "months ago" => "miesięcy temu",
 "last year" => "w zeszłym roku",
 "years ago" => "lat temu",
@@ -84,6 +90,7 @@ $TRANSLATIONS = array(
 "Email sent" => "E-mail wysłany",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
+"%s password reset" => "%s reset hasła",
 "Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 84762cde5e4..7b1c7b3702c 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -2,6 +2,12 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s compartilhou »%s« com você",
 "group" => "grupo",
+"Turned on maintenance mode" => "Ativar modo de manutenção",
+"Turned off maintenance mode" => "Desligar o modo de manutenção",
+"Updated database" => "Atualizar o banco de dados",
+"Updating filecache, this may take really long..." => "Atualizar cahe de arquivos, isto pode levar algum tempo...",
+"Updated filecache" => "Atualizar cache de arquivo",
+"... %d%% done ..." => "... %d%% concluído ...",
 "Category type not provided." => "Tipo de categoria não fornecido.",
 "No category to add?" => "Nenhuma categoria a adicionar?",
 "This category already exists: %s" => "Esta categoria já existe: %s",
@@ -31,13 +37,13 @@ $TRANSLATIONS = array(
 "December" => "dezembro",
 "Settings" => "Ajustes",
 "seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array(" ha %n minuto","ha %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("ha %n hora","ha %n horas"),
 "today" => "hoje",
 "yesterday" => "ontem",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("ha %n dia","ha %n dias"),
 "last month" => "último mês",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("ha %n mês","ha %n meses"),
 "months ago" => "meses atrás",
 "last year" => "último ano",
 "years ago" => "anos atrás",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 2afb9ef9b39..7f4e34cb555 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -2,6 +2,10 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s partilhado »%s« contigo",
 "group" => "grupo",
+"Turned on maintenance mode" => "Activado o modo de manutenção",
+"Turned off maintenance mode" => "Desactivado o modo de manutenção",
+"Updated database" => "Base de dados actualizada",
+"... %d%% done ..." => "... %d%% feito ...",
 "Category type not provided." => "Tipo de categoria não fornecido",
 "No category to add?" => "Nenhuma categoria para adicionar?",
 "This category already exists: %s" => "A categoria já existe: %s",
@@ -31,13 +35,13 @@ $TRANSLATIONS = array(
 "December" => "Dezembro",
 "Settings" => "Configurações",
 "seconds ago" => "Minutos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minuto atrás","%n minutos atrás"),
+"_%n hour ago_::_%n hours ago_" => array("%n hora atrás","%n horas atrás"),
 "today" => "hoje",
 "yesterday" => "ontem",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n dia atrás","%n dias atrás"),
 "last month" => "ultímo mês",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n mês atrás","%n meses atrás"),
 "months ago" => "meses atrás",
 "last year" => "ano passado",
 "years ago" => "anos atrás",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 3057ac2c689..6eaa909cad1 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -1,5 +1,13 @@
 <?php
 $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s ndau »%s« me ju",
+"group" => "grupi",
+"Turned on maintenance mode" => "Mënyra e mirëmbajtjes u aktivizua",
+"Turned off maintenance mode" => "Mënyra e mirëmbajtjes u çaktivizua",
+"Updated database" => "Database-i u azhurnua",
+"Updating filecache, this may take really long..." => "Po azhurnoj memorjen e skedarëve, mund të zgjasi pak...",
+"Updated filecache" => "Memorja e skedarëve u azhornua",
+"... %d%% done ..." => "... %d%% u krye ...",
 "Category type not provided." => "Mungon tipi i kategorisë.",
 "No category to add?" => "Asnjë kategori për të shtuar?",
 "This category already exists: %s" => "Kjo kategori tashmë ekziston: %s",
@@ -29,13 +37,13 @@ $TRANSLATIONS = array(
 "December" => "Dhjetor",
 "Settings" => "Parametra",
 "seconds ago" => "sekonda më parë",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minut më parë","%n minuta më parë"),
+"_%n hour ago_::_%n hours ago_" => array("%n orë më parë","%n orë më parë"),
 "today" => "sot",
 "yesterday" => "dje",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n ditë më parë","%n ditë më parë"),
 "last month" => "muajin e shkuar",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n muaj më parë","%n muaj më parë"),
 "months ago" => "muaj më parë",
 "last year" => "vitin e shkuar",
 "years ago" => "vite më parë",
@@ -82,11 +90,13 @@ $TRANSLATIONS = array(
 "Email sent" => "Email-i u dërgua",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
+"%s password reset" => "Kodi i %s -it u rivendos",
 "Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj.<br>Nëqoftëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme (spam).<br>Nëqoftëse nuk është as aty, pyesni administratorin tuaj lokal.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i saktë?",
 "You will receive a link to reset your password via Email." => "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
 "Username" => "Përdoruesi",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
 "Yes, I really want to reset my password now" => "Po, dua ta rivendos kodin tani",
 "Request reset" => "Bëj kërkesë për rivendosjen",
 "Your password was reset" => "Kodi yt u rivendos",
@@ -105,9 +115,11 @@ $TRANSLATIONS = array(
 "Add" => "Shto",
 "Security Warning" => "Paralajmërim sigurie",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nuk disponohet asnjë krijues numrash të rastësishëm, ju lutem aktivizoni shtesën PHP OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Pa një krijues numrash të rastësishëm të sigurt një person i huaj mund të jetë në gjendje të parashikojë kodin dhe të marri llogarinë tuaj.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
 "Create an <strong>admin account</strong>" => "Krijo një <strong>llogari administruesi</strong>",
 "Advanced" => "Të përparuara",
 "Data folder" => "Emri i dosjes",
@@ -119,6 +131,7 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Tablespace-i i database-it",
 "Database host" => "Pozicioni (host) i database-it",
 "Finish setup" => "Mbaro setup-in",
+"%s is available. Get more information on how to update." => "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin.",
 "Log out" => "Dalje",
 "Automatic logon rejected!" => "Hyrja automatike u refuzua!",
 "If you did not change your password recently, your account may be compromised!" => "Nqse nuk keni ndryshuar kodin kohët e fundit, llogaria juaj mund të jetë komprometuar.",
@@ -127,6 +140,7 @@ $TRANSLATIONS = array(
 "remember" => "kujto",
 "Log in" => "Hyrje",
 "Alternative Logins" => "Hyrje alternative",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Tungjatjeta,<br><br>duam t'ju njoftojmë që %s ka ndarë »%s« me ju.<br><a href=\"%s\">Shikojeni!</a><br><br>Përshëndetje!",
 "Updating ownCloud to version %s, this may take a while." => "Po azhurnoj ownCloud-in me versionin %s. Mund të zgjasi pak."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 8b6c261d64c..267e07189c7 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -2,6 +2,12 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s  sizinle »%s« paylaşımında bulundu",
 "group" => "grup",
+"Turned on maintenance mode" => "Bakım kipi etkinleştirildi",
+"Turned off maintenance mode" => "Bakım kipi kapatıldı",
+"Updated database" => "Veritabanı güncellendi",
+"Updating filecache, this may take really long..." => "Dosya önbelleği güncelleniyor. Bu, gerçekten uzun sürebilir.",
+"Updated filecache" => "Dosya önbelleği güncellendi",
+"... %d%% done ..." => "%%%d tamamlandı ...",
 "Category type not provided." => "Kategori türü girilmedi.",
 "No category to add?" => "Eklenecek kategori yok?",
 "This category already exists: %s" => "Bu kategori zaten mevcut:  %s",
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index f761e45d25f..3c8099591a1 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -5,11 +5,12 @@
  * later.
  * See the COPYING-README file.
  */
+namespace OC\Core\LostPassword;
 
-class OC_Core_LostPassword_Controller {
+class Controller {
 	protected static function displayLostPasswordPage($error, $requested) {
-		$isEncrypted = OC_App::isEnabled('files_encryption');
-		OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
+		$isEncrypted = \OC_App::isEnabled('files_encryption');
+		\OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
 			array('error' => $error,
 				'requested' => $requested,
 				'isEncrypted' => $isEncrypted));
@@ -19,12 +20,12 @@ class OC_Core_LostPassword_Controller {
 		$route_args = array();
 		$route_args['token'] = $args['token'];
 		$route_args['user'] = $args['user'];
-		OC_Template::printGuestPage('core/lostpassword', 'resetpassword',
+		\OC_Template::printGuestPage('core/lostpassword', 'resetpassword',
 			array('success' => $success, 'args' => $route_args));
 	}
 
 	protected static function checkToken($user, $token) {
-		return OC_Preferences::getValue($user, 'owncloud', 'lostpassword') === hash('sha256', $token);
+		return \OC_Preferences::getValue($user, 'owncloud', 'lostpassword') === hash('sha256', $token);
 	}
 
 	public static function index($args) {
@@ -33,7 +34,7 @@ class OC_Core_LostPassword_Controller {
 
 	public static function sendEmail($args) {
 
-		$isEncrypted = OC_App::isEnabled('files_encryption');
+		$isEncrypted = \OC_App::isEnabled('files_encryption');
 
 		if(!$isEncrypted || isset($_POST['continue'])) {
 			$continue = true;
@@ -41,26 +42,26 @@ class OC_Core_LostPassword_Controller {
 			$continue = false;
 		}
 
-		if (OC_User::userExists($_POST['user']) && $continue) {
-			$token = hash('sha256', OC_Util::generateRandomBytes(30).OC_Config::getValue('passwordsalt', ''));
-			OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword',
+		if (\OC_User::userExists($_POST['user']) && $continue) {
+			$token = hash('sha256', \OC_Util::generateRandomBytes(30).\OC_Config::getValue('passwordsalt', ''));
+			\OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword',
 				hash('sha256', $token)); // Hash the token again to prevent timing attacks
-			$email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
+			$email = \OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
 			if (!empty($email)) {
-				$link = OC_Helper::linkToRoute('core_lostpassword_reset',
+				$link = \OC_Helper::linkToRoute('core_lostpassword_reset',
 					array('user' => $_POST['user'], 'token' => $token));
-				$link = OC_Helper::makeURLAbsolute($link);
+				$link = \OC_Helper::makeURLAbsolute($link);
 
-				$tmpl = new OC_Template('core/lostpassword', 'email');
+				$tmpl = new \OC_Template('core/lostpassword', 'email');
 				$tmpl->assign('link', $link, false);
 				$msg = $tmpl->fetchPage();
-				$l = OC_L10N::get('core');
-				$from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
+				$l = \OC_L10N::get('core');
+				$from = \OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
 				try {
-					$defaults = new OC_Defaults();
-					OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getName())), $msg, $from, $defaults->getName());
+					$defaults = new \OC_Defaults();
+					\OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getName())), $msg, $from, $defaults->getName());
 				} catch (Exception $e) {
-					OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
+					\OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
 				}
 				self::displayLostPasswordPage(false, true);
 			} else {
@@ -84,9 +85,9 @@ class OC_Core_LostPassword_Controller {
 	public static function resetPassword($args) {
 		if (self::checkToken($args['user'], $args['token'])) {
 			if (isset($_POST['password'])) {
-				if (OC_User::setPassword($args['user'], $_POST['password'])) {
-					OC_Preferences::deleteKey($args['user'], 'owncloud', 'lostpassword');
-					OC_User::unsetMagicInCookie();
+				if (\OC_User::setPassword($args['user'], $_POST['password'])) {
+					\OC_Preferences::deleteKey($args['user'], 'owncloud', 'lostpassword');
+					\OC_User::unsetMagicInCookie();
 					self::displayResetPasswordPage(true, $args);
 				} else {
 					self::displayResetPasswordPage(false, $args);
diff --git a/core/routes.php b/core/routes.php
index 388fa934c4d..57e25c0f1f7 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -44,19 +44,18 @@ $this->create('core_ajax_routes', '/core/routes.json')
 	->action('OC_Router', 'JSRoutes');
 $this->create('core_ajax_preview', '/core/preview.png')
 	->actionInclude('core/ajax/preview.php');
-OC::$CLASSPATH['OC_Core_LostPassword_Controller'] = 'core/lostpassword/controller.php';
 $this->create('core_lostpassword_index', '/lostpassword/')
 	->get()
-	->action('OC_Core_LostPassword_Controller', 'index');
+	->action('OC\Core\LostPassword\Controller', 'index');
 $this->create('core_lostpassword_send_email', '/lostpassword/')
 	->post()
-	->action('OC_Core_LostPassword_Controller', 'sendEmail');
+	->action('OC\Core\LostPassword\Controller', 'sendEmail');
 $this->create('core_lostpassword_reset', '/lostpassword/reset/{token}/{user}')
 	->get()
-	->action('OC_Core_LostPassword_Controller', 'reset');
+	->action('OC\Core\LostPassword\Controller', 'reset');
 $this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{user}')
 	->post()
-	->action('OC_Core_LostPassword_Controller', 'resetPassword');
+	->action('OC\Core\LostPassword\Controller', 'resetPassword');
 
 // Avatar routes
 $this->create('core_avatar_get_tmp', '/avatar/tmp')