Merge branch 'master' into routing

Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php

38 files changed, 90 insertions, 67 deletions

diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 9be2fe6adfc..6c70c29e6cb 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -2,7 +2,6 @@
 "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:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Arranjament",
 "January" => "Gener",
 "February" => "Febrer",
@@ -51,6 +50,7 @@
 "Database user" => "Usuari de la base de dades",
 "Database password" => "Contrasenya de la base de dades",
 "Database name" => "Nom de la base de dades",
+"Database tablespace" => "Espai de taula de la base de dades",
 "Database host" => "Ordinador central de la base de dades",
 "Finish setup" => "Acaba la configuració",
 "web services under your control" => "controleu els vostres serveis web",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 7daeb52e631..6a4dad08cbd 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,8 +1,7 @@
 <?php $TRANSLATIONS = array(
-"Application name not provided." => "Jméno aplikace nezadáno.",
+"Application name not provided." => "Nezadán název aplikace.",
 "No category to add?" => "Žádná kategorie k přidání?",
-"This category already exists: " => "Tato kategorie již existuje:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"This category already exists: " => "Tato kategorie již existuje: ",
 "Settings" => "Nastavení",
 "January" => "Leden",
 "February" => "Únor",
@@ -19,14 +18,14 @@
 "Cancel" => "Zrušit",
 "No" => "Ne",
 "Yes" => "Ano",
-"Ok" => "Budiž",
+"Ok" => "Ok",
 "No categories selected for deletion." => "Žádné kategorie nebyly vybrány ke smazání.",
 "Error" => "Chyba",
-"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",
+"ownCloud password reset" => "Obnovení hesla pro ownCloud",
+"Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}",
+"You will receive a link to reset your password via Email." => "Bude Vám e-mailem zaslán odkaz pro obnovu hesla.",
 "Requested" => "Požadováno",
-"Login failed!" => "Přihlášení selhalo",
+"Login failed!" => "Přihlášení selhalo.",
 "Username" => "Uživatelské jméno",
 "Request reset" => "Vyžádat obnovu",
 "Your password was reset" => "Vaše heslo bylo obnoveno",
@@ -36,29 +35,30 @@
 "Personal" => "Osobní",
 "Users" => "Uživatelé",
 "Apps" => "Aplikace",
-"Admin" => "Admin",
+"Admin" => "Administrace",
 "Help" => "Nápověda",
-"Access forbidden" => "Přístup odmítnut",
+"Access forbidden" => "Přístup zakázán",
 "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",
-"Data folder" => "Datový adresář",
-"Configure the database" => "Konfigurace databáze",
+"Advanced" => "Pokročilé",
+"Data folder" => "Složka s daty",
+"Configure the database" => "Nastavit databázi",
 "will be used" => "bude použito",
 "Database user" => "Uživatel databáze",
-"Database password" => "Heslo k databázi",
+"Database password" => "Heslo databáze",
 "Database name" => "Název databáze",
+"Database tablespace" => "Tabulkový prostor databáze",
 "Database host" => "Hostitel databáze",
-"Finish setup" => "Dokončit instalaci",
+"Finish setup" => "Dokončit nastavení",
 "web services under your control" => "webové služby pod Vaší kontrolou",
 "Log out" => "Odhlásit se",
-"Lost your password?" => "Zapomenuté heslo?",
+"Lost your password?" => "Ztratili jste své heslo?",
 "remember" => "zapamatovat si",
-"Log in" => "Login",
+"Log in" => "Přihlásit",
 "You are logged out." => "Jste odhlášeni.",
-"prev" => "zpět",
-"next" => "vpřed"
+"prev" => "předchozí",
+"next" => "následující"
 );
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 5e62b5b95db..4bb953a4c5d 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Applikationens navn ikke medsendt",
 "No category to add?" => "Ingen kategori at tilføje?",
 "This category already exists: " => "Denne kategori eksisterer allerede: ",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Indstillinger",
 "January" => "Januar",
 "February" => "Februar",
@@ -51,6 +50,7 @@
 "Database user" => "Databasebruger",
 "Database password" => "Databasekodeord",
 "Database name" => "Navn på database",
+"Database tablespace" => "Database tabelplads",
 "Database host" => "Databasehost",
 "Finish setup" => "Afslut opsætning",
 "web services under your control" => "Webtjenester under din kontrol",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 9ed2d617828..611c208fe4d 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Applikationsname nicht angegeben",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: " => "Kategorie existiert bereits:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Einstellungen",
 "January" => "Januar",
 "February" => "Februar",
