17 files changed, 395 insertions, 72 deletions

diff --git a/core/js/js.js b/core/js/js.js
index 5442039c294..3650d0520a7 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -48,8 +48,8 @@ function initL10N(app) {
 			t.cache[app] = [];
 		}
 	}
-	if (typeof t.plural_function == 'undefined') {
-		t.plural_function = function (n) {
+	if (typeof t.plural_function[app] == 'undefined') {
+		t.plural_function[app] = function (n) {
 			var p = (n != 1) ? 1 : 0;
 			return { 'nplural' : 2, 'plural' : p };
 		};
@@ -74,7 +74,7 @@ function initL10N(app) {
 			 Gettext._locale_data[domain].head.plural_func = eval("("+code+")");
 			 */
 			var code = 'var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) };';
-			t.plural_function = new Function("n", code);
+			t.plural_function[app] = new Function("n", code);
 		} else {
 			console.log("Syntax error in language file. Plural-Forms header is invalid ["+t.plural_forms+"]");
 		}
@@ -110,6 +110,10 @@ function t(app, text, vars, count){
 	}
 }
 t.cache = {};
+// different apps might or might not redefine the nplurals function correctly
+// this is to make sure that a "broken" app doesn't mess up with the
+// other app's plural function
+t.plural_function = {};
 
 /**
  * translate a string
@@ -126,7 +130,7 @@ function n(app, text_singular, text_plural, count, vars) {
 	if( typeof( t.cache[app][identifier] ) !== 'undefined' ){
 		var translation = t.cache[app][identifier];
 		if ($.isArray(translation)) {
-			var plural = t.plural_function(count);
+			var plural = t.plural_function[app](count);
 			return t(app, translation[plural.plural], vars, count);
 		}
 	}
@@ -478,11 +482,11 @@ OC.Breadcrumb={
 	},
 	_show:function(container, dir, leafname, leaflink){
 		var self = this;
-		
+
 		this._clear(container);
-		
+
 		// show home + path in subdirectories
-		if (dir && dir !== '/') {
+		if (dir) {
 			//add home
 			var link = OC.linkTo('files','index.php');
 
@@ -509,7 +513,7 @@ OC.Breadcrumb={
 				}
 			});
 		}
-		
+
 		//add leafname
 		if (leafname && leaflink) {
 			this._push(container, leafname, leaflink);
diff --git a/core/l10n/ak.php b/core/l10n/ak.php
new file mode 100644
index 00000000000..09e36ba1786
--- /dev/null
+++ b/core/l10n/ak.php
@@ -0,0 +1,9 @@
+<?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("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=n > 1;";
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 22be60bf03b..8aa68335458 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Edit tags" => "Rediger tags",
 "Error loading dialog template: {error}" => "Fejl ved indlæsning dialog skabelon: {error}",
 "No tags selected for deletion." => "Ingen tags markeret til sletning.",
+"Please reload the page." => "Genindlæs venligst siden",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
 "%s password reset" => "%s adgangskode nulstillet",
@@ -132,6 +133,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Adgang forbudt",
 "Cloud not found" => "Sky ikke fundet",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej med dig\n\nDette blot for at lade dig vide, at %s har delt %s med dig.\nSe det her: %s\n\n",
+"The share will expire on %s." => "Delingen vil udløbe om %s.",
 "Cheers!" => "Hej!",
 "Security Warning" => "Sikkerhedsadvarsel",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din PHP-version er sårbar overfor et NULL Byte angreb (CVE-2006-7243)",
@@ -152,6 +154,7 @@ $TRANSLATIONS = array(
 "Database host" => "Databasehost",
 "Finish setup" => "Afslut opsætning",
 "Finishing …" => "Færdigbehandling ...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Programmet forudsætter at JavaScript er aktiveret for at kunne afvikles korrekt. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Aktiver JavaScript</a> og genindlæs siden..",
 "%s is available. Get more information on how to update." => "%s er tilgængelig. Få mere information om, hvordan du opdaterer.",
 "Log out" => "Log ud",
 "Automatic logon rejected!" => "Automatisk login afvist!",
@@ -164,6 +167,8 @@ $TRANSLATIONS = array(
 "Log in" => "Log ind",
 "Alternative Logins" => "Alternative logins",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej med dig,<br><br>Dette blot for at lade dig vide, at %s har delt \"%s\" med dig.<br><a href=\"%s\">Se det her!</a><br><br>Hej",
+"This ownCloud instance is currently in single user mode." => "Denne ownCloud instans er lige nu i enkeltbruger tilstand.",
+"This means only administrators can use the instance." => "Det betyder at det kun er administrator, som kan benytte ownCloud.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren, hvis denne meddelelse fortsætter eller optrådte uventet.",
 "Thank you for your patience." => "Tak for din tålmodighed.",
 "Updating ownCloud to version %s, this may take a while." => "Opdatere Owncloud til version %s, dette kan tage et stykke tid.",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index ab6dcff47b8..f726a232f0d 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -5,9 +5,14 @@ $TRANSLATIONS = array(
 "Turned on maintenance mode" => "Η κατάσταση συντήρησης ενεργοποιήθηκε",
 "Turned off maintenance mode" => "Η κατάσταση συντήρησης απενεργοποιήθηκε",
 "Updated database" => "Ενημερωμένη βάση δεδομένων",
+"Updating filecache, this may take really long..." => "Ενημέρωση αποθηκευμένων αρχείων, αυτό μπορεί να πάρα πολύ ώρα...",
+"Updated filecache" => "Ενημέρωση αποθηκευμένων αρχείων",
+"... %d%% done ..." => "... %d%% ολοκληρώθηκαν ...",
 "No image or file provided" => "Δεν δόθηκε εικόνα ή αρχείο",
 "Unknown filetype" => "Άγνωστος τύπος αρχείου",
 "Invalid image" => "Μη έγκυρη εικόνα",
+"No temporary profile picture available, try again" => "Δεν υπάρχει προσωρινή φωτογραφία προφίλ διαθέσιμη, δοκιμάστε ξανά",
+"No crop data provided" => "Δεν δόθηκαν δεδομένα περικοπής",
 "Sunday" => "Κυριακή",
 "Monday" => "Δευτέρα",
 "Tuesday" => "Τρίτη",
@@ -30,25 +35,29 @@ $TRANSLATIONS = array(
 "Settings" => "Ρυθμίσεις",
 "seconds ago" => "δευτερόλεπτα πριν",
 "_%n minute ago_::_%n minutes ago_" => array("%n λεπτό πριν","%n λεπτά πριν"),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("%n ώρα πριν","%n ώρες πριν"),
 "today" => "σήμερα",
 "yesterday" => "χτες",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n ημέρα πριν","%n ημέρες πριν"),
 "last month" => "τελευταίο μήνα",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n μήνας πριν","%n μήνες πριν"),
 "months ago" => "μήνες πριν",
 "last year" => "τελευταίο χρόνο",
 "years ago" => "χρόνια πριν",
 "Choose" => "Επιλέξτε",
+"Error loading file picker template: {error}" => "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
 "Yes" => "Ναι",
 "No" => "Όχι",
 "Ok" => "Οκ",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Error loading message template: {error}" => "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} αρχείο διαφέρει","{count} αρχεία διαφέρουν"),
+"One file conflict" => "Ένα αρχείο διαφέρει",
 "Which files do you want to keep?" => "Ποια αρχεία θέλετε να κρατήσετε;",
 "If you select both versions, the copied file will have a number added to its name." => "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο.",
 "Cancel" => "Άκυρο",
 "Continue" => "Συνέχεια",
 "(all selected)" => "(όλα τα επιλεγμένα)",
+"({count} selected)" => "({count} επιλέχθησαν)",
 "Shared" => "Κοινόχρηστα",
 "Share" => "Διαμοιρασμός",
 "Error" => "Σφάλμα",
@@ -90,8 +99,12 @@ $TRANSLATIONS = array(
 "Delete" => "Διαγραφή",
 "Add" => "Προσθήκη",
 "Edit tags" => "Επεξεργασία ετικετών",
+"Error loading dialog template: {error}" => "Σφάλμα φόρτωσης προτύπου διαλόγων: {σφάλμα}",
+"No tags selected for deletion." => "Καμμία ετικέτα δεν επιλέχθηκε για διαγραφή.",
+"Please reload the page." => "Παρακαλώ επαναφορτώστε τη σελίδα.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ στείλτε αναφορά στην <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">κοινότητα ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
+"%s password reset" => "%s επαναφορά κωδικού πρόσβασης",
 "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {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 ." => "Ο σύνδεσμος για να επανακτήσετε τον κωδικό σας έχει σταλεί στο email <br>αν δεν το λάβετε μέσα σε ορισμένο διάστημα, ελέγξετε τους φακελλους σας spam/junk <br> αν δεν είναι εκεί ρωτήστε τον τοπικό σας διαχειριστή ",
 "Request failed!<br>Did you make sure your email/username was right?" => "Η αίτηση απέτυχε! Βεβαιωθηκατε ότι το email σας / username ειναι σωστο? ",
@@ -109,10 +122,18 @@ $TRANSLATIONS = array(
 "Apps" => "Εφαρμογές",
 "Admin" => "Διαχειριστής",
 "Help" => "Βοήθεια",
+"Error loading tags" => "Σφάλμα φόρτωσης ετικετών",
 "Tag already exists" => "Υπάρχει ήδη η ετικέτα",
+"Error deleting tag(s)" => "Σφάλμα διαγραφής ετικέτας(ων)",
+"Error tagging" => "Σφάλμα προσθήκης ετικέτας",
+"Error untagging" => "Σφάλμα αφαίρεσης ετικέτας",
+"Error favoriting" => "Σφάλμα προσθήκης στα αγαπημένα",
+"Error unfavoriting" => "Σφάλμα αφαίρεσης από τα αγαπημένα",
 "Access forbidden" => "Δεν επιτρέπεται η πρόσβαση",
 "Cloud not found" => "Δεν βρέθηκε νέφος",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Γειά χαρά,\n\nαπλά σας ενημερώνω πως ο %s μοιράστηκε το %s με εσάς.\nΔείτε το: %s\n\n",
 "The share will expire on %s." => "Ο διαμοιρασμός θα λήξει σε %s.",
+"Cheers!" => "Χαιρετισμούς!",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Η PHP ειναι ευαλωτη στην NULL Byte επιθεση (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Παρακαλώ ενημερώστε την εγκατάσταση της PHP ώστε να χρησιμοποιήσετε το %s με ασφάλεια.",
@@ -132,6 +153,7 @@ $TRANSLATIONS = array(
 "Database host" => "Διακομιστής βάσης δεδομένων",
 "Finish setup" => "Ολοκλήρωση εγκατάστασης",
 "Finishing …" => "Ολοκλήρωση...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Αυτή η εφαρμογή απαιτεί η JavaScript να είναι ενεργοποιημένη για σωστή λειτουργία. Παρακαλώ <a href=\"http://enable-javascript.com/\" target=\"_blank\">ενεργοποιήστε τη JavaScript</a> και επαναφορτώστε αυτή τη διεπαφή.",
 "%s is available. Get more information on how to update." => "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε.",
 "Log out" => "Αποσύνδεση",
 "Automatic logon rejected!" => "Απορρίφθηκε η αυτόματη σύνδεση!",
@@ -143,6 +165,9 @@ $TRANSLATIONS = array(
 "remember" => "απομνημόνευση",
 "Log in" => "Είσοδος",
 "Alternative Logins" => "Εναλλακτικές Συνδέσεις",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το »%s« με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
+"This ownCloud instance is currently in single user mode." => "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.",
+"This means only administrators can use the instance." => "Αυτό σημαίνει ότι μόνο διαχειριστές μπορούν να χρησιμοποιήσουν την εγκατάσταση.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Επικοινωνήστε με το διαχειριστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απρόσμενα.",
 "Thank you for your patience." => "Σας ευχαριστούμε για την υπομονή σας.",
 "Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο.",
diff --git a/core/l10n/es_CL.php b/core/l10n/es_CL.php
new file mode 100644
index 00000000000..819cc68a1c9
--- /dev/null
+++ b/core/l10n/es_CL.php
@@ -0,0 +1,12 @@
+<?php
+$TRANSLATIONS = array(
+"Settings" => "Configuración",
+"_%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("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Password" => "Clave",
+"Username" => "Usuario"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
index ffcdde48d47..776233c1ab5 100644
--- a/core/l10n/es_MX.php
+++ b/core/l10n/es_MX.php
@@ -1,9 +1,178 @@
 <?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("",""),
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
+"%s shared »%s« with you" => "%s ha compartido  »%s« contigo",
+"Couldn't send mail to following users: %s " => "No se pudo enviar el mensaje a los siguientes usuarios: %s",
+"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 ...",
+"No image or file provided" => "No se especificó ningún archivo o imagen",
+"Unknown filetype" => "Tipo de archivo desconocido",
+"Invalid image" => "Imagen inválida",
+"No temporary profile picture available, try again" => "No hay disponible una imagen temporal de perfil, pruebe de nuevo",
+"No crop data provided" => "No se proporcionó datos del recorte",
+"Sunday" => "Domingo",
+"Monday" => "Lunes",
+"Tuesday" => "Martes",
+"Wednesday" => "Miércoles",
+"Thursday" => "Jueves",
+"Friday" => "Viernes",
+"Saturday" => "Sábado",
+"January" => "Enero",
+"February" => "Febrero",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Mayo",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "Agosto",
+"September" => "Septiembre",
+"October" => "Octubre",
+"November" => "Noviembre",
+"December" => "Diciembre",
+"Settings" => "Ajustes",
+"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("Hace %n día","Hace %n días"),
+"last month" => "el mes pasado",
+"_%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" => "años antes",
+"Choose" => "Seleccionar",
+"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
+"Yes" => "Sí",
+"No" => "No",
+"Ok" => "Aceptar",
+"Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"),
+"One file conflict" => "Un conflicto de archivo",
+"Which files do you want to keep?" => "¿Que archivos deseas mantener?",
+"If you select both versions, the copied file will have a number added to its name." => "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre.",
+"Cancel" => "Cancelar",
+"Continue" => "Continuar",
+"(all selected)" => "(todos seleccionados)",
+"({count} selected)" => "({count} seleccionados)",
+"Error loading file exists template" => "Error cargando plantilla de archivo existente",
+"Shared" => "Compartido",
+"Share" => "Compartir",
+"Error" => "Error",
+"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 user or group …" => "Compartido con el usuario o con el grupo …",
+"Share link" => "Enlace compartido",
+"Password protect" => "Protección con contraseña",
+"Password" => "Contraseña",
+"Allow Public Upload" => "Permitir Subida Pública",
+"Email link to person" => "Enviar enlace por correo electrónico a una persona",
+"Send" => "Enviar",
+"Set expiration date" => "Establecer fecha de caducidad",
+"Expiration date" => "Fecha de caducidad",
+"Share via email:" => "Compartir por correo electrónico:",
+"No people found" => "No se encontró gente",
+"group" => "grupo",
+"Resharing is not allowed" => "No se permite compartir de nuevo",
+"Shared in {item} with {user}" => "Compartido en {item} con {user}",
+"Unshare" => "Dejar de compartir",
+"notify by email" => "notificar al usuario por correo electrónico",
+"can edit" => "puede editar",
+"access control" => "control de acceso",
+"create" => "crear",
+"update" => "actualizar",
+"delete" => "eliminar",
+"share" => "compartir",
+"Password protected" => "Protegido con contraseña",
+"Error unsetting expiration date" => "Error eliminando fecha de caducidad",
+"Error setting expiration date" => "Error estableciendo fecha de caducidad",
+"Sending ..." => "Enviando...",
+"Email sent" => "Correo electrónico enviado",
+"Warning" => "Precaución",
+"The object type is not specified." => "El tipo de objeto no está especificado.",
+"Enter new" => "Ingresar nueva",
+"Delete" => "Eliminar",
+"Add" => "Agregar",
+"Edit tags" => "Editar etiquetas",
+"Error loading dialog template: {error}" => "Error cargando plantilla de diálogo: {error}",
+"No tags selected for deletion." => "No hay etiquetas seleccionadas para borrar.",
+"Please reload the page." => "Vuelva a cargar la página.",
+"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?",
+"You will receive a link to reset your password via Email." => "Recibirá un enlace por correo electrónico para restablecer su contraseña",
+"Username" => "Nombre de usuario",
+"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?" => "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
+"Yes, I really want to reset my password now" => "Sí. Realmente deseo resetear mi contraseña ahora",
+"Reset" => "Reiniciar",
+"Your password was reset" => "Su contraseña fue restablecida",
+"To login page" => "A la página de inicio de sesión",
+"New password" => "Nueva contraseña",
+"Reset password" => "Restablecer contraseña",
+"Personal" => "Personal",
+"Users" => "Usuarios",
+"Apps" => "Aplicaciones",
+"Admin" => "Administración",
+"Help" => "Ayuda",
+"Error loading tags" => "Error cargando etiquetas.",
+"Tag already exists" => "La etiqueta ya existe",
+"Error deleting tag(s)" => "Error borrando etiqueta(s)",
+"Error tagging" => "Error al etiquetar",
+"Error untagging" => "Error al quitar etiqueta",
+"Error favoriting" => "Error al marcar como favorito",
+"Error unfavoriting" => "Error al quitar como favorito",
+"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\n" => "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
+"The share will expire on %s." => "El objeto dejará de ser compartido el %s.",
+"Cheers!" => "¡Saludos!",
+"Security Warning" => "Advertencia de seguridad",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Su versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Por favor, actualice su instalación PHP para usar %s con seguridad.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No está disponible un generador de números aleatorios seguro, por favor habilite 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 los tokens de restablecimiento de contraseñas y tomar el control de su cuenta.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información de cómo configurar apropiadamente su servidor, por favor vea 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 datos",
+"Configure the database" => "Configurar la base de datos",
+"will be used" => "se utilizarán",
+"Database user" => "Usuario de la base de datos",
+"Database password" => "Contraseña de la base de datos",
+"Database name" => "Nombre de la base de datos",
+"Database tablespace" => "Espacio de tablas de la base de datos",
+"Database host" => "Host de la base de datos",
+"Finish setup" => "Completar la instalación",
+"Finishing …" => "Finalizando …",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Esta aplicación requiere que se habilite JavaScript para su correcta operación.  Por favor <a href=\"http://enable-javascript.com/es\" target=\"_blank\">habilite JavaScript</a> y vuelva a cargar esta interfaz.",
+"%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 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.",
+"Server side authentication failed!" => "La autenticación a fallado en el servidor.",
+"Please contact your administrator." => "Por favor, contacte con el administrador.",
+"Lost your password?" => "¿Ha perdido su contraseña?",
+"remember" => "recordar",
+"Log in" => "Entrar",
+"Alternative Logins" => "Accesos Alternativos",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hola:<br><br>tan solo queremos informarte que %s compartió «%s» contigo.<br><a href=\"%s\">¡Míralo acá!</a><br><br>",
+"This ownCloud instance is currently in single user mode." => "Esta instalación de ownCloud se encuentra en modo de usuario único.",
+"This means only administrators can use the instance." => "Esto quiere decir que solo un administrador puede usarla.",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
+"Thank you for your patience." => "Gracias por su paciencia.",
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.",
+"This ownCloud instance is currently being updated, which may take a while." => "Esta versión de ownCloud se está actualizando, esto puede demorar un tiempo.",
+"Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue esta instancia de onwcloud tras un corto periodo de tiempo y continue usándolo."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index c58305ea7a9..d73355a4e2c 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -154,6 +154,7 @@ $TRANSLATIONS = array(
 "Database host" => "Serveur de la base de données",
 "Finish setup" => "Terminer l'installation",
 "Finishing …" => "En cours de finalisation...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Cette application nécessite que JavaScript soit activé pour fonctionner correctement.  Veuillez <a href=\"http://enable-javascript.com/\" target=\"_blank\">activer JavaScript</a> puis charger à nouveau cette interface.",
 "%s is available. Get more information on how to update." => "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour.",
 "Log out" => "Se déconnecter",
 "Automatic logon rejected!" => "Connexion automatique rejetée !",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 991ae3a838d..b0b5588dfc8 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -102,6 +102,7 @@ $TRANSLATIONS = array(
 "Edit tags" => "Címkék szerkesztése",
 "Error loading dialog template: {error}" => "Hiba a párbeszédpanel-sablon betöltésekor: {error}",
 "No tags selected for deletion." => "Nincs törlésre kijelölt címke.",
+"Please reload the page." => "Kérlek tölts be újra az oldalt",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A frissítés nem sikerült. Kérem értesítse erről a problémáról az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud közösséget</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
 "%s password reset" => "%s jelszó visszaállítás",
@@ -132,6 +133,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "A hozzáférés nem engedélyezett",
 "Cloud not found" => "A felhő nem található",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Szia!\\n\n\\n\nÉrtesítünk, hogy %s megosztotta veled a következőt: %s.\\n\nItt tudod megnézni: %s\\n\n\\n",
+"The share will expire on %s." => "A megosztás lejár ekkor %s",
 "Cheers!" => "Üdv.",
 "Security Warning" => "Biztonsági figyelmeztetés",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Az Ön PHP verziója sebezhető a NULL bájtos támadással szemben (CVE-2006-7243)",
@@ -152,6 +154,7 @@ $TRANSLATIONS = array(
 "Database host" => "Adatbázis szerver",
 "Finish setup" => "A beállítások befejezése",
 "Finishing …" => "Befejezés ...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Az alkalmazás megfelelő működéséhez szükség van JavaScript-re. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Engedélyezd a JavaScript-et</a> és töltsd újra az interfészt.",
 "%s is available. Get more information on how to update." => "%s rendelkezésre áll. További információ a frissítéshez.",
 "Log out" => "Kilépés",
 "Automatic logon rejected!" => "Az automatikus bejelentkezés sikertelen!",
@@ -164,6 +167,8 @@ $TRANSLATIONS = array(
 "Log in" => "Bejelentkezés",
 "Alternative Logins" => "Alternatív bejelentkezés",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Szia!<br><br>Értesítünk, hogy %s megosztotta veled a következőt: »%s«.<br><a href=\"%s\">Ide kattintva tudod megnézni</a><br><br>",
+"This ownCloud instance is currently in single user mode." => "Az Owncloud frissítés elezdődött egy felhasználós módban.",
+"This means only administrators can use the instance." => "Ez azt jelenti, hogy csak az adminisztrátor használhatja ezt a példányt",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Ha ezt az üzenetet már többször látod akkor keresd meg a rendszer adminját.",
 "Thank you for your patience." => "Köszönjük a türelmét.",
 "Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet.",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index aca262a8f30..2fa7ae8e3c5 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,5 +1,18 @@
 <?php
 $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s membagikan »%s« dengan anda",
+"Couldn't send mail to following users: %s " => "Tidak dapat mengirim Email ke pengguna berikut: %s",
+"Turned on maintenance mode" => "Hidupkan mode perawatan",
+"Turned off maintenance mode" => "Matikan mode perawatan",
+"Updated database" => "Basis data terbaru",
+"Updating filecache, this may take really long..." => "Memperbarui filecache, mungkin memerlukan waktu sangat lama...",
+"Updated filecache" => "Filecache terbaru",
+"... %d%% done ..." => "... %d%% selesai ...",
+"No image or file provided" => "Tidak ada gambar atau file yang disediakan",
+"Unknown filetype" => "Tipe berkas tak dikenal",
+"Invalid image" => "Gambar tidak sah",
+"No temporary profile picture available, try again" => "Tidak ada gambar profil sementara yang tersedia, coba lagi",
+"No crop data provided" => "Tidak ada data krop tersedia",
 "Sunday" => "Minggu",
 "Monday" => "Senin",
 "Tuesday" => "Selasa",
@@ -19,37 +32,49 @@ $TRANSLATIONS = array(
 "October" => "Oktober",
 "November" => "November",
 "December" => "Desember",
-"Settings" => "Setelan",
+"Settings" => "Pengaturan",
 "seconds ago" => "beberapa detik yang lalu",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n menit yang lalu"),
+"_%n hour ago_::_%n hours ago_" => array("%n jam yang lalu"),
 "today" => "hari ini",
 "yesterday" => "kemarin",
-"_%n day ago_::_%n days ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array("%n hari yang lalu"),
 "last month" => "bulan kemarin",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n bulan yang lalu"),
 "months ago" => "beberapa bulan lalu",
 "last year" => "tahun kemarin",
 "years ago" => "beberapa tahun lalu",
 "Choose" => "Pilih",
+"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
 "Yes" => "Ya",
 "No" => "Tidak",
 "Ok" => "Oke",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Error loading message template: {error}" => "Galat memuat templat pesan: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} berkas konflik"),
+"One file conflict" => "Satu berkas konflik",
+"Which files do you want to keep?" => "Berkas mana yang ingin anda pertahankan?",
+"If you select both versions, the copied file will have a number added to its name." => "Jika anda memilih kedua versi, berkas yang disalin akan memiliki nomor yang ditambahkan sesuai namanya.",
 "Cancel" => "Batal",
+"Continue" => "Lanjutkan",
+"(all selected)" => "(semua terpilih)",
+"({count} selected)" => "({count} terpilih)",
+"Error loading file exists template" => "Galat memuat templat berkas yang sudah ada",
 "Shared" => "Dibagikan",
 "Share" => "Bagikan",
 "Error" => "Galat",
 "Error while sharing" => "Galat ketika membagikan",
 "Error while unsharing" => "Galat ketika membatalkan pembagian",
 "Error while changing permissions" => "Galat ketika mengubah izin",
-"Shared with you and the group {group} by {owner}" => "Dibagikan dengan Anda dan grup {group} oleh {owner}",
-"Shared with you by {owner}" => "Dibagikan dengan Anda oleh {owner}",
+"Shared with you and the group {group} by {owner}" => "Dibagikan dengan anda dan grup {group} oleh {owner}",
+"Shared with you by {owner}" => "Dibagikan dengan anda oleh {owner}",
+"Share with user or group …" => "Bagikan dengan pengguna atau grup ...",
+"Share link" => "Bagikan tautan",
 "Password protect" => "Lindungi dengan sandi",
 "Password" => "Sandi",
+"Allow Public Upload" => "Izinkan Unggahan Publik",
 "Email link to person" => "Emailkan tautan ini ke orang",
 "Send" => "Kirim",
-"Set expiration date" => "Setel tanggal kedaluwarsa",
+"Set expiration date" => "Atur tanggal kedaluwarsa",
 "Expiration date" => "Tanggal kedaluwarsa",
 "Share via email:" => "Bagian lewat email:",
 "No people found" => "Tidak ada orang ditemukan",
@@ -57,42 +82,66 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "Berbagi ulang tidak diizinkan",
 "Shared in {item} with {user}" => "Dibagikan dalam {item} dengan {user}",
 "Unshare" => "Batalkan berbagi",
-"can edit" => "dapat mengedit",
+"notify by email" => "notifikasi via email",
+"can edit" => "dapat sunting",
 "access control" => "kontrol akses",
 "create" => "buat",
 "update" => "perbarui",
 "delete" => "hapus",
 "share" => "bagikan",
-"Password protected" => "Dilindungi sandi",
+"Password protected" => "Sandi dilindungi",
 "Error unsetting expiration date" => "Galat ketika menghapus tanggal kedaluwarsa",
-"Error setting expiration date" => "Galat ketika menyetel tanggal kedaluwarsa",
+"Error setting expiration date" => "Galat ketika mengatur tanggal kedaluwarsa",
 "Sending ..." => "Mengirim ...",
 "Email sent" => "Email terkirim",
 "Warning" => "Peringatan",
 "The object type is not specified." => "Tipe objek tidak ditentukan.",
+"Enter new" => "Masukkan baru",
 "Delete" => "Hapus",
 "Add" => "Tambah",
+"Edit tags" => "Sunting tag",
+"Error loading dialog template: {error}" => "Galat memuat templat dialog: {error}",
+"No tags selected for deletion." => "Tidak ada tag yang terpilih untuk dihapus.",
+"Please reload the page." => "Silakan muat ulang halaman.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
+"%s password reset" => "%s sandi diatur ulang",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {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 ." => "Tautan untuk mengatur ulang sandi anda telah dikirimkan ke email Anda.<br>Jika anda tidak menerimanya selama waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada juga, coba tanyakanlah kepada administrator lokal anda.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Permintaan gagal!<br>Apakah anda yakin email/nama pengguna anda benar?",
 "You will receive a link to reset your password via Email." => "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
 "Username" => "Nama pengguna",
-"Your password was reset" => "Sandi Anda telah disetel ulang",
+"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?" => "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?",
+"Yes, I really want to reset my password now" => "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang",
+"Reset" => "Atur Ulang",
+"Your password was reset" => "Sandi Anda telah diatur ulang",
 "To login page" => "Ke halaman masuk",
 "New password" => "Sandi baru",
-"Reset password" => "Setel ulang sandi",
+"Reset password" => "Atur ulang sandi",
 "Personal" => "Pribadi",
 "Users" => "Pengguna",
 "Apps" => "Aplikasi",
 "Admin" => "Admin",
 "Help" => "Bantuan",
+"Error loading tags" => "Galat saat memuat tag",
+"Tag already exists" => "Tag sudah ada",
+"Error deleting tag(s)" => "Galat saat menghapus tag",
+"Error tagging" => "Galat saat memberikan tag",
+"Error untagging" => "Galat saat menghapus tag",
+"Error favoriting" => "Galat saat memberikan sebagai favorit",
+"Error unfavoriting" => "Galat saat menghapus sebagai favorit",
 "Access forbidden" => "Akses ditolak",
 "Cloud not found" => "Cloud tidak ditemukan",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hai,\n\nhanya supaya anda tahu bahwa %s membagikan %s dengan anda.\nLihat: %s\n\n",
+"The share will expire on %s." => "Pembagian akan berakhir pada %s.",
+"Cheers!" => "Horee!",
 "Security Warning" => "Peringatan Keamanan",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Silakan perbarui instalasi PHP anda untuk menggunakan %s dengan aman.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generator acak yang aman tidak tersedia, silakan aktifkan ekstensi OpenSSL pada PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Tanpa generator acak, penyerang mungkin dapat menebak token penyetelan sandi dan mengambil alih akun Anda.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas Anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
 "Advanced" => "Lanjutan",
 "Data folder" => "Folder data",
@@ -104,14 +153,26 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Tablespace basis data",
 "Database host" => "Host basis data",
 "Finish setup" => "Selesaikan instalasi",
+"Finishing …" => "Menyelesaikan ...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Aplikasi ini memerlukan JavaScript yang diaktifkan untuk beroperasi dengan benar. Silahkan <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktifkan JavaScript</a> and re-load this interface.",
+"%s is available. Get more information on how to update." => "%s tersedia. Dapatkan informasi lebih lanjut tentang cara memperbarui.",
 "Log out" => "Keluar",
 "Automatic logon rejected!" => "Masuk otomatis ditolak!",
-"If you did not change your password recently, your account may be compromised!" => "Jika tidak pernah mengubah sandi Anda baru-baru ini, akun Anda mungkin dalam bahaya!",
-"Please change your password to secure your account again." => "Mohon ubah sandi Anda untuk mengamankan kembali akun Anda.",
+"If you did not change your password recently, your account may be compromised!" => "Jika anda tidak pernah mengubah sandi baru-baru ini, akun anda mungkin dalam bahaya!",
+"Please change your password to secure your account again." => "Silakan ubah sandi anda untuk mengamankan kembali akun anda.",
+"Server side authentication failed!" => "Otentikasi dari sisi server gagal!",
+"Please contact your administrator." => "Silahkan hubungi administrator anda.",
 "Lost your password?" => "Lupa sandi?",
 "remember" => "selalu masuk",
 "Log in" => "Masuk",
 "Alternative Logins" => "Cara Alternatif untuk Masuk",
-"Updating ownCloud to version %s, this may take a while." => "Memperbarui ownCloud ke versi %s, prosesnya akan berlangsung beberapa saat."
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hai,<br><br>hanya supaya anda tahu bahwa %s membagikan »%s« dengan anda.<br><a href=\"%s\">Lihat!</a><br><br>",
+"This ownCloud instance is currently in single user mode." => "ownCloud ini sedang dalam mode pengguna tunggal.",
+"This means only administrators can use the instance." => "Ini berarti hanya administrator yang dapat menggunakan ownCloud.",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "Hubungi administrator sistem anda jika pesan ini terus muncul atau muncul tiba-tiba.",
+"Thank you for your patience." => "Terima kasih atas kesabaran anda.",
+"Updating ownCloud to version %s, this may take a while." => "Memperbarui ownCloud ke versi %s, prosesnya akan berlangsung beberapa saat.",
+"This ownCloud instance is currently being updated, which may take a while." => "ownCloud ini sedang diperbarui, yang mungkin memakan waktu cukup lama.",
+"Please reload this page after a short time to continue using ownCloud." => "Muat ulang halaman ini setelah beberapa saat untuk tetap menggunakan ownCloud."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index c109f1294ea..aa737a71d09 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -41,9 +41,9 @@ $TRANSLATIONS = array(
 "_%n day ago_::_%n days ago_" => array("%n 日前"),
 "last month" => "一月前",
 "_%n month ago_::_%n months ago_" => array("%n ヶ月前"),
-"months ago" => "月前",
+"months ago" => "数ヶ月前",
 "last year" => "一年前",
-"years ago" => "年前",
+"years ago" => "数年前",
 "Choose" => "選択",
 "Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
 "Yes" => "はい",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index a25197cec3c..dc7cb8d3e73 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -1,16 +1,17 @@
 <?php
 $TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "%s에게 메일을 보낼 수 없습니다.",
-"Turned on maintenance mode" => "유지보수 모드 켜기",
-"Turned off maintenance mode" => "유지보수 모드 끄기",
+"%s shared »%s« with you" => "%s 님이 %s을(를) 공유하였습니다",
+"Couldn't send mail to following users: %s " => "%s 님에게 메일을 보낼 수 없습니다.",
+"Turned on maintenance mode" => "유지 보수 모드 켜짐",
+"Turned off maintenance mode" => "유지 보수 모드 꺼짐",
 "Updated database" => "데이터베이스 업데이트 됨",
-"Updating filecache, this may take really long..." => "파일 캐시 업데이트중, 시간이 약간 걸릴수 있습니다...",
-"Updated filecache" => "파일캐시 업데이트 됨",
+"Updating filecache, this may take really long..." => "파일 캐시 업데이트 중, 시간이 약간 걸릴 수 있습니다...",
+"Updated filecache" => "파일 캐시 업데이트 됨",
 "... %d%% done ..." => "... %d%% 완료됨 ...",
 "No image or file provided" => "이미지나 파일이 없음",
-"Unknown filetype" => "알려지지 않은 파일형식",
+"Unknown filetype" => "알려지지 않은 파일 형식",
 "Invalid image" => "잘못된 이미지",
-"No temporary profile picture available, try again" => "사용가능한 프로파일 사진이 없습니다. 재시도 하세요.",
+"No temporary profile picture available, try again" => "사용 가능한 프로필 사진이 없습니다. 다시 시도하십시오.",
 "No crop data provided" => "선택된 데이터가 없습니다.",
 "Sunday" => "일요일",
 "Monday" => "월요일",
@@ -44,17 +45,20 @@ $TRANSLATIONS = array(
 "last year" => "작년",
 "years ago" => "년 전",
 "Choose" => "선택",
+"Error loading file picker template: {error}" => "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
 "Yes" => "예",
 "No" => "아니요",
-"Ok" => "승락",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} 파일 중복"),
-"One file conflict" => "하나의 파일이 충돌",
-"Which files do you want to keep?" => "어느 파일들을 보관하고 싶습니까?",
-"If you select both versions, the copied file will have a number added to its name." => "두 버전을 모두 선택하면, 파일이름에 번호가 추가될 것입니다.",
+"Ok" => "확인",
+"Error loading message template: {error}" => "메시지 템플릿을 불러오는 중 오류 발생: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("파일 {count}개 충돌"),
+"One file conflict" => "파일 1개 충돌",
+"Which files do you want to keep?" => "어느 파일을 유지하시겠습니까?",
+"If you select both versions, the copied file will have a number added to its name." => "두 버전을 모두 선택하면, 파일 이름에 번호가 추가될 것입니다.",
 "Cancel" => "취소",
 "Continue" => "계속",
 "(all selected)" => "(모두 선택됨)",
-"({count} selected)" => "({count}개가 선택됨)",
+"({count} selected)" => "({count}개 선택됨)",
+"Error loading file exists template" => "파일 존재함 템플릿을 불러오는 중 오류 발생",
 "Shared" => "공유됨",
 "Share" => "공유",
 "Error" => "오류",
@@ -63,9 +67,11 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "권한 변경하는 중 오류 발생",
 "Shared with you and the group {group} by {owner}" => "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
 "Shared with you by {owner}" => "{owner} 님이 공유 중",
+"Share with user or group …" => "사용자 및 그룹과 공유...",
+"Share link" => "링크 공유",
 "Password protect" => "암호 보호",
 "Password" => "암호",
-"Allow Public Upload" => "퍼블릭 업로드 허용",
+"Allow Public Upload" => "공개 업로드 허용",
 "Email link to person" => "이메일 주소",
 "Send" => "전송",
 "Set expiration date" => "만료 날짜 설정",
@@ -76,6 +82,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "다시 공유할 수 없습니다",
 "Shared in {item} with {user}" => "{user} 님과 {item}에서 공유 중",
 "Unshare" => "공유 해제",
+"notify by email" => "이메일로 알림",
 "can edit" => "편집 가능",
 "access control" => "접근 제어",
 "create" => "생성",
@@ -89,20 +96,23 @@ $TRANSLATIONS = array(
 "Email sent" => "이메일 발송됨",
 "Warning" => "경고",
 "The object type is not specified." => "객체 유형이 지정되지 않았습니다.",
+"Enter new" => "새로운 값 입력",
 "Delete" => "삭제",
 "Add" => "추가",
-"Edit tags" => "태크 편집",
-"Please reload the page." => "페이지를 새로고침 해주세요",
+"Edit tags" => "태그 편집",
+"Error loading dialog template: {error}" => "대화 상자 템플릿을 불러오는 중 오류 발생: {error}",
+"No tags selected for deletion." => "삭제할 태그를 선택하지 않았습니다.",
+"Please reload the page." => "페이지를 새로 고치십시오.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 커뮤니티</a>에 보고해 주십시오.",
 "The update was successful. Redirecting you to ownCloud now." => "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
-"%s password reset" => "%s 비밀번호 재설정",
+"%s password reset" => "%s 암호 재설정",
 "Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {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 ." => "비밀번호를 초기화 하기 위한 링크가 이메일로 발송되었습니다.<br>만약 수분이내에 메일이 도착하지 않은 경우, 스팸 메일함을 확인하세요.<br>만약 없다면, 메일 관리자에게 문의하세요.",
-"Request failed!<br>Did you make sure your email/username was right?" => "요청이 실패했습니다!<br>email 주소와 사용자 명을 정확하게 넣으셨나요?",
+"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 ." => "암호를 초기화 하기 위한 링크가 이메일로 발송되었습니다.<br>만약 수 분 이내에 메일이 도착하지 않은 경우, 스팸 메일함을 확인하십시오.<br>스팸 메일함에도 없다면, 메일 관리자에게 문의하십시오.",
+"Request failed!<br>Did you make sure your email/username was right?" => "요청이 실패했습니다!<br>이메일 주소와 사용자 이름을 정확하게 입력하셨습니까?",
 "You will receive a link to reset your password via Email." => "이메일로 암호 재설정 링크를 보냈습니다.",
 "Username" => "사용자 이름",
-"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?" => "당신의 파일은 암호화 되어있습니다. 만약 복구키를 가지고 있지 않다면, 비밀번호를 초기화한 후에, 당신의 데이터를 복구할 수 없을 것입니다. 당신이 원하는 것이 확실하지 않다면, 계속진행하기 전에 관리자에게 문의하세요. 계속 진행하시겠습니까?",
-"Yes, I really want to reset my password now" => "네, 전 제 비밀번호를 리셋하길 원합니다",
+"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?" => "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?",
+"Yes, I really want to reset my password now" => "예, 지금 내 암호를 재설정합니다",
 "Reset" => "재설정",
 "Your password was reset" => "암호가 재설정되었습니다",
 "To login page" => "로그인 화면으로",
@@ -113,17 +123,25 @@ $TRANSLATIONS = array(
 "Apps" => "앱",
 "Admin" => "관리자",
 "Help" => "도움말",
+"Error loading tags" => "태그 불러오기 오류",
 "Tag already exists" => "태그가 이미 존재합니다",
+"Error deleting tag(s)" => "태그 삭제 오류",
+"Error tagging" => "태그 추가 오류",
+"Error untagging" => "태그 해제 오류",
+"Error favoriting" => "즐겨찾기 추가 오류",
+"Error unfavoriting" => "즐겨찾기 삭제 오류",
 "Access forbidden" => "접근 금지됨",
 "Cloud not found" => "클라우드를 찾을 수 없습니다",
-"Cheers!" => "화이팅!",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "안녕하세요,\n\n%s 님이 %s을(를) 공유하였음을 알려 드립니다.\n보기 링크: %s\n\n",
+"The share will expire on %s." => "이 공유는 %s 까지 유지됩니다.",
+"Cheers!" => "감사합니다!",
 "Security Warning" => "보안 경고",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "사용 중인 PHP 버전이 NULL 바이트 공격에 취약합니다 (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "%s의 보안을 위하여 PHP 버전을 업데이트하십시오.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "안전한 난수 생성기를 사용할 수 없습니다. PHP의 OpenSSL 확장을 활성화해 주십시오.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "안전한 난수 생성기를 사용하지 않으면 공격자가 암호 초기화 토큰을 추측하여 계정을 탈취할 수 있습니다.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하세요.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
 "Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong> 만들기",
 "Advanced" => "고급",
 "Data folder" => "데이터 폴더",
@@ -135,18 +153,26 @@ $TRANSLATIONS = array(
 "Database tablespace" => "데이터베이스 테이블 공간",
 "Database host" => "데이터베이스 호스트",
 "Finish setup" => "설치 완료",
-"Finishing …" => "종료중 ...",
-"%s is available. Get more information on how to update." => "%s는 사용가능합니다. 업데이트방법에 대해서 더 많은 정보를 얻으세요.",
+"Finishing …" => "완료 중 ...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "이 애플리케이션을 올바르게 사용하려면 자바스크립트를 활성화해야 합니다. <a href=\"http://enable-javascript.com/\" target=\"_blank\">자바스크립트를 활성화</a>한 다음 인터페이스를 새로 고치십시오.",
+"%s is available. Get more information on how to update." => "%s을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 자세한 정보를 얻으십시오.",
 "Log out" => "로그아웃",
 "Automatic logon rejected!" => "자동 로그인이 거부되었습니다!",
 "If you did not change your password recently, your account may be compromised!" => "최근에 암호를 변경하지 않았다면 계정이 탈취되었을 수도 있습니다!",
 "Please change your password to secure your account again." => "계정의 안전을 위하여 암호를 변경하십시오.",
 "Server side authentication failed!" => "서버 인증 실패!",
-"Please contact your administrator." => "관리자에게 문의하세요.",
+"Please contact your administrator." => "관리자에게 문의하십시오.",
 "Lost your password?" => "암호를 잊으셨습니까?",
 "remember" => "기억하기",
 "Log in" => "로그인",
-"Alternative Logins" => "대체 ",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud를 버전 %s(으)로 업데이트합니다. 잠시 기다려 주십시오."
+"Alternative Logins" => "대체 로그인",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "안녕하세요,<br><br>%s 님이 %s을(를) 공유하였음을 알려 드립니다.<br><a href=\"%s\">지금 보기!</a><br><br>",
+"This ownCloud instance is currently in single user mode." => "ownCloud 인스턴스가 현재 단일 사용자 모드로 동작 중입니다.",
+"This means only administrators can use the instance." => "현재 시스템 관리자만 인스턴스를 사용할 수 있습니다.",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "이 메시지가 계속 표시되거나, 예상하지 못하였을 때 표시된다면 시스템 관리자에게 연락하십시오",
+"Thank you for your patience." => "기다려 주셔서 감사합니다.",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud를 버전 %s(으)로 업데이트합니다. 잠시 기다려 주십시오.",
+"This ownCloud instance is currently being updated, which may take a while." => "ownCloud 인스턴스가 현재 업데이트 중입니다. 잠시만 기다려 주십시오.",
+"Please reload this page after a short time to continue using ownCloud." => "잠시 후 페이지를 다시 불러온 다음 ownCloud를 사용해 주십시오."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 4fd88e4a040..ad682e46ff9 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s delte »%s« med deg",
+"Unknown filetype" => "Ukjent filtype",
+"Invalid image" => "Ugyldig bilde",
 "Sunday" => "Søndag",
 "Monday" => "Mandag",
 "Tuesday" => "Tirsdag",
@@ -22,13 +24,13 @@ $TRANSLATIONS = array(
 "December" => "Desember",
 "Settings" => "Innstillinger",
 "seconds ago" => "sekunder siden",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n minutt siden","%n minutter siden"),
+"_%n hour ago_::_%n hours ago_" => array("%n time siden","%n timer siden"),
 "today" => "i dag",
 "yesterday" => "i går",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n dag siden","%n dager siden"),
 "last month" => "forrige måned",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n dag siden","%n dager siden"),
 "months ago" => "måneder siden",
 "last year" => "forrige år",
 "years ago" => "år siden",
@@ -38,6 +40,7 @@ $TRANSLATIONS = array(
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Avbryt",
+"Continue" => "Fortsett",
 "Shared" => "Delt",
 "Share" => "Del",
 "Error" => "Feil",
@@ -91,6 +94,7 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Database tabellområde",
 "Database host" => "Databasevert",
 "Finish setup" => "Fullfør oppsetting",
+"Finishing …" => "Ferdigstiller ...",
 "Log out" => "Logg ut",
 "Automatic logon rejected!" => "Automatisk pålogging avvist!",
 "If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index ec505f6f5fa..cd889e98e12 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -154,6 +154,7 @@ $TRANSLATIONS = array(
 "Database host" => "Хост базы данных",
 "Finish setup" => "Завершить установку",
 "Finishing …" => "Завершаем...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Это приложение требует включённый JavaScript для корректной работы. Пожалуйста, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включите JavaScript</a> и перезагрузите интерфейс.",
 "%s is available. Get more information on how to update." => "%s доступно. Получить дополнительную информацию о порядке обновления.",
 "Log out" => "Выйти",
 "Automatic logon rejected!" => "Автоматический вход в систему отключен!",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 657bc60c18e..933ccf55564 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -154,6 +154,7 @@ $TRANSLATIONS = array(
 "Database host" => "Gostitelj podatkovne zbirke",
 "Finish setup" => "Končaj nastavitev",
 "Finishing …" => "Poteka zaključevanje opravila ...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Program zahteva omogočeno skriptno podporo. Za pravilno delovanje je treba omogočiti <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript</a> in nato ponovno osvežiti vmesnik.",
 "%s is available. Get more information on how to update." => "%s je na voljo. Pridobite več podrobnosti za posodobitev.",
 "Log out" => "Odjava",
 "Automatic logon rejected!" => "Samodejno prijavljanje je zavrnjeno!",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 82164c5c5b9..301959c7e5c 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -106,7 +106,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. ownCloud'a yönlendiriliyor.",
 "%s password reset" => "%s parola sıfırlama",
-"Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}",
+"Use the following link to reset your password: {link}" => "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {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 ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk dizinini kontrol ediniz.<br> Eğer orada da bulamazsanız sistem yöneticinize sorunuz.",
 "Request failed!<br>Did you make sure your email/username was right?" => "İstek başarısız!<br>E-posta ve/veya kullanıcı adınızın doğru olduğundan emin misiniz?",
 "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantıyı e-posta olarak alacaksınız.",
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 325eb204868..ec55a65ea58 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -54,7 +54,7 @@
 		</p>
 		<p class="infield groupbottom">
 			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" placeholder=""
-				value="<?php p(OC_Helper::init_var('adminpass')); ?>" />
+				value="<?php p(OC_Helper::init_var('adminpass')); ?>" required />
 			<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
 			<img class="svg" id="adminpass-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt="" />
 			<input type="checkbox" id="show" name="show" />
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 45b7e39686d..89987625d63 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -105,7 +105,7 @@
 				<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
 					<li id="apps-management">
 						<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
-							<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
+							<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
 							<img class="icon svg" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
 							<span>
 								<?php p($l->t('Apps')); ?>