Merge branch 'master' into oc_error

29 files changed, 229 insertions, 9 deletions

diff --git a/core/css/auth.css b/core/css/auth.css
new file mode 100644
index 00000000000..2dedad5dd0f
--- /dev/null
+++ b/core/css/auth.css
@@ -0,0 +1,8 @@
+h2 { font-size:2em; font-weight:bold; margin-bottom:1em; white-space:nowrap; }
+ul.scopes { list-style:disc; }
+ul.scopes li { white-space:nowrap; }
+h2 img { width: 50% }
+#oauth { margin:4em auto 2em; width:20em; }
+#allow-auth { background-color:#5c3; text-shadow:#5e3 0 1px 0; color:#fff;
+-webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; }
+#deny-auth { padding:0; margin:.7em; border:0; background:none; font-size:1.2em; -moz-box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; -webkit-box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; }
diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png
new file mode 100644
index 00000000000..7c429a6a738
--- /dev/null
+++ b/core/img/remoteStorage-big.png
diff --git a/core/js/js.js b/core/js/js.js
index 90f1207780d..89a20a529f3 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -406,9 +406,9 @@ $(document).ready(function(){
 	$('#submit').hide();
 	$('#remember_login').hide();
 	$('#remember_login+label').hide();
-	$('#body-login input').keyup(function() {
+	$('input#user, input#password').keyup(function() {
 		var empty = false;
-		$('#body-login input').each(function() {
+		$('input#user, input#password').each(function() {
 			if ($(this).val() == '') {
 				empty = true;
 			}
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 9c71d0d731a..baeb8bd55bb 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "No s'ha facilitat cap nom per l'aplicació.",
+"No category to add?" => "No voleu afegir cap categoria?",
+"This category already exists: " => "Aquesta categoria ja existeix:",
 "Owncloud password reset" => "Restableix la contrasenya d'Owncloud",
+"ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
 "Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}",
 "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
 "Requested" => "Sol·licitat",
@@ -15,7 +19,10 @@
 "Apps" => "Aplicacions",
 "Admin" => "Administrador",
 "Help" => "Ajuda",
+"Access forbidden" => "Accés prohibit",
 "Cloud not found" => "No s'ha trobat el núvol",
+"Edit categories" => "Edita les categories",
+"Add" => "Afegeix",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
 "Password" => "Contrasenya",
 "Advanced" => "Avançat",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index b3e57981a6d..4ad9508f813 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Jméno aplikace nezadáno.",
+"No category to add?" => "Žádná kategorie k přidání?",
+"This category already exists: " => "Tato kategorie již existuje:",
 "Owncloud password reset" => "Reset hesla Owncloud",
+"ownCloud password reset" => "Reset hesla pro ownCloud",
 "Use the following link to reset your password: {link}" => "Heslo vyresetujete použitím následujícího odkazu: {link}",
 "You will receive a link to reset your password via Email." => "Bude Vám zaslán odkaz pro obnovu hesla",
 "Requested" => "Požadováno",
@@ -15,7 +19,10 @@
 "Apps" => "Aplikace",
 "Admin" => "Admin",
 "Help" => "Nápověda",
+"Access forbidden" => "Přístup odmítnut",
 "Cloud not found" => "Cloud nebyl nalezen",
+"Edit categories" => "Upravit kategorie",
+"Add" => "Přidat",
 "Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
 "Password" => "Heslo",
 "Advanced" => "Rozšířené volby",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 5e526440758..f29382f8ef1 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Applikationsname nicht angegeben",
+"No category to add?" => "Keine Kategorie hinzufügen?",
+"This category already exists: " => "Kategorie existiert bereits:",
 "Owncloud password reset" => "OwnCloud Passwort zurücksetzen",
+"ownCloud password reset" => "ownCloud Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutze folgenden Link, um dein Passwort zurückzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.",
 "Requested" => "Angefragt",
@@ -15,7 +19,10 @@
 "Apps" => "Anwendungen",
 "Admin" => "Verwaltung",
 "Help" => "Hilfe",
+"Access forbidden" => "Zugang verboten",
 "Cloud not found" => "Cloud nicht verfügbar",
+"Edit categories" => "Kategorien ändern",
+"Add" => "Hinzufügen",
 "Create an <strong>admin account</strong>" => "<strong>Admin-Konto</strong> anlegen",
 "Password" => "Passwort",
 "Advanced" => "Erweitert",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 213994524ff..1adf14af967 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Δε προσδιορίστηκε όνομα εφαρμογής",
+"No category to add?" => "Δεν έχετε να προστέσθέσεται μια κα",
+"This category already exists: " => "Αυτή η κατηγορία υπάρχει ήδη",
 "Owncloud password reset" => "Επανέκδοση κωδικού για το Owncloud",
+"ownCloud password reset" => "Επαναφορά κωδικού ownCloud",
 "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
 "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
 "Requested" => "Ζητήθησαν",
@@ -15,7 +19,10 @@
 "Apps" => "Εφαρμογές",
 "Admin" => "Διαχειριστής",
 "Help" => "Βοήθεια",
+"Access forbidden" => "Δεν επιτρέπεται η πρόσβαση",
 "Cloud not found" => "Δεν βρέθηκε σύννεφο",
+"Edit categories" => "Επεξεργασία κατηγορίας",
+"Add" => "Προσθήκη",
 "Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
 "Password" => "Κωδικός",
 "Advanced" => "Για προχωρημένους",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 35d9d1150d8..2d6068ed5f8 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Nombre de la aplicación no provisto.",
+"No category to add?" => "¿Ninguna categoría para agregar?",
+"This category already exists: " => "Esta categoría ya existe: ",
 "Owncloud password reset" => "Restablecer contraseña de ownCloud",
+"ownCloud password reset" => "Reiniciar contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
 "You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
 "Requested" => "Pedido",
@@ -15,13 +19,16 @@
 "Apps" => "Aplicaciones",
 "Admin" => "Administrador",
 "Help" => "Ayuda",
+"Access forbidden" => "Acceso denegado",
 "Cloud not found" => "No se ha encontrado la nube",
+"Edit categories" => "Editar categorías",
+"Add" => "Añadir",
 "Create an <strong>admin account</strong>" => "Crea una <strong>cuenta de administrador</strong>",
 "Password" => "Contraseña",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
 "Configure the database" => "Configurar la base de datos",
-"will be used" => "serán utilizados",
+"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",
@@ -33,7 +40,7 @@
 "Lost your password?" => "¿Has perdido tu contraseña?",
 "remember" => "recuérdame",
 "Log in" => "Entrar",
-"You are logged out." => "Has cerrado sesión.",
+"You are logged out." => "Has cerrado la sesión.",
 "prev" => "anterior",
 "next" => "siguiente"
 );
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 82a2e1c1717..7ecfb278afd 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Rakenduse nime pole sisestatud.",
+"No category to add?" => "Pole kategooriat, mida lisada?",
+"This category already exists: " => "See kategooria on juba olemas: ",
 "Owncloud password reset" => "Owncloud parooli taastamine",
+"ownCloud password reset" => "ownCloud parooli taastamine",
 "Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
 "You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
 "Requested" => "Kohustuslik",
@@ -15,7 +19,10 @@
 "Apps" => "Programmid",
 "Admin" => "Admin",
 "Help" => "Abiinfo",
+"Access forbidden" => "Ligipääs on keelatud",
 "Cloud not found" => "Pilve ei leitud",
+"Edit categories" => "Muuda kategooriaid",
+"Add" => "Lisa",
 "Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
 "Password" => "Parool",
 "Advanced" => "Lisavalikud",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index f59d98297d7..3159350183f 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Aplikazioaren izena falta da",
+"No category to add?" => "Ez dago gehitzeko kategoriarik?",
+"This category already exists: " => "Kategoria hau dagoeneko existitzen da:",
 "Owncloud password reset" => "Owncloudeko pasahitza berrezarri",
+"ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
 "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
 "Requested" => "Eskatuta",
@@ -15,7 +19,10 @@
 "Apps" => "Aplikazioak",
 "Admin" => "Kudeatzailea",
 "Help" => "Laguntza",
+"Access forbidden" => "Sarrera debekatuta",
 "Cloud not found" => "Ez da hodeia aurkitu",
+"Edit categories" => "Editatu kategoriak",
+"Add" => "Gehitu",
 "Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat",
 "Password" => "Pasahitza",
 "Advanced" => "Aurreratua",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
new file mode 100644
index 00000000000..e3cc3feddd8
--- /dev/null
+++ b/core/l10n/fa.php
@@ -0,0 +1,46 @@
+<?php $TRANSLATIONS = array(
+"Application name not provided." => "نام برنامه پیدا نشد",
+"No category to add?" => "آیا گروه دیگری برای افزودن ندارید",
+"This category already exists: " => "این گروه از قبل اضافه شده",
+"Owncloud password reset" => "گذرواژه ابرهای شما تغییرکرد",
+"ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
+"Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
+"You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
+"Requested" => "درخواست",
+"Login failed!" => "ورود ناموفق بود",
+"Username" => "شناسه",
+"Request reset" => "درخواست دوباره سازی",
+"Your password was reset" => "گذرواژه شما تغییرکرد",
+"To login page" => "به صفحه ورود",
+"New password" => "گذرواژه جدید",
+"Reset password" => "دوباره سازی گذرواژه",
+"Personal" => "شخصی",
+"Users" => "کاربر ها",
+"Apps" => "برنامه",
+"Admin" => "مدیر",
+"Help" => "کمک",
+"Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
+"Cloud not found" => "پیدا نشد",
+"Edit categories" => "ویرایش گروه ها",
+"Add" => "افزودن",
+"Create an <strong>admin account</strong>" => "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
+"Password" => "گذرواژه",
+"Advanced" => "حرفه ای",
+"Data folder" => "پوشه اطلاعاتی",
+"Configure the database" => "پایگاه داده برنامه ریزی شدند",
+"will be used" => "استفاده خواهد شد",
+"Database user" => "شناسه پایگاه داده",
+"Database password" => "پسورد پایگاه داده",
+"Database name" => "نام پایگاه داده",
+"Database host" => "هاست پایگاه داده",
+"Finish setup" => "اتمام نصب",
+"web services under your control" => "سرویس وب تحت کنترل شما",
+"Log out" => "خروج",
+"Settings" => "تنظیمات",
+"Lost your password?" => "آیا گذرواژه تان را به یاد نمی آورید؟",
+"remember" => "بیاد آوری",
+"Log in" => "ورود",
+"You are logged out." => "شما خارج شدید",
+"prev" => "بازگشت",
+"next" => "بعدی"
+);
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
new file mode 100644
index 00000000000..5d2e3310c35
--- /dev/null
+++ b/core/l10n/fi_FI.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Username" => "Käyttäjätunnus",
+"Password" => "Salasana",
+"Log out" => "Kirjaudu ulos",
+"You are logged out." => "Olet kirjautunut ulos."
+);
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 64215442d89..8459fbbb664 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Nom de l'application non fourni.",
+"No category to add?" => "Pas de catégorie à ajouter ?",
+"This category already exists: " => "Cette catégorie existe déjà : ",
 "Owncloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
+"ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
 "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe",
 "Requested" => "Demande envoyée",
@@ -15,7 +19,10 @@
 "Apps" => "Applications",
 "Admin" => "Administration",
 "Help" => "Aide",
+"Access forbidden" => "Accès interdit",
 "Cloud not found" => "Introuvable",
+"Edit categories" => "Modifier les catégories",
+"Add" => "Ajouter",
 "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
 "Password" => "Mot de passe",
 "Advanced" => "Avancé",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 9a3637de61e..fc1337d8def 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -1,9 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Alkalmazásnév hiányzik",
+"No category to add?" => "Nincs hozzáadandó kategória?",
+"This category already exists: " => "Ez a kategória már létezik",
+"Owncloud password reset" => "ownCloud jelszó-visszaállítás",
+"ownCloud password reset" => "ownCloud jelszó-visszaállítás",
+"Use the following link to reset your password: {link}" => "Használja az alábbi linket a jelszó-visszaállításhoz: {link}",
 "You will receive a link to reset your password via Email." => "Egy e-mailben kap értesítést a jelszóváltoztatás módjáról.",
 "Requested" => "Kért",
 "Login failed!" => "Belépés sikertelen!",
 "Username" => "Felhasználói név",
+"Request reset" => "Visszaállítás igénylése",
 "Your password was reset" => "Jelszó megváltoztatásra került",
+"To login page" => "A bejelentkező ablakhoz",
 "New password" => "Új jelszó",
 "Reset password" => "Jelszó beállítás",
 "Personal" => "Személyes",
@@ -11,7 +19,10 @@
 "Apps" => "Alkalmazások",
 "Admin" => "Adminisztráció",
 "Help" => "Súgó",
+"Access forbidden" => "Hozzáférés tiltva",
 "Cloud not found" => "Nem talált felhő",
+"Edit categories" => "Kategóriák szerkesztése",
+"Add" => "Hozzáadás",
 "Create an <strong>admin account</strong>" => "<strong>Adminisztrációs fiók</strong> létrehozása",
 "Password" => "Jelszó",
 "Advanced" => "Fejlett",
@@ -23,6 +34,7 @@
 "Database name" => "Adatbázis név",
 "Database host" => "Adatbázis szerver",
 "Finish setup" => "Beállítások befejezése",
+"web services under your control" => "webszolgáltatások az irányításod alatt",
 "Log out" => "Kilépés",
 "Settings" => "Beállítások",
 "Lost your password?" => "Elfelejtett jelszó?",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 2d41601d69a..97e8dfc147b 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -1,15 +1,24 @@
 <?php $TRANSLATIONS = array(
+"This category already exists: " => "Iste categoria jam existe:",
+"Owncloud password reset" => "Reinitialisation del contrasigno de Owncloud",
+"ownCloud password reset" => "Reinitialisation del contrasigno de ownCLoud",
 "Requested" => "Requestate",
-"Login failed!" => "Initio de session fallate!",
+"Login failed!" => "Initio de session fallite!",
 "Username" => "Nomine de usator",
 "Request reset" => "Requestar reinitialisation",
 "Your password was reset" => "Tu contrasigno esseva reinitialisate",
+"To login page" => "al pagina de initio de session",
 "New password" => "Nove contrasigno",
 "Reset password" => "Reinitialisar contrasigno",
+"Personal" => "Personal",
 "Users" => "Usatores",
 "Apps" => "Applicationes",
+"Admin" => "Administration",
 "Help" => "Adjuta",
+"Access forbidden" => "Accesso prohibite",
 "Cloud not found" => "Nube non trovate",
+"Edit categories" => "Modificar categorias",
+"Add" => "Adder",
 "Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
 "Password" => "Contrasigno",
 "Advanced" => "Avantiate",
@@ -19,9 +28,14 @@
 "Database user" => "Usator de base de datos",
 "Database password" => "Contrasigno de base de datos",
 "Database name" => "Nomine de base de datos",
+"Database host" => "Hospite de base de datos",
+"web services under your control" => "servicios web sub tu controlo",
 "Log out" => "Clauder le session",
 "Settings" => "Configurationes",
+"Lost your password?" => "Tu perdeva le contrasigno?",
 "remember" => "memora",
+"Log in" => "Aperir session",
+"You are logged out." => "Tu session ha essite claudite.",
 "prev" => "prev",
 "next" => "prox"
 );
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 26417590e01..ce2352f0335 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Nome dell'applicazione non fornito.",
+"No category to add?" => "Nessuna categoria da aggiungere?",
+"This category already exists: " => "Questa categoria esiste già: ",
 "Owncloud password reset" => "Ripristino password di Owncloud",
+"ownCloud password reset" => "Ripristino password di ownCloud",
 "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
 "You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email",
 "Requested" => "Richiesto",
@@ -15,7 +19,10 @@
 "Apps" => "Applicazioni",
 "Admin" => "Admin",
 "Help" => "Aiuto",
+"Access forbidden" => "Accesso negato",
 "Cloud not found" => "Cloud non trovata",
+"Edit categories" => "Modifica le categorie",
+"Add" => "Aggiungi",
 "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
 "Password" => "Password",
 "Advanced" => "Avanzate",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 2798a3c7c26..44396b94f81 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "응용 프로그램의 이름이 규정되어 있지 않습니다. ",
+"No category to add?" => "추가할 카테고리가 없습니까?",
+"This category already exists: " => "이 카테고리는 이미 존재합니다:",
 "Owncloud password reset" => "Owncloud 암호 재설정",
+"ownCloud password reset" => "ownCloud 비밀번호 재설정",
 "Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 초기화할 수 있습니다: {link}",
 "You will receive a link to reset your password via Email." => "전자 우편으로 암호 재설정 링크를 보냈습니다.",
 "Requested" => "요청함",
@@ -15,7 +19,10 @@
 "Apps" => "프로그램",
 "Admin" => "관리자",
 "Help" => "도움말",
+"Access forbidden" => "접근 금지",
 "Cloud not found" => "클라우드를 찾을 수 없습니다",
+"Edit categories" => "카테고리 편집",
+"Add" => "추가",
 "Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong>을 만드십시오",
 "Password" => "암호",
 "Advanced" => "고급",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 0d88ec75790..7baac36f390 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Име за апликацијата не е доставено.",
+"No category to add?" => "Нема категорија да се додаде?",
+"This category already exists: " => "Оваа категорија веќе постои:",
 "Owncloud password reset" => "Ресетирање на Owncloud лозинка",
+"ownCloud password reset" => "ресетирање на лозинка за ownCloud",
 "Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
 "You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
 "Requested" => "Побарано",
@@ -15,7 +19,10 @@
 "Apps" => "Апликации",
 "Admin" => "Админ",
 "Help" => "Помош",
+"Access forbidden" => "Забранет пристап",
 "Cloud not found" => "Облакот не е најден",
+"Edit categories" => "Уреди категории",
+"Add" => "Додади",
 "Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
 "Password" => "Лозинка",
 "Advanced" => "Напредно",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index bf34440b737..5cf7a04b41d 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -16,6 +16,7 @@
 "Admin" => "Admin",
 "Help" => "Bantuan",
 "Cloud not found" => "Awan tidak dijumpai",
+"Add" => "Tambah",
 "Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
 "Password" => "Kata laluan",
 "Advanced" => "Maju",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 3d444c92604..0b804f4d176 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Owncloud password reset" => "reset je Owncloud wachtwoord",
+"Application name not provided." => "Applicatie naam niet gegeven.",
+"No category to add?" => "Geen categorie toevoegen?",
+"This category already exists: " => "De categorie bestaat al.",
+"Owncloud password reset" => "Reset je ownCloud wachtwoord",
+"ownCloud password reset" => "ownCloud wachtwoord herstellen",
 "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
 "You will receive a link to reset your password via Email." => "U ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
 "Requested" => "Gevraagd",
@@ -15,7 +19,10 @@
 "Apps" => "Apps",
 "Admin" => "Beheerder",
 "Help" => "Help",
+"Access forbidden" => "Toegang verboden",
 "Cloud not found" => "Cloud niet gevonden",
+"Edit categories" => "Wijzigen categorieën",
+"Add" => "Toevoegen",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
 "Password" => "Wachtwoord",
 "Advanced" => "Geavanceerd",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index ecafb3d777d..6f01d666f78 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Nome da aplicação não foi fornecido.",
+"No category to add?" => "Nenhuma categoria adicionada?",
+"This category already exists: " => "Essa categoria já existe",
 "Owncloud password reset" => "Mudar senha do Owncloud",
+"ownCloud password reset" => "Redefinir senha ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
 "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.",
 "Requested" => "Solicitado",
@@ -15,7 +19,10 @@
 "Apps" => "Apps",
 "Admin" => "Admin",
 "Help" => "Ajuda",
+"Access forbidden" => "Acesso Proibido",
 "Cloud not found" => "Cloud não encontrado",
+"Edit categories" => "Editar categorias",
+"Add" => "Adicionar",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta</strong> de <strong>administrador</strong>",
 "Password" => "Senha",
 "Advanced" => "Avançado",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 11ad408b8e5..b09b4f56115 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Meno aplikácie nezadané.",
+"No category to add?" => "Žiadna kategória pre pridanie?",
+"This category already exists: " => "Táto kategória už existuje:",
 "Owncloud password reset" => "Obnova Owncloud hesla",
+"ownCloud password reset" => "Obnovenie hesla pre ownCloud",
 "Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte E-mailom.",
 "Requested" => "Požiadané",
@@ -15,7 +19,10 @@
 "Apps" => "Aplikácie",
 "Admin" => "Administrácia",
 "Help" => "Pomoc",
+"Access forbidden" => "Prístup odmietnutý",
 "Cloud not found" => "Nedokážem nájsť",
+"Edit categories" => "Úprava kategórií",
+"Add" => "Pridať",
 "Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
 "Password" => "Heslo",
 "Advanced" => "Pokročilé",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index d608db96162..5cd8498ea25 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Ime aplikacije ni bilo določeno.",
+"No category to add?" => "Ni kategorije za dodajanje?",
+"This category already exists: " => "Ta kategorija že obstaja:",
 "Owncloud password reset" => "Ponastavi ownCloud geslo",
+"ownCloud password reset" => "Ponastavitev gesla ownCloud",
 "Use the following link to reset your password: {link}" => "Uporabite sledečo povezavo za ponastavitev gesla: {link}",
 "You will receive a link to reset your password via Email." => "Na e-pošto boste prejeli povezavo s katero lahko ponastavite vaše geslo.",
 "Requested" => "Zahtevano",
@@ -12,10 +16,13 @@
 "Reset password" => "Ponastavi geslo",
 "Personal" => "Osebno",
 "Users" => "Uporabniki",
-"Apps" => "Apps",
+"Apps" => "Aplikacije",
 "Admin" => "Admin",
 "Help" => "Pomoč",
+"Access forbidden" => "Dostop je prepovedan",
 "Cloud not found" => "Oblak ni bil najden",
+"Edit categories" => "Uredi kategorije",
+"Add" => "Dodaj",
 "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>",
 "Password" => "Geslo",
 "Advanced" => "Napredne možnosti",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 1774d840040..28283818561 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "ยังไม่ได้ตั้งชื่อแอพพลิเคชั่น",
+"No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?",
+"This category already exists: " => "หมวดหมู่นี้มีอยู่แล้ว: ",
 "Owncloud password reset" => "เปลี่ยนรหัสผ่านใน Owncloud",
+"ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud",
 "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
 "You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
 "Requested" => "ส่งคำร้องเรียบร้อยแล้ว",
@@ -15,7 +19,10 @@
 "Apps" => "Apps",
 "Admin" => "ผู้ดูแลระบบ",
 "Help" => "ช่วยเหลือ",
+"Access forbidden" => "การเข้าถึงถูกหวงห้าม",
 "Cloud not found" => "ไม่พบ Cloud",
+"Edit categories" => "แก้ไขหมวดหมู่",
+"Add" => "เพิ่ม",
 "Create an <strong>admin account</strong>" => "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
 "Password" => "รหัสผ่าน",
 "Advanced" => "ขั้นสูง",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 8806c05ef5d..fc0f791d595 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "Uygulama adı verilmedi.",
+"No category to add?" => "Eklenecek kategori yok?",
+"This category already exists: " => "Bu kategori zaten mevcut: ",
 "Owncloud password reset" => "Owncloud parola sıfırlama",
+"ownCloud password reset" => "ownCloud 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}",
 "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.",
 "Requested" => "İstendi",
@@ -15,7 +19,10 @@
 "Apps" => "Uygulamalar",
 "Admin" => "Yönetici",
 "Help" => "Yardı",
+"Access forbidden" => "Erişim yasaklı",
 "Cloud not found" => "Bulut bulunamadı",
+"Edit categories" => "Kategorileri düzenle",
+"Add" => "Ekle",
 "Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
 "Password" => "Parola",
 "Advanced" => "Gelişmiş",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 8a3daa097f3..e07add7cbb6 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "没有提供应用程序名称。",
+"No category to add?" => "没有可添加分类？",
+"This category already exists: " => "此分类已存在: ",
 "Owncloud password reset" => "重置 Owncloud 密码",
+"ownCloud password reset" => "重置 ownCloud 密码",
 "Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
 "You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
 "Requested" => "已请求",
@@ -15,7 +19,10 @@
 "Apps" => "应用",
 "Admin" => "管理员",
 "Help" => "帮助",
+"Access forbidden" => "访问禁止",
 "Cloud not found" => "未找到云",
+"Edit categories" => "编辑分类",
+"Add" => "添加",
 "Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
 "Password" => "密码",
 "Advanced" => "高级",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index f689568b5d4..d958c628723 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -1,5 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Application name not provided." => "未提供應用程式名稱",
+"No category to add?" => "無分類添加?",
+"This category already exists: " => "此分類已經存在:",
 "Owncloud password reset" => "私有雲重設密碼",
+"ownCloud password reset" => "ownCloud 密碼重設",
 "Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: （聯結） ",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱",
 "Requested" => "已要求",
@@ -15,7 +19,10 @@
 "Apps" => "應用程式",
 "Admin" => "管理者",
 "Help" => "幫助",
+"Access forbidden" => "禁止存取",
 "Cloud not found" => "未發現雲",
+"Edit categories" => "編輯分類",
+"Add" => "添加",
 "Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>",
 "Password" => "密碼",
 "Advanced" => "進階",
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index b832ac2636f..e9d105ed043 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -30,7 +30,7 @@
 		<header><div id="header">
 			<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
 			<form class="searchbox" action="#" method="post">
-				<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" autocomplete="off" />
+				<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo htmlentities($_POST['query']);};?>" autocomplete="off" />
 			</form>
 			<a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
 		</div></header>
diff --git a/core/templates/login.php b/core/templates/login.php
index 4035dfe8a5a..a40bf5c330a 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -7,7 +7,7 @@
 		<?php endif; ?>
 		<p class="infield">
 			<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
-			<input type="text" name="user" id="user" value="<?php echo !empty($_POST['user'])?htmlentities($_POST['user']).'"':'" autofocus'; ?> autocomplete="off" required />
+			<input type="text" name="user" id="user" value="<?php echo !empty($_POST['user'])?htmlentities($_POST['user'],ENT_COMPAT,'utf-8').'"':'" autofocus'; ?> autocomplete="off" required />
 		</p>
 		<p class="infield">
 			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>