@@ -20,7 +19,7 @@
 "No" => "Nein",
 "Yes" => "Ja",
 "Ok" => "OK",
-"No categories selected for deletion." => "Keine Kategorien zum Löschen angegeben.",
+"No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.",
 "Error" => "Fehler",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
@@ -51,6 +50,7 @@
 "Database user" => "Datenbank-Benutzer",
 "Database password" => "Datenbank-Passwort",
 "Database name" => "Datenbank-Name",
+"Database tablespace" => "Datenbank-Tablespace",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index d8f32fb51e0..18a26f892c0 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Δε προσδιορίστηκε όνομα εφαρμογής",
 "No category to add?" => "Δεν έχετε να προστέσθέσεται μια κα",
 "This category already exists: " => "Αυτή η κατηγορία υπάρχει ήδη",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Ρυθμίσεις",
 "January" => "Ιανουάριος",
 "February" => "Φεβρουάριος",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index f5e5ca9d0e1..930b20a30af 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Nomo de aplikaĵo ne proviziiĝis.",
 "No category to add?" => "Ĉu neniu kategorio estas aldonota?",
 "This category already exists: " => "Ĉi tiu kategorio jam ekzistas: ",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Agordo",
 "January" => "Januaro",
 "February" => "Februaro",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 8766228ba89..21866d2ed67 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Nombre de la aplicación no provisto.",
 "No category to add?" => "¿Ninguna categoría para añadir?",
 "This category already exists: " => "Esta categoría ya existe: ",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Ajustes",
 "January" => "Enero",
 "February" => "Febrero",
@@ -51,6 +50,7 @@
 "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",
 "web services under your control" => "servicios web bajo tu control",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 734021605ca..871cc25fee0 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -2,7 +2,6 @@
 "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: ",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Seaded",
 "January" => "Jaanuar",
 "February" => "Veebruar",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 2e5a2c00e2a..9e9717dd8d8 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -2,7 +2,6 @@
 "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:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Ezarpenak",
 "January" => "Urtarrila",
 "February" => "Otsaila",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 5fe98629ba2..7b7af3937b8 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "نام برنامه پیدا نشد",
 "No category to add?" => "آیا گروه دیگری برای افزودن ندارید",
 "This category already exists: " => "این گروه از قبل اضافه شده",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "تنظیمات",
 "January" => "ژانویه",
 "February" => "فبریه",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 64bb4dca631..d253ee9433a 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -50,6 +50,7 @@
 "Database user" => "Tietokannan käyttäjä",
 "Database password" => "Tietokannan salasana",
 "Database name" => "Tietokannan nimi",
+"Database tablespace" => "Tietokannan taulukkotila",
 "Database host" => "Tietokantapalvelin",
 "Finish setup" => "Viimeistele asennus",
 "web services under your control" => "verkkopalvelut hallinnassasi",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 43917917ad8..2904ebf48b2 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -2,21 +2,20 @@
 "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à : ",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Paramètres",
-"January" => "Janvier",
-"February" => "Février",
-"March" => "Mars",
-"April" => "Avril",
-"May" => "Mai",
-"June" => "Juin",
-"July" => "Juillet",
-"August" => "Août",
-"September" => "Septembre",
-"October" => "Octobre",
-"November" => "Novembre",
-"December" => "Décembre",
-"Cancel" => "Annulé",
+"January" => "janvier",
+"February" => "février",
+"March" => "mars",
+"April" => "avril",
+"May" => "mai",
+"June" => "juin",
+"July" => "juillet",
+"August" => "août",
+"September" => "septembre",
+"October" => "octobre",
+"November" => "novembre",
+"December" => "décembre",
+"Cancel" => "Annuler",
 "No" => "Non",
 "Yes" => "Oui",
 "Ok" => "Ok",
@@ -24,7 +23,7 @@
 "Error" => "Erreur",
 "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",
+"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",
 "Login failed!" => "Nom d'utilisateur ou e-mail invalide",
 "Username" => "Nom d'utilisateur",
@@ -51,6 +50,7 @@
 "Database user" => "Utilisateur pour la base de données",
 "Database password" => "Mot de passe de la base de données",
 "Database name" => "Nom de la base de données",
+"Database tablespace" => "Tablespaces de la base de données",
 "Database host" => "Serveur de la base de données",
 "Finish setup" => "Terminer l'installation",
 "web services under your control" => "services web sous votre contrôle",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index eeff78826f8..af849712199 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Non se indicou o nome do aplicativo.",
 "No category to add?" => "Sen categoría que engadir?",
 "This category already exists: " => "Esta categoría xa existe: ",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Preferencias",
 "January" => "Xaneiro",
 "February" => "Febreiro",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index d4e773afc1e..723cceb4d01 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Ime aplikacije nije pribavljeno.",
 "No category to add?" => "Nemate kategorija koje možete dodati?",
 "This category already exists: " => "Ova kategorija već postoji: ",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Postavke",
 "January" => "Siječanj",
 "February" => "Veljača",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index dbfe2781d5f..a97c4cb8861 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -2,7 +2,6 @@
 "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",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Beállítások",
 "January" => "Január",
 "February" => "Február",
diff --git a/core/l10n/ignorelist b/core/l10n/ignorelist
new file mode 100644
index 00000000000..a2b225cbe4a
--- /dev/null
+++ b/core/l10n/ignorelist
@@ -0,0 +1 @@
+js/jquery-ui-1.8.16.custom.min.js
diff --git a/core/l10n/it.php b/core/l10n/it.php
index ca80770a3c5..8d9ac21cd43 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -2,7 +2,6 @@
 "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à: ",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Impostazioni",
 "January" => "Gennaio",
 "February" => "Febbraio",
@@ -51,6 +50,7 @@
 "Database user" => "Utente del database",
 "Database password" => "Password del database",
 "Database name" => "Nome del database",
+"Database tablespace" => "Spazio delle tabelle del database",
 "Database host" => "Host del database",
 "Finish setup" => "Termina la configurazione",
 "web services under your control" => "servizi web nelle tue mani",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 5f9b9da33a6..62f5e16f3ca 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "アプリケーション名は提供されていません。",
 "No category to add?" => "追加するカテゴリはありませんか？",
 "This category already exists: " => "このカテゴリはすでに存在します: ",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "設定",
 "January" => "1月",
 "February" => "2月",
@@ -51,6 +50,7 @@
 "Database user" => "データベースのユーザ名",
 "Database password" => "データベースのパスワード",
 "Database name" => "データベース名",
+"Database tablespace" => "データベースの表領域",
 "Database host" => "データベースのホスト名",
 "Finish setup" => "セットアップを完了します",
 "web services under your control" => "管理下にあるウェブサービス",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 5a330581ff1..9f82a79c43c 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "응용 프로그램의 이름이 규정되어 있지 않습니다. ",
 "No category to add?" => "추가할 카테고리가 없습니까?",
 "This category already exists: " => "이 카테고리는 이미 존재합니다:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "설정",
 "January" => "1월",
 "February" => "2월",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index eafdcc37370..0959e0ed25f 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -3,6 +3,24 @@
 "No category to add?" => "Keng Kategorie fir bäizesetzen?",
 "This category already exists: " => "Des Kategorie existéiert schonn:",
 "Settings" => "Astellungen",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "Mäerz",
+"April" => "Abrëll",
+"May" => "Mee",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
+"Cancel" => "Ofbriechen",
+"No" => "Nee",
+"Yes" => "Jo",
+"Ok" => "OK",
+"No categories selected for deletion." => "Keng Kategorien ausgewielt fir ze läschen.",
+"Error" => "Fehler",
 "ownCloud password reset" => "ownCloud Passwuert reset",
 "Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert ze reseten: {link}",
 "You will receive a link to reset your password via Email." => "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt.",
@@ -25,13 +43,14 @@
 "Add" => "Bäisetzen",
 "Create an <strong>admin account</strong>" => "En <strong>Admin Account</strong> uleeën",
 "Password" => "Passwuert",
-"Advanced" => "Erweidert",
+"Advanced" => "Advanced",
 "Data folder" => "Daten Dossier",
 "Configure the database" => "Datebank konfiguréieren",
 "will be used" => "wärt benotzt ginn",
 "Database user" => "Datebank Benotzer",
 "Database password" => "Datebank Passwuert",
 "Database name" => "Datebank Numm",
+"Database tablespace" => "Datebank Tabelle-Gréisst",
 "Database host" => "Datebank Server",
 "Finish setup" => "Installatioun ofschléissen",
 "web services under your control" => "Web Servicer ënnert denger Kontroll",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index f36f697b67c..0a3320351cf 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Nepateiktas programos pavadinimas.",
 "No category to add?" => "Nepridėsite jokios kategorijos?",
 "This category already exists: " => "Tokia kategorija jau yra:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Nustatymai",
 "January" => "Sausis",
 "February" => "Vasaris",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index af49a04f11c..3eea6cd58d1 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Име за апликацијата не е доставено.",
 "No category to add?" => "Нема категорија да се додаде?",
 "This category already exists: " => "Оваа категорија веќе постои:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Поставки",
 "January" => "Јануари",
 "February" => "Февруари",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 25da7cd8622..c99c510be62 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "nama applikasi tidak disediakan",
 "No category to add?" => "Tiada kategori untuk di tambah?",
 "This category already exists: " => "Kategori ini telah wujud",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Tetapan",
 "January" => "Januari",
 "February" => "Februari",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index d30823b59f2..a8bfebb8a55 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Applikasjonsnavn ikke angitt.",
 "No category to add?" => "Ingen kategorier å legge til?",
 "This category already exists: " => "Denne kategorien finnes allerede:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Innstillinger",
 "January" => "Januar",
 "February" => "Februar",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 874a710a759..3497381f74c 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -28,7 +28,7 @@
 "Login failed!" => "Login mislukt!",
 "Username" => "Gebruikersnaam",
 "Request reset" => "Resetaanvraag",
-"Your password was reset" => "Je wachtwoord is geweizigd",
+"Your password was reset" => "Je wachtwoord is gewijzigd",
 "To login page" => "Naar de login-pagina",
 "New password" => "Nieuw wachtwoord",
 "Reset password" => "Reset wachtwoord",
@@ -50,6 +50,7 @@
 "Database user" => "Gebruiker databank",
 "Database password" => "Wachtwoord databank",
 "Database name" => "Naam databank",
+"Database tablespace" => "Database tablespace",
 "Database host" => "Database server",
 "Finish setup" => "Installatie afronden",
 "web services under your control" => "webdiensten die je beheerst",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 4eb5f1f9ae9..5f8752b69bb 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Brak nazwy dla aplikacji",
 "No category to add?" => "Brak kategorii",
 "This category already exists: " => "Ta kategoria już istnieje",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Ustawienia",
 "January" => "Styczeń",
 "February" => "Luty",
@@ -51,6 +50,7 @@
 "Database user" => "Użytkownik bazy danych",
 "Database password" => "Hasło do bazy danych",
 "Database name" => "Nazwa bazy danych",
+"Database tablespace" => "Obszar tabel bazy danych",
 "Database host" => "Komputer bazy danych",
 "Finish setup" => "Zakończ konfigurowanie",
 "web services under your control" => "usługi internetowe pod kontrolą",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 46d601e6ebf..9ad2f3de53f 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -2,7 +2,6 @@
 "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",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Configurações",
 "January" => "Janeiro",
 "February" => "Fevereiro",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 29135f0d66d..4da513c1aec 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Nome da aplicação não definida.",
 "No category to add?" => "Nenhuma categoria para adicionar?",
 "This category already exists: " => "Esta categoria já existe:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Definições",
 "January" => "Janeiro",
 "February" => "Fevereiro",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index edb55577772..81b579aeb0d 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Имя приложения не установлено.",
 "No category to add?" => "Нет категорий для добавления?",
 "This category already exists: " => "Эта категория уже существует: ",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Настройки",
 "January" => "Январь",
 "February" => "Февраль",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index b6bff1e0497..8c3339170d6 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -2,7 +2,6 @@
 "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:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Nastavenia",
 "January" => "Január",
 "February" => "Február",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 2f998c95492..b7850c28619 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -2,7 +2,6 @@
 "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:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Nastavitve",
 "January" => "januar",
 "February" => "februar",
@@ -51,6 +50,7 @@
 "Database user" => "Uporabnik zbirke",
 "Database password" => "Geslo podatkovne zbirke",
 "Database name" => "Ime podatkovne zbirke",
+"Database tablespace" => "Razpredelnica podatkovne zbirke",
 "Database host" => "Gostitelj podatkovne zbirke",
 "Finish setup" => "Dokončaj namestitev",
 "web services under your control" => "spletne storitve pod vašim nadzorom",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 25ba95558e7..6b075f0aaf2 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Programnamn har inte angetts.",
 "No category to add?" => "Ingen kategori att lägga till?",
 "This category already exists: " => "Denna kategori finns redan:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Inställningar",
 "January" => "Januari",
 "February" => "Februari",
@@ -51,6 +50,7 @@
 "Database user" => "Databasanvändare",
 "Database password" => "Lösenord till databasen",
 "Database name" => "Databasnamn",
+"Database tablespace" => "Databas tabellutrymme",
 "Database host" => "Databasserver",
 "Finish setup" => "Avsluta installation",
 "web services under your control" => "webbtjänster under din kontroll",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 8bd4d36524f..fd25105f150 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "ยังไม่ได้ตั้งชื่อแอพพลิเคชั่น",
 "No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?",
 "This category already exists: " => "หมวดหมู่นี้มีอยู่แล้ว: ",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "ตั้งค่า",
 "January" => "มกราคม",
 "February" => "กุมภาพันธ์",
@@ -51,6 +50,7 @@
 "Database user" => "ชื่อผู้ใช้งานฐานข้อมูล",
 "Database password" => "รหัสผ่านฐานข้อมูล",
 "Database name" => "ชื่อฐานข้อมูล",
+"Database tablespace" => "พื้นที่ตารางในฐานข้อมูล",
 "Database host" => "Database host",
 "Finish setup" => "ติดตั้งเรียบร้อยแล้ว",
 "web services under your control" => "web services under your control",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index e2d0d9b073d..7d6d4a33a6d 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Uygulama adı verilmedi.",
 "No category to add?" => "Eklenecek kategori yok?",
 "This category already exists: " => "Bu kategori zaten mevcut: ",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Ayarlar",
 "January" => "Ocak",
 "February" => "Şubat",
@@ -51,6 +50,7 @@
 "Database user" => "Veritabanı kullanıcı adı",
 "Database password" => "Veritabanı parolası",
 "Database name" => "Veritabanı adı",
+"Database tablespace" => "Veritabanı tablo alanı",
 "Database host" => "Veritabanı sunucusu",
 "Finish setup" => "Kurulumu tamamla",
 "web services under your control" => "kontrolünüzdeki web servisleri",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 4a4c97032fd..de4764c3a54 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Tên ứng dụng không tồn tại",
 "No category to add?" => "Không có danh mục được thêm?",
 "This category already exists: " => "Danh mục này đã được tạo :",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Cài đặt",
 "January" => "Tháng 1",
 "February" => "Tháng 2",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 770d2b6772d..58104df3997 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "应用程序并没有被提供.",
 "No category to add?" => "没有分类添加了?",
 "This category already exists: " => "这个分类已经存在了:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "设置",
 "January" => "一月",
 "February" => "二月",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 1f5216a2fff..4e0a37a8774 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -50,6 +50,7 @@
 "Database user" => "数据库用户",
 "Database password" => "数据库密码",
 "Database name" => "数据库名",
+"Database tablespace" => "数据库表空间",
 "Database host" => "数据库主机",
 "Finish setup" => "安装完成",
 "web services under your control" => "由您掌控的网络服务",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 37c0d8cc9d1..57a087fae92 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -3,6 +3,24 @@
 "No category to add?" => "無分類添加?",
 "This category already exists: " => "此分類已經存在:",
 "Settings" => "設定",
+"January" => "一月",
+"February" => "二月",
+"March" => "三月",
+"April" => "四月",
+"May" => "五月",
+"June" => "六月",
+"July" => "七月",
+"August" => "八月",
+"September" => "九月",
+"October" => "十月",
+"November" => "十一月",
+"December" => "十二月",
+"Cancel" => "取消",
+"No" => "No",
+"Yes" => "Yes",
+"Ok" => "Ok",
+"No categories selected for deletion." => "沒選擇要刪除的分類",
+"Error" => "錯誤",
 "ownCloud password reset" => "ownCloud 密碼重設",
 "Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: （聯結） ",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱",
@@ -32,6 +50,7 @@
 "Database user" => "資料庫使用者",
 "Database password" => "資料庫密碼",
 "Database name" => "資料庫名稱",
+"Database tablespace" => "資料庫 tablespace",
 "Database host" => "資料庫主機",
 "Finish setup" => "完成設定",
 "web services under your control" => "網路服務已在你控制